Refactor @Any annotation support to align with project conventions

- Move tests from separate file to QueryUtilsIntegrationTests
- Move isAnyAnnotatedProperty method to appropriate location
- Follow PR spring-projects#3922 pattern for test structure
- Simplify code and remove unnecessary comments

Signed-off-by: Hyunjoon Park <[email protected]>
Signed-off-by: academey <[email protected]>

Author: academey

spring-data-jpa/src/main/java/org/springframework/data/jpa/repository/query/QueryUtils.java

@@ -746,50 +746,6 @@ private static Nulls toNulls(Sort.NullHandling nullHandling) {
 		};
 	}
 
-	/**
-	 * Checks if the given property path represents a property annotated with Hibernate's @Any annotation.
-	 * This is necessary because @Any associations are not present in the JPA metamodel.
-	 *
-	 * @param from the root from which to resolve the property
-	 * @param property the property path to check
-	 * @return true if the property is annotated with @Any, false otherwise
-	 * @since 4.0
-	 */
-	private static boolean isAnyAnnotatedProperty(From<?, ?> from, PropertyPath property) {
-		try {
-			// Get the Java type of the from clause
-			Class<?> javaType = from.getJavaType();
-			String propertyName = property.getSegment();
-			
-			// Try to find the field
-			Member member = null;
-			try {
-				member = javaType.getDeclaredField(propertyName);
-			} catch (NoSuchFieldException ex) {
-				// Try to find a getter method
-				String capitalizedProperty = propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1);
-				try {
-					member = javaType.getDeclaredMethod("get" + capitalizedProperty);
-				} catch (NoSuchMethodException ex2) {
-					// Property not found
-					return false;
-				}
-			}
-			
-			if (member instanceof AnnotatedElement annotatedElement) {
-				// Check for Hibernate @Any annotation using reflection to avoid compile-time dependency
-				for (Annotation annotation : annotatedElement.getAnnotations()) {
-					if (annotation.annotationType().getName().equals("org.hibernate.annotations.Any")) {
-						return true;
-					}
-				}
-			}
-		} catch (Exception ex) {
-			// If anything goes wrong, assume it's not an @Any property
-		}
-		return false;
-	}
-
 	static <T> Expression<T> toExpressionRecursively(From<?, ?> from, PropertyPath property) {
 		return toExpressionRecursively(from, property, false);
 	}
@@ -938,6 +894,45 @@ static <T> T getAnnotationProperty(Attribute<?, ?> attribute, String propertyNam
 		return value != null ? value : defaultValue;
 	}
 
+	/**
+	 * Checks if the given property path represents a property annotated with Hibernate's @Any annotation.
+	 * This is necessary because @Any associations are not present in the JPA metamodel.
+	 *
+	 * @param from the root from which to resolve the property
+	 * @param property the property path to check
+	 * @return true if the property is annotated with @Any, false otherwise
+	 */
+	private static boolean isAnyAnnotatedProperty(From<?, ?> from, PropertyPath property) {
+
+		try {
+			Class<?> javaType = from.getJavaType();
+			String propertyName = property.getSegment();
+			
+			Member member = null;
+			try {
+				member = javaType.getDeclaredField(propertyName);
+			} catch (NoSuchFieldException ex) {
+				String capitalizedProperty = propertyName.substring(0, 1).toUpperCase() + propertyName.substring(1);
+				try {
+					member = javaType.getDeclaredMethod("get" + capitalizedProperty);
+				} catch (NoSuchMethodException ex2) {
+					return false;
+				}
+			}
+			
+			if (member instanceof AnnotatedElement annotatedElement) {
+				for (Annotation annotation : annotatedElement.getAnnotations()) {
+					if (annotation.annotationType().getName().equals("org.hibernate.annotations.Any")) {
+						return true;
+					}
+				}
+			}
+		} catch (Exception ex) {
+			// If anything goes wrong, assume it's not an @Any property
+		}
+		return false;
+	}
+
 	/**
 	 * Returns an existing (fetch) join for the given attribute if one already exists or creates a new one if not.
 	 *

spring-data-jpa/src/test/java/org/springframework/data/jpa/repository/query/HibernateAnyAnnotationIntegrationTests.java

@@ -46,6 +46,10 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+import org.hibernate.annotations.Any;
+import org.hibernate.annotations.AnyDiscriminator;
+import org.hibernate.annotations.AnyDiscriminatorValue;
+import org.hibernate.annotations.AnyKeyJavaClass;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.Mockito;
@@ -370,6 +374,36 @@ void queryUtilsConsidersNullPrecedence() {
 		}
 	}
 
+	@Test // GH-2318
+	void handlesHibernateAnyAnnotationWithoutThrowingException() {
+
+		doInMerchantContext((emf) -> {
+
+			CriteriaBuilder builder = emf.createEntityManager().getCriteriaBuilder();
+			CriteriaQuery<EntityWithAny> query = builder.createQuery(EntityWithAny.class);
+			Root<EntityWithAny> root = query.from(EntityWithAny.class);
+
+			// This would throw IllegalArgumentException without the fix
+			PropertyPath monitorObjectPath = PropertyPath.from("monitorObject", EntityWithAny.class);
+			assertThatNoException().isThrownBy(() -> QueryUtils.toExpressionRecursively(root, monitorObjectPath));
+		});
+	}
+
+	@Test // GH-2318
+	void doesNotCreateJoinForAnyAnnotatedProperty() {
+
+		doInMerchantContext((emf) -> {
+
+			CriteriaBuilder builder = emf.createEntityManager().getCriteriaBuilder();
+			CriteriaQuery<EntityWithAny> query = builder.createQuery(EntityWithAny.class);
+			Root<EntityWithAny> root = query.from(EntityWithAny.class);
+
+			QueryUtils.toExpressionRecursively(root, PropertyPath.from("monitorObject", EntityWithAny.class));
+
+			assertThat(root.getJoins()).isEmpty();
+		});
+	}
+
 	/**
 	 * This test documents an ambiguity in the JPA spec (or it's implementation in Hibernate vs EclipseLink) that we have
 	 * to work around in the test {@link #doesNotCreateJoinForOptionalAssociationWithoutFurtherNavigation()}. See also:
@@ -434,6 +468,38 @@ static class Credential {
 		String uid;
 	}
 
+	@Entity
+	@SuppressWarnings("unused")
+	static class EntityWithAny {
+
+		@Id String id;
+
+		@Any
+		@AnyDiscriminator // Default is STRING type
+		@AnyDiscriminatorValue(discriminator = "monitorable", entity = MonitorableEntity.class)
+		@AnyDiscriminatorValue(discriminator = "another", entity = AnotherMonitorableEntity.class)
+		@AnyKeyJavaClass(String.class)
+		@jakarta.persistence.JoinColumn(name = "monitor_object_id")
+		@jakarta.persistence.Column(name = "monitor_object_type")
+		Object monitorObject;
+	}
+
+	@Entity
+	@SuppressWarnings("unused")
+	static class MonitorableEntity {
+
+		@Id String id;
+		String name;
+	}
+
+	@Entity
+	@SuppressWarnings("unused")
+	static class AnotherMonitorableEntity {
+
+		@Id String id;
+		String code;
+	}
+
 	/**
 	 * A {@link PersistenceProviderResolver} that returns only a Hibernate {@link PersistenceProvider} and ignores others.
 	 *