-
Notifications
You must be signed in to change notification settings - Fork 38k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Support Kotlin suspending functions in MethodParameter
Before this commit, the return type for Kotlin suspending functions (as returned by MethodParameter#getParameterType and MethodParameter#getGenericReturnType methods) was incorrect. This change leverages Kotlin reflection instead of Java one to return the correct type. Closes gh-21058
- Loading branch information
1 parent
5938742
commit 9302cb2
Showing
3 changed files
with
168 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
62 changes: 62 additions & 0 deletions
62
spring-core/src/test/kotlin/org/springframework/core/KotlinGenericTypeResolverTests.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
/* | ||
* Copyright 2002-2019 the original author or authors. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
package org.springframework.core | ||
|
||
import org.junit.Assert.assertEquals | ||
import org.junit.Test | ||
import org.springframework.core.GenericTypeResolver.resolveReturnTypeArgument | ||
import java.lang.reflect.Method | ||
|
||
/** | ||
* Tests for Kotlin support in [GenericTypeResolver]. | ||
* | ||
* @author Konrad Kaminski | ||
* @author Sebastien Deleuze | ||
*/ | ||
class KotlinGenericTypeResolverTests { | ||
|
||
@Test | ||
fun methodReturnTypes() { | ||
assertEquals(Integer::class.java, resolveReturnTypeArgument(findMethod(MyTypeWithMethods::class.java, "integer")!!, | ||
MyInterfaceType::class.java)) | ||
assertEquals(String::class.java, resolveReturnTypeArgument(findMethod(MyTypeWithMethods::class.java, "string")!!, | ||
MyInterfaceType::class.java)) | ||
assertEquals(null, resolveReturnTypeArgument(findMethod(MyTypeWithMethods::class.java, "raw")!!, | ||
MyInterfaceType::class.java)) | ||
assertEquals(null, resolveReturnTypeArgument(findMethod(MyTypeWithMethods::class.java, "object")!!, | ||
MyInterfaceType::class.java)) | ||
} | ||
|
||
private fun findMethod(clazz: Class<*>, name: String): Method? = | ||
clazz.methods.firstOrNull { it.name == name } | ||
|
||
open class MyTypeWithMethods<T> { | ||
suspend fun integer(): MyInterfaceType<Int>? = null | ||
|
||
suspend fun string(): MySimpleInterfaceType? = null | ||
|
||
suspend fun `object`(): Any? = null | ||
|
||
suspend fun raw(): MyInterfaceType<*>? = null | ||
} | ||
|
||
interface MyInterfaceType<T> | ||
|
||
interface MySimpleInterfaceType: MyInterfaceType<String> | ||
|
||
open class MySimpleTypeWithMethods: MyTypeWithMethods<Int>() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters