Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-1171 - Limit Kotlin reflection support to regular classes.

Browse Source 
We now only inspect regular Kotlin classes with inspection to adapt Kotlin-specific behavior. Multipart-, synthetic and unknown classes are not supported. In such cases we fall back to the JVM reflection mechanism.

Non-regular classes are typically synthetic stubs, lambdas and SAM conversion which do not represent typical domain objects but rather technical bridge code.

Original pull request: #245.
This commit is contained in:
Mark Paluch
2017-09-25 08:49:47 +02:00
committed by Oliver Gierke
parent 65e21344ac
commit d9d0d594e5
8 changed files with 114 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/main/java/org/springframework/data/util/ReflectionUtils.java
View File

@@ -18,6 +18,9 @@ package org.springframework.data.util;
import kotlin.reflect.KFunction;
import kotlin.reflect.KType;
import kotlin.reflect.jvm.ReflectJvmMapping;
import kotlin.reflect.jvm.internal.impl.load.kotlin.header.KotlinClassHeader;
import kotlin.reflect.jvm.internal.impl.load.kotlin.header.KotlinClassHeader.Kind;
import kotlin.reflect.jvm.internal.impl.load.kotlin.reflect.ReflectKotlinClass;
import lombok.NonNull;
import lombok.RequiredArgsConstructor;
import lombok.experimental.UtilityClass;
@@ -348,7 +351,7 @@ public class ReflectionUtils {
}
/**
* Return true if the specified class is a Kotlin one.
* Return {@literal true} if the specified class is a Kotlin one.
*
* @return {@literal true} if {@code type} is a Kotlin class.
* @since 2.0
@@ -360,6 +363,31 @@ public class ReflectionUtils {
.anyMatch(annotation -> annotation.getName().equals("kotlin.Metadata"));
}
/**
* Return {@literal true} if the specified class is a supported Kotlin class. Currently supported are only
* {@link Kind#CLASS regular Kotlin classes}. Other class types (synthetic, SAM, lambdas) are not supported via
* reflection.
*
* @return {@literal true} if {@code type} is a supported Kotlin class.
* @since 2.0
*/
public static boolean isSupportedKotlinClass(Class<?> type) {
if (!isKotlinClass(type)) {
return false;
}
ReflectKotlinClass kotlinClass = ReflectKotlinClass.Factory.create(type);
if (kotlinClass == null) {
return false;
}
KotlinClassHeader classHeader = kotlinClass.getClassHeader();
return classHeader.getKind() == Kind.CLASS;
}
/**
* Returns {@literal} whether the given {@link MethodParameter} is nullable. Nullable parameters are reference types
* and ones that are defined in Kotlin as such.
@@ -373,7 +401,7 @@ public class ReflectionUtils {
return true;
}
if (isKotlinClass(parameter.getDeclaringClass())) {
if (isSupportedKotlinClass(parameter.getDeclaringClass())) {
KFunction<?> kotlinFunction = ReflectJvmMapping.getKotlinFunction(parameter.getMethod());