Merge branch '6.1.x'

spring-core/src/main/java/org/springframework/core/CoroutinesUtils.java

@@ -128,11 +128,9 @@ public abstract class CoroutinesUtils {
 								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);
 								}

spring-core/src/test/kotlin/org/springframework/core/CoroutinesUtilsTests.kt

@@ -226,6 +226,16 @@ class CoroutinesUtilsTests {
 		}
 	}
 
+	@Test
+	fun invokeSuspendingFunctionWithGenericParameter() {
+		val method = GenericController::class.java.declaredMethods.first { it.name.startsWith("handle") }
+		val horse = Animal("horse")
+		val mono = CoroutinesUtils.invokeSuspendingFunction(method, AnimalController(), horse, null) as Mono
+		runBlocking {
+			Assertions.assertThat(mono.awaitSingle()).isEqualTo(horse.name)
+		}
+	}
+
 	suspend fun suspendingFunction(value: String): String {
 		delay(1)
 		return value
@@ -293,6 +303,22 @@ class CoroutinesUtilsTests {
 		return "${this.message}-$limit"
 	}
 
+	interface Named {
+		val name: String
+	}
+
+	data class Animal(override val name: String) : Named
+
+	abstract class GenericController<T : Named> {
+
+		suspend fun handle(named: T): String {
+			delay(1)
+			return named.name;
+		}
+	}
+
+	private class AnimalController : GenericController<Animal>()
+
 	@JvmInline
 	value class ValueClass(val value: String)