Polishing.

Author: mp911de

src/main/java/org/springframework/data/core/PropertyReference.java

@@ -22,36 +22,36 @@
 /**
  * Interface providing type-safe property references.
  * <p>
- * This functional interface is typically implemented through method references or lambda expressions that allow for
+ * This functional interface is typically implemented through method references and lambda expressions that allow for
  * compile-time type safety and refactoring support. Instead of string-based property names that are easy to miss when
- * changing the domain model, {@code TypedPropertyReference} leverages Java's declarative method references and lambda
+ * changing the domain model, {@code PropertyReference} leverages Java's declarative method references and lambda
  * expressions to ensure type-safe property access.
  * <p>
  * Create a typed property reference using the static factory method {@link #of(PropertyReference)} with a method
  * reference or lambda, for example:
  *
  * <pre class="code">
- * TypedPropertyReference&lt;Person, String&gt; name = TypedPropertyReference.of(Person::getName);
+ * PropertyReference&lt;Person, String&gt; name = PropertyReference.of(Person::getName);
  * </pre>
  *
  * The resulting object can be used to obtain the {@link #getName() property name} and to interact with the target
  * property. Typed references can be used to compose {@link TypedPropertyPath property paths} to navigate nested object
  * structures using {@link #then(PropertyReference)}:
  *
  * <pre class="code">
- * TypedPropertyPath&lt;Person, String&gt; city = TypedPropertyReference.of(Person::getAddress).then(Address::getCity);
+ * TypedPropertyPath&lt;Person, String&gt; city = PropertyReference.of(Person::getAddress).then(Address::getCity);
  * </pre>
  * <p>
  * The generic type parameters preserve type information across the property path chain: {@code T} represents the owning
  * type of the current segment (or the root type for composed paths), while {@code P} represents the property value type
  * at this segment. Composition automatically flows type information forward, ensuring that {@code then()} preserves the
  * full chain's type safety.
  * <p>
- * Implement {@code TypedPropertyReference} using method references (strongly recommended) or lambdas that directly
- * access a property getter. Constructor references, method calls with parameters, and complex expressions are not
- * supported and result in {@link org.springframework.dao.InvalidDataAccessApiUsageException}. Unlike method references,
- * introspection of lambda expressions requires bytecode analysis of the declaration site classes and thus depends on
- * their availability at runtime.
+ * Implement {@code PropertyReference} using method references (strongly recommended) or lambdas that directly access a
+ * property getter. Constructor references, method calls with parameters, and complex expressions are not supported and
+ * result in {@link org.springframework.dao.InvalidDataAccessApiUsageException}. Unlike method references, introspection
+ * of lambda expressions requires bytecode analysis of the declaration site classes and thus depends on their
+ * availability at runtime.
  *
  * @param <T> the owning type of this property.
  * @param <P> the property value type.

src/main/java/org/springframework/data/core/TypedPropertyPath.java

@@ -22,7 +22,7 @@
 import org.jspecify.annotations.Nullable;
 
 /**
- * Interface providing type-safe property path navigation through method references or lambda expressions.
+ * Interface providing type-safe property path navigation through method references and lambda expressions.
  * <p>
  * This functional interface extends {@link PropertyPath} to provide compile-time type safety and refactoring support.
  * Instead of using {@link PropertyPath#from(String, TypeInformation) string-based property paths} for textual property

src/main/kotlin/org/springframework/data/core/PropertyReferenceExtensions.kt

@@ -58,26 +58,31 @@ class KPropertyReference {
 	companion object {
 
 		/**
-		 * Create a [PropertyReference] from a [KProperty1].
+		 * Create a [PropertyReference] from a [KProperty1] reference.
+		 * @param property the property reference, must not be a property path.
 		 */
 		fun <T : Any, P : Any> of(property: KProperty1<T, P?>): PropertyReference<T, P> {
 			return of((property as KProperty<P?>))
 		}
 
 		/**
-		 * Create a [PropertyReference] from a collection-like [KProperty1].
+		 * Create a [PropertyReference] from a collection-like [KProperty1] reference.
+		 * @param property the property reference, must not be a property path.
 		 */
 		@JvmName("ofMany")
 		fun <T : Any, P : Any> of(property: KProperty1<T, Iterable<P?>?>): PropertyReference<T, P> {
 			return of((property as KProperty<P?>))
 		}
 
