Skip to content

Avoid Kotlin reflection in MethodParameter for non-suspending functions #37299

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gregjotau wants to merge 1 commit into from
Closed

Avoid Kotlin reflection in MethodParameter for non-suspending functions #37299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 21 additions & 17 deletions spring-core/src/main/java/org/springframework/core/MethodParameter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -972,14 +972,16 @@ public static boolean isOptional(MethodParameter param) {
* functions via Kotlin reflection.
*/
private static Type getGenericReturnType(Method method) {
try {
KFunction<?> function = ReflectJvmMapping.getKotlinFunction(method);
if (function != null && function.isSuspend()) {
return ReflectJvmMapping.getJavaType(function.getReturnType());
if (KotlinDetector.isSuspendingFunction(method)) {
try {
KFunction<?> function = ReflectJvmMapping.getKotlinFunction(method);
if (function != null && function.isSuspend()) {
return ReflectJvmMapping.getJavaType(function.getReturnType());
}
}
catch (UnsupportedOperationException ex) {
// probably a synthetic class - let's use java reflection instead
}
}
catch (UnsupportedOperationException ex) {
// probably a synthetic class - let's use java reflection instead
}
return method.getGenericReturnType();
}
Expand All @@ -989,18 +991,20 @@ private static Type getGenericReturnType(Method method) {
* functions via Kotlin reflection.
*/
private static Class<?> getReturnType(Method method) {
try {
KFunction<?> function = ReflectJvmMapping.getKotlinFunction(method);
if (function != null && function.isSuspend()) {
Type paramType = ReflectJvmMapping.getJavaType(function.getReturnType());
if (paramType == Unit.class) {
paramType = void.class;
if (KotlinDetector.isSuspendingFunction(method)) {
try {
KFunction<?> function = ReflectJvmMapping.getKotlinFunction(method);
if (function != null && function.isSuspend()) {
Type paramType = ReflectJvmMapping.getJavaType(function.getReturnType());
if (paramType == Unit.class) {
paramType = void.class;
}
return ResolvableType.forType(paramType).resolve(method.getReturnType());
}
return ResolvableType.forType(paramType).resolve(method.getReturnType());
}
}
catch (UnsupportedOperationException ex) {
// probably a synthetic class - let's use java reflection instead
catch (UnsupportedOperationException ex) {
// probably a synthetic class - let's use java reflection instead
}
}
return method.getReturnType();
}
Expand Down
19 changes: 19 additions & 0 deletions spring-core/src/test/kotlin/org/springframework/core/MethodParameterKotlinTests.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import kotlin.reflect.jvm.javaMethod
* @author Sebastien Deleuze
* @author Juergen Hoeller
* @author Konrad Kaminski
* @author Greg Taube
*/
class MethodParameterKotlinTests {

Expand Down Expand Up @@ -114,6 +115,18 @@ class MethodParameterKotlinTests {
assertThat(returnGenericParameterType("suspendFun8")).isEqualTo(Any::class.java)
}

@Test
fun `Regular function return type`() {
assertThat(returnParameterType("regularFun")).isEqualTo(Producer::class.java)
assertThat(returnGenericParameterTypeName("regularFun")).isEqualTo("org.springframework.core.Producer<java.lang.Number>")
}

@Test
fun `Regular function with Continuation parameter return type`() {
assertThat(returnParameterType("regularFunWithContinuation")).isEqualTo(Producer::class.java)
assertThat(returnGenericParameterTypeName("regularFunWithContinuation")).isEqualTo("org.springframework.core.Producer<java.lang.Number>")
}

@Test
fun `Parameter name for regular function`() {
val methodParameter = returnMethodParameter("nullable", 0)
Expand Down Expand Up @@ -186,6 +199,12 @@ class MethodParameterKotlinTests {

@Suppress("unused", "unused_parameter")
suspend fun suspendFun8(p1: String): Any? = TODO()

@Suppress("unused", "unused_parameter")
fun regularFun(p1: String): Producer<Number> = TODO()

@Suppress("unused", "unused_parameter")
fun regularFunWithContinuation(p1: String, continuation: Continuation<Number>): Producer<Number> = TODO()
}

interface Producer<out T>
Expand Down
Loading