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

Merge branch '6.1.x'

Browse Source
This commit is contained in:
Sébastien Deleuze
2024-03-21 17:56:14 +01:00
parent a30c06b883 1e80694daf
commit b1b9ee0ccf
6 changed files with 80 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
spring-webflux/src/main/java/org/springframework/web/reactive/result/method/InvocableHandlerMethod.java
View File

@@ -328,11 +328,9 @@ public class InvocableHandlerMethod extends HandlerMethod {
Object arg = args[index];
if (!(parameter.isOptional() && arg == null)) {
KType type = parameter.getType();
if (!(type.isMarkedNullable() && arg == null)) {
KClass<?> kClass = (KClass<?>) type.getClassifier();
if (KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) {
arg = KClasses.getPrimaryConstructor(kClass).call(arg);
}
if (!(type.isMarkedNullable() && arg == null) && type.getClassifier() instanceof KClass<?> kClass
&& KotlinDetector.isInlineClass(JvmClassMappingKt.getJavaClass(kClass))) {
arg = KClasses.getPrimaryConstructor(kClass).call(arg);
}
argMap.put(parameter, arg);
}

22
spring-webflux/src/test/kotlin/org/springframework/web/reactive/result/InvocableHandlerMethodKotlinTests.kt
View File

@@ -249,6 +249,15 @@ class InvocableHandlerMethodKotlinTests {
assertHandlerResultValue(result, "foo-20")
}
@Test
fun genericParameter() {
val horse = Animal("horse")
this.resolvers.add(stubResolver(horse))
val method = AnimalController::handle.javaMethod!!
val result = invoke(AnimalController(), method, null)
assertHandlerResultValue(result, horse.name)
}
private fun invokeForResult(handler: Any, method: Method, vararg providedArgs: Any): HandlerResult? {
return invoke(handler, method, *providedArgs).block(Duration.ofSeconds(5))
@@ -379,6 +388,19 @@ class InvocableHandlerMethodKotlinTests {
}
}
private abstract class GenericController<T : Named> {
fun handle(named: T) = named.name
}
private class AnimalController : GenericController<Animal>()
interface Named {
val name: String
}
data class Animal(override val name: String) : Named
@JvmInline
value class LongValueClass(val value: Long)