-
 		/**
 		 * Create a [PropertyReference] from a [KProperty].
 		 */
 		fun <T, P> of(property: KProperty<P?>): PropertyReference<T, P> {
 
+			if (property is KPropertyReferenceImpl<*, *>) {
+				throw IllegalArgumentException("Property reference ${property.name} must not be a property path")
+			}
+
 			if (property is KProperty1<*, *>) {
 
 				val property1 = property as KProperty1<*, *>

src/test/java/org/springframework/data/core/PropertyReferenceUnitTests.java

@@ -31,74 +31,74 @@
  */
 class PropertyReferenceUnitTests {
 
-	@Test
+	@Test // GH-3400
 	void resolvesMHSimplePath() {
 		assertThat(PropertyReference.of(PersonQuery::getName).getName()).isEqualTo("name");
 	}
 
-	@Test
+	@Test // GH-3400
 	void resolvesMHComposedPath() {
 		assertThat(PropertyReference.of(PersonQuery::getAddress).then(Address::getCountry).toDotPath())
 				.isEqualTo("address.country");
 	}
 
-	@Test
+	@Test // GH-3400
 	void resolvesCollectionPath() {
 		assertThat(PropertyReference.ofMany(PersonQuery::getAddresses).then(Address::getCity).toDotPath())
 				.isEqualTo("addresses.city");
 	}
 
-	@Test
+	@Test // GH-3400
 	@SuppressWarnings("Convert2MethodRef")
 	void resolvesInitialLambdaGetter() {
 		assertThat(PropertyReference.of((PersonQuery person) -> person.getName()).getName()).isEqualTo("name");
 	}
 
-	@Test
+	@Test // GH-3400
 	@SuppressWarnings("Convert2MethodRef")
 	void resolvesComposedLambdaGetter() {
 		assertThat(PropertyReference.of(PersonQuery::getAddress).then(it -> it.getCity()).toDotPath())
 				.isEqualTo("address.city");
 	}
 
-	@Test
+	@Test // GH-3400
 	void resolvesComposedLambdaFieldAccess() {
 		assertThat(PropertyReference.of(PersonQuery::getAddress).then(it -> it.city).toDotPath()).isEqualTo("address.city");
 	}
 
-	@Test
+	@Test // GH-3400
 	void resolvesInterfaceMethodReferenceGetter() {
 		assertThat(PropertyReference.of(PersonProjection::getName).getName()).isEqualTo("name");
 	}
 
-	@Test
+	@Test // GH-3400
 	@SuppressWarnings("Convert2MethodRef")
 	void resolvesInterfaceLambdaGetter() {
 		assertThat(PropertyReference.of((PersonProjection person) -> person.getName()).getName()).isEqualTo("name");
 	}
 
-	@Test
+	@Test // GH-3400
 	void resolvesSuperclassMethodReferenceGetter() {
 		assertThat(PropertyReference.of(PersonQuery::getTenant).getName()).isEqualTo("tenant");
 	}
 
-	@Test
+	@Test // GH-3400
 	void resolvesSuperclassLambdaGetter() {
 		assertThat(PropertyReference.of((PersonQuery person) -> person.getTenant()).getName()).isEqualTo("tenant");
 	}
 
-	@Test
+	@Test // GH-3400
 	void resolvesPrivateMethodReference() {
 		assertThat(PropertyReference.of(Secret::getSecret).getName()).isEqualTo("secret");
 	}
 
-	@Test
+	@Test // GH-3400
 	@SuppressWarnings("Convert2MethodRef")
 	void resolvesPrivateMethodLambda() {
 		assertThat(PropertyReference.of((Secret secret) -> secret.getSecret()).getName()).isEqualTo("secret");
 	}
 
-	@Test
+	@Test // GH-3400
 	void switchingOwningTypeFails() {
 
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
@@ -107,21 +107,21 @@ void switchingOwningTypeFails() {
 				}));
 	}
 
-	@Test
+	@Test // GH-3400
 	void constructorCallsShouldFail() {
 
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
 				.isThrownBy(() -> PropertyReference.of((PersonQuery person) -> new PersonQuery(person)));
 	}
 
-	@Test
+	@Test // GH-3400
 	void enumShouldFail() {
 
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
 				.isThrownBy(() -> PropertyReference.of(NotSupported.INSTANCE));
 	}
 
-	@Test
+	@Test // GH-3400
 	void returningSomethingShouldFail() {
 
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
@@ -132,7 +132,7 @@ void returningSomethingShouldFail() {
 				.isThrownBy(() -> PropertyReference.of((PropertyReference<Object, Object>) obj -> ""));
 	}
 
-	@Test
+	@Test // GH-3400
 	@SuppressWarnings("Convert2Lambda")
 	void classImplementationShouldFail() {
 
@@ -145,14 +145,14 @@ void classImplementationShouldFail() {
 				}));
 	}
 
-	@Test
+	@Test // GH-3400
 	void constructorMethodReferenceShouldFail() {
 
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
 				.isThrownBy(() -> PropertyReference.<PersonQuery, PersonQuery> of(PersonQuery::new));
 	}
 
-	@Test
+	@Test // GH-3400
 	void failsResolutionWith$StrangeStuff() {
 
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
@@ -163,7 +163,7 @@ void constructorMethodReferenceShouldFail() {
 				}).getName());
 	}
 
-	@Test
+	@Test // GH-3400
 	void arithmeticOpsFail() {
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class).isThrownBy(() -> {
 			PropertyReference.of((PersonQuery person) -> {
@@ -173,7 +173,7 @@ void arithmeticOpsFail() {
 		});
 	}
 
-	@Test
+	@Test // GH-3400
 	void failsResolvingCallingLocalMethod() {
 
 		assertThatExceptionOfType(InvalidDataAccessApiUsageException.class)
@@ -186,13 +186,13 @@ void failsResolvingCallingLocalMethod() {
 	@Nested
 	class NestedTestClass {
 
-		@Test
+		@Test // GH-3400
 		@SuppressWarnings("Convert2MethodRef")
 		void resolvesInterfaceLambdaGetter() {
 			assertThat(PropertyReference.of((PersonProjection person) -> person.getName()).getName()).isEqualTo("name");
 		}
 
-		@Test
+		@Test // GH-3400
 		void resolvesSuperclassMethodReferenceGetter() {
 			assertThat(PropertyReference.of(PersonQuery::getTenant).getName()).isEqualTo("tenant");
 		}