Add Kotlin support

Author: mp911de

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

@@ -15,6 +15,9 @@
  */
 package org.springframework.data.core;
 
+import kotlin.reflect.KProperty1;
+import kotlin.reflect.jvm.ReflectJvmMapping;
+
 import java.lang.invoke.SerializedLambda;
 import java.lang.reflect.Field;
 import java.lang.reflect.Member;
@@ -31,8 +34,7 @@
  * @author Mark Paluch
  * @since 4.1
  */
-sealed interface MemberDescriptor
-		permits MemberDescriptor.MethodDescriptor.FieldDescriptor, MemberDescriptor.MethodDescriptor {
+interface MemberDescriptor {
 
 	/**
 	 * @return class owning the member, can be the declaring class or a subclass.
@@ -69,7 +71,7 @@ static MethodDescriptor ofMethod(ClassLoader classLoader, String ownerClassName,
 	/**
 	 * Create {@link MethodDescriptor.FieldDescriptor} from owner type, field name and field type.
 	 */
-	public static MethodDescriptor.FieldDescriptor ofField(ClassLoader classLoader, String ownerClassName, String name,
+	static MethodDescriptor.FieldDescriptor ofField(ClassLoader classLoader, String ownerClassName, String name,
 			String fieldType) throws ClassNotFoundException {
 
 		Class<?> owner = ClassUtils.forName(ownerClassName, classLoader);
@@ -80,9 +82,6 @@ public static MethodDescriptor.FieldDescriptor ofField(ClassLoader classLoader,
 
 	/**
 	 * Value object describing a {@link Method} in the context of an owning class.
-	 *
-	 * @param owner
-	 * @param method
 	 */
 	record MethodDescriptor(Class<?> owner, Method method) implements MemberDescriptor {
 
@@ -113,9 +112,6 @@ public ResolvableType getType() {
 
 	/**
 	 * Value object describing a {@link Field} in the context of an owning class.
-	 *
-	 * @param owner
-	 * @param field
 	 */
 	record FieldDescriptor(Class<?> owner, Field field) implements MemberDescriptor {
 
@@ -144,4 +140,50 @@ public ResolvableType getType() {
 		}
 
 	}
+
+	/**
+	 * Value object describing a Kotlin property in the context of an owning class.
+	 */
+	record KPropertyReferenceDescriptor(Class<?> owner, KProperty1<?, ?> property) implements MemberDescriptor {
+
+		static KPropertyReferenceDescriptor create(Class<?> owner, KProperty1<?, ?> property) {
+			return new KPropertyReferenceDescriptor(owner, property);
+		}
+
+		@Override
+		public Class<?> getOwner() {
+			return owner();
+		}
+
+		@Override
+		public Member getMember() {
+
+			Method javaGetter = ReflectJvmMapping.getJavaGetter(property());
+			if (javaGetter != null) {
+				return javaGetter;
+			}
+
+			Field javaField = ReflectJvmMapping.getJavaField(property());
+
+			if (javaField != null) {
+				return javaField;
+			}
+
+			throw new IllegalStateException("Cannot resolve member for property '%s'".formatted(property().getName()));
+		}
+
+		@Override
+		public ResolvableType getType() {
+
+			Member member = getMember();
+
+			if (member instanceof Method m) {
+				return ResolvableType.forMethodReturnType(m, owner());
+			}
+
+			return ResolvableType.forField((Field) member, owner());
+		}
+
+	}
+
 }

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

@@ -15,6 +15,11 @@
  */
 package org.springframework.data.core;
 
+import kotlin.jvm.JvmClassMappingKt;
+import kotlin.jvm.internal.PropertyReference;
+import kotlin.reflect.KClass;
+import kotlin.reflect.KProperty1;
+
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.invoke.MethodHandleInfo;
@@ -33,16 +38,17 @@
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.jspecify.annotations.Nullable;
-
 import org.springframework.asm.ClassReader;
 import org.springframework.asm.ClassVisitor;
 import org.springframework.asm.Label;
 import org.springframework.asm.MethodVisitor;
 import org.springframework.asm.Opcodes;
 import org.springframework.asm.SpringAsmInfo;
 import org.springframework.asm.Type;
+import org.springframework.core.KotlinDetector;
 import org.springframework.core.SpringProperties;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
+import org.springframework.data.core.MemberDescriptor.KPropertyReferenceDescriptor;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -104,8 +110,8 @@ class SerializableLambdaReader {
 	public static final String INCLUDE_SUPPRESSED_EXCEPTIONS = "spring.data.lambda-reader.include-suppressed-exceptions";
 
 	private static final Log LOGGER = LogFactory.getLog(SerializableLambdaReader.class);
-	private static final boolean filterStackTrace = isEnabled(FILTER_STACK_TRACE, true);
-	private static final boolean includeSuppressedExceptions = isEnabled(INCLUDE_SUPPRESSED_EXCEPTIONS, false);
+	private static final boolean filterStackTrace = isEnabled(FILTER_STACK_TRACE, false);
+	private static final boolean includeSuppressedExceptions = isEnabled(INCLUDE_SUPPRESSED_EXCEPTIONS, true);
 
 	private final List<Class<?>> entryPoints;
 
@@ -132,6 +138,18 @@ private static boolean isEnabled(String property, boolean defaultValue) {
 	public MemberDescriptor read(Object lambdaObject) {
 
 		SerializedLambda lambda = serialize(lambdaObject);
+
+		if (isKotlinPropertyReference(lambda)) {
+
+			Object captured = lambda.getCapturedArg(0);
+			if (captured != null //
+					&& captured instanceof PropertyReference propRef //
+					&& propRef.getOwner() instanceof KClass<?> owner //
+					&& captured instanceof KProperty1<?, ?> kProperty) {
+				return new KPropertyReferenceDescriptor(JvmClassMappingKt.getJavaClass(owner), kProperty);
+			}
+		}
+
 		assertNotConstructor(lambda);
 
 		try {
@@ -156,6 +174,11 @@ public MemberDescriptor read(Object lambdaObject) {
 				+ ". The given value is not a lambda or method reference.");
 	}
 
+	public static boolean isKotlinPropertyReference(SerializedLambda lambda) {
+		return KotlinDetector.isKotlinReflectPresent() && lambda.getCapturedArgCount() == 1
+				&& lambda.getCapturedArg(0) != null && KotlinDetector.isKotlinType(lambda.getCapturedArg(0).getClass());
+	}
+
 	private void assertNotConstructor(SerializedLambda lambda) {
 
 		if (lambda.getImplMethodKind() == MethodHandleInfo.REF_newInvokeSpecial
@@ -192,7 +215,7 @@ private MemberDescriptor getMemberDescriptor(Object lambdaObject, SerializedLamb
 		}
 	}
 
-	private static SerializedLambda serialize(Object lambda) {
+	static SerializedLambda serialize(Object lambda) {
 
 		try {
 			Method method = lambda.getClass().getDeclaredMethod("writeReplace");

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

@@ -72,7 +72,7 @@ public interface TypedPropertyPath<T, P> extends PropertyPath, Serializable {
 	 * @param <P> property type.
 	 * @return the typed property path.
 	 */
-	static <T, P> TypedPropertyPath<T, P> of(TypedPropertyPath<T, P> propertyPath) {
+	static <T, P extends @Nullable Object> TypedPropertyPath<T, P> of(TypedPropertyPath<T, P> propertyPath) {
 		return TypedPropertyPaths.of(propertyPath);
 	}
 
@@ -124,7 +124,7 @@ default Iterator<PropertyPath> iterator() {
 	 * @param <N> the new property value type.
 	 * @return a new composed {@code TypedPropertyPath}.
 	 */
-	default <N> TypedPropertyPath<T, N> then(TypedPropertyPath<P, N> next) {
+	default <N extends @Nullable Object> TypedPropertyPath<T, N> then(TypedPropertyPath<P, N> next) {
 		return TypedPropertyPaths.compose(this, of(next));
 	}