Avoid accidental KProperty1 loading.

Author: mp911de

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

@@ -38,6 +38,7 @@
 import org.springframework.core.KotlinDetector;
 import org.springframework.core.ResolvableType;
 import org.springframework.data.core.MemberDescriptor.FieldDescriptor;
+import org.springframework.data.core.MemberDescriptor.KPropertyPathDescriptor;
 import org.springframework.data.core.MemberDescriptor.KPropertyReferenceDescriptor;
 import org.springframework.data.core.MemberDescriptor.MethodDescriptor;
 import org.springframework.util.CompositeIterator;
@@ -126,18 +127,23 @@ public static <P, T> TypedPropertyPath<T, P> of(PropertyReference<T, P> lambda)
 
 		PropertyPathMetadata metadata = getMetadata(lambda);
 
-		if (KotlinDetector.isKotlinReflectPresent() && metadata instanceof KPropertyPathMetadata kMetadata
+		if (KotlinDetector.isKotlinReflectPresent()) {
+			if (metadata instanceof KPropertyPathMetadata kMetadata
 				&& kMetadata.getProperty() instanceof KPropertyReferenceImpl<?, ?> ref) {
-			return KotlinDelegate.of(ref);
+				return KotlinDelegate.of(ref);
+			}
 		}
 
 		return new ResolvedPropertyReference<>(lambda, metadata);
 	}
 
+	/**
+	 * Delegate to handle property path composition of single-property and property-path KProperty1 references.
+	 */
 	static class KotlinDelegate {
 
 		@SuppressWarnings({ "rawtypes", "unchecked" })
-		public static <T, P> TypedPropertyPath<T, P> of(KProperty1<T, P> property) {
+		public static <T, P> TypedPropertyPath<T, P> of(Object property) {
 
 			if (property instanceof KPropertyReferenceImpl paths) {
 
@@ -152,16 +158,22 @@ public static <T, P> TypedPropertyPath<T, P> of(KProperty1<T, P> property) {
 				Class<?> owner = impl.getJavaField() != null ? impl.getJavaField().getDeclaringClass()
 						: impl.getGetter().getCaller().getMember().getDeclaringClass();
 				KPropertyPathMetadata metadata = TypedPropertyPaths.KPropertyPathMetadata
-						.of(MemberDescriptor.KPropertyReferenceDescriptor.create(owner, property));
+						.of(MemberDescriptor.KPropertyReferenceDescriptor.create(owner, (KProperty1) impl));
 				return new TypedPropertyPaths.ResolvedKPropertyPath(metadata);
 			}
 
-			if (property.getGetter().getProperty() instanceof KProperty1Impl impl) {
-				return of(impl);
+			if (property instanceof KProperty1 kProperty) {
+
+				if (kProperty.getGetter().getProperty() instanceof KProperty1Impl impl) {
+					return of(impl);
+				}
+
+				throw new IllegalArgumentException("Property " + kProperty.getName() + " is not a KProperty");
 			}
 
-			throw new IllegalArgumentException("Property " + property.getName() + " is not a KProperty");
+			throw new IllegalArgumentException("Property " + property + " is not a KProperty");
 		}
+
 	}
 
 	/**
@@ -190,8 +202,8 @@ public static <P, T> TypedPropertyPath<T, P> of(TypedPropertyPath<T, P> lambda)
 	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public static <T, P> TypedPropertyPath<T, P> of(TypedPropertyPath<T, P> delegate, PropertyPathMetadata metadata) {
 
-		if (KotlinDetector.isKotlinReflectPresent() && metadata instanceof KPropertyPathMetadata kmp) {
-			return new ResolvedKPropertyPath(kmp.getProperty(), metadata);
+		if (KotlinDetector.isKotlinReflectPresent() && metadata instanceof KPropertyPathMetadata) {
+			return new ResolvedKPropertyPath(((KPropertyPathMetadata) metadata).getProperty(), metadata);
 		}
 
 		return new ResolvedTypedPropertyPath<>(delegate, metadata);
@@ -228,12 +240,12 @@ private static PropertyPathMetadata read(Object lambda) {
 
 		if (KotlinDetector.isKotlinReflectPresent()) {
 
-			if (reference instanceof KPropertyReferenceDescriptor kProperty) {
-				return KPropertyPathMetadata.of(kProperty);
+			if (reference instanceof KPropertyReferenceDescriptor descriptor) {
+				return KPropertyPathMetadata.of(descriptor);
 			}
 
-			if (reference instanceof MemberDescriptor.KPropertyPathDescriptor kProperty) {
-				return KPropertyPathMetadata.of(kProperty);
+			if (reference instanceof KPropertyPathDescriptor descriptor) {
+				return KPropertyPathMetadata.of(descriptor);
 			}
 		}
 
@@ -342,7 +354,7 @@ public static KPropertyPathMetadata of(KPropertyReferenceDescriptor descriptor)
 		/**
 		 * Create a new {@code KPropertyPathMetadata}.
 		 */
-		public static KPropertyPathMetadata of(MemberDescriptor.KPropertyPathDescriptor descriptor) {
+		public static KPropertyPathMetadata of(KPropertyPathDescriptor descriptor) {
 			return new KPropertyPathMetadata(descriptor.getOwner(), descriptor.property(), descriptor.getType());
 		}
 

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

@@ -51,6 +51,7 @@ fun <T : Any, P> KProperty1<T, P>.toPath(): TypedPropertyPath<T, P> =
  * @since 4.1
  */
 @JvmName("div")
+@Suppress("UNCHECKED_CAST")
 operator fun <T, M, P> KProperty1<T, M?>.div(other: KProperty1<M, P?>): KProperty1<T, P> =
 	KSinglePropertyReference(this, other) as KProperty1<T, P>
 
@@ -71,5 +72,6 @@ operator fun <T, M, P> KProperty1<T, M?>.div(other: KProperty1<M, P?>): KPropert
  * @since 4.1
  */
 @JvmName("divIterable")
+@Suppress("UNCHECKED_CAST")
 operator fun <T, M, P> KProperty1<T, Collection<M?>?>.div(other: KProperty1<M, P?>): KProperty1<T, P> =
 	KIterablePropertyReference(this, other) as KProperty1<T, P>