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-web/src/main/java/org/springframework/web/method/support/InvocableHandlerMethod.java
View File

@@ -317,11 +317,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);
}

25
spring-web/src/test/kotlin/org/springframework/web/method/support/InvocableHandlerMethodKotlinTests.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2023 the original author or authors.
* Copyright 2002-2024 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.
@@ -25,7 +25,7 @@ import org.springframework.web.testfixture.servlet.MockHttpServletRequest
import org.springframework.web.testfixture.servlet.MockHttpServletResponse
/**
* Kotlin unit tests for {@link InvocableHandlerMethod}.
* Kotlin unit tests for [InvocableHandlerMethod].
*
* @author Sebastien Deleuze
*/
@@ -134,6 +134,14 @@ class InvocableHandlerMethodKotlinTests {
Assertions.assertThat(value).isEqualTo("foo-20")
}
@Test
fun genericParameter() {
val horse = Animal("horse")
composite.addResolver(StubArgumentResolver(Animal::class.java, horse))
val value = getInvocable(AnimalHandler::class.java, Named::class.java).invokeForRequest(request, null)
Assertions.assertThat(value).isEqualTo(horse.name)
}
private fun getInvocable(clazz: Class<*>, vararg argTypes: Class<*>): InvocableHandlerMethod {
val method = ResolvableMethod.on(clazz).argTypes(*argTypes).resolveMethod()
val handlerMethod = InvocableHandlerMethod(clazz.constructors.first().newInstance(), method)
@@ -202,6 +210,19 @@ class InvocableHandlerMethodKotlinTests {
}
}
private abstract class GenericHandler<T : Named> {
fun handle(named: T) = named.name
}
private class AnimalHandler : GenericHandler<Animal>()
interface Named {
val name: String
}
data class Animal(override val name: String) : Named
@JvmInline
value class LongValueClass(val value: Long)