Merge branch '6.1.x'

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

@@ -18,7 +18,6 @@ package org.springframework.core;
 
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
-import java.lang.reflect.Modifier;
 import java.util.Map;
 import java.util.Objects;
 
@@ -30,6 +29,7 @@ import kotlin.reflect.KClassifier;
 import kotlin.reflect.KFunction;
 import kotlin.reflect.KParameter;
 import kotlin.reflect.full.KCallables;
+import kotlin.reflect.full.KClasses;
 import kotlin.reflect.jvm.KCallablesJvm;
 import kotlin.reflect.jvm.ReflectJvmMapping;
 import kotlinx.coroutines.BuildersKt;
@@ -46,7 +46,6 @@ import reactor.core.publisher.Mono;
 
 import org.springframework.util.Assert;
 import org.springframework.util.CollectionUtils;
-import org.springframework.util.ReflectionUtils;
 
 /**
  * Utilities for working with Kotlin Coroutines.
@@ -57,9 +56,6 @@ import org.springframework.util.ReflectionUtils;
  */
 public abstract class CoroutinesUtils {
 
-	private static final ReflectionUtils.MethodFilter boxImplFilter =
-			(method -> method.isSynthetic() && Modifier.isStatic(method.getModifiers()) && method.getName().equals("box-impl"));
-
 	/**
 	 * Convert a {@link Deferred} instance to a {@link Mono}.
 	 */
@@ -123,10 +119,7 @@ public abstract class CoroutinesUtils {
 									if (parameter.getType().getClassifier() instanceof KClass<?> kClass) {
 										Class<?> javaClass = JvmClassMappingKt.getJavaClass(kClass);
 										if (KotlinDetector.isInlineClass(javaClass)) {
-											Method[] methods = ReflectionUtils.getUniqueDeclaredMethods(javaClass, boxImplFilter);
-											Assert.state(methods.length == 1,
-													"Unable to find a single box-impl synthetic static method in " + javaClass.getName());
-											argMap.put(parameter, ReflectionUtils.invokeMethod(methods[0], null, args[index]));
+											argMap.put(parameter, KClasses.getPrimaryConstructor(kClass).call(args[index]));
 										}
 										else {
 											argMap.put(parameter, args[index]);

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

@@ -154,6 +154,17 @@ class CoroutinesUtilsTests {
 		}
 	}
 
+	@Test
+	fun invokeSuspendingFunctionWithValueClassWithInitParameter() {
+		val method = CoroutinesUtilsTests::class.java.declaredMethods.first { it.name.startsWith("suspendingFunctionWithValueClassWithInit") }
+		val mono = CoroutinesUtils.invokeSuspendingFunction(method, this, "", null) as Mono
+		Assertions.assertThatIllegalArgumentException().isThrownBy {
+			runBlocking {
+				mono.awaitSingle()
+			}
+		}
+	}
+
 	@Test
 	fun invokeSuspendingFunctionWithExtension() {
 		val method = CoroutinesUtilsTests::class.java.getDeclaredMethod("suspendingFunctionWithExtension",
@@ -206,6 +217,11 @@ class CoroutinesUtilsTests {
 		return value.value
 	}
 
+	suspend fun suspendingFunctionWithValueClassWithInit(value: ValueClassWithInit): String {
+		delay(1)
+		return value.value
+	}
+
 	suspend fun CustomException.suspendingFunctionWithExtension(): String {
 		delay(1)
 		return "${this.message}"
@@ -219,6 +235,15 @@ class CoroutinesUtilsTests {
 	@JvmInline
 	value class ValueClass(val value: String)
 
+	@JvmInline
+	value class ValueClassWithInit(val value: String) {
+		 init {
+		     if (value.isEmpty()) {
+				 throw IllegalArgumentException()
+			 }
+		 }
+	}
+
 	class CustomException(message: String) : Throwable(message)
 
 }