Fix NoClassDefFoundError when kotlin-reflect is missing

Signed-off-by: wonyongg <[email protected]>

Author: wonyongg

spring-beans/src/main/java/org/springframework/beans/BeanUtils.java

@@ -69,6 +69,7 @@
  * @author Rob Harrop
  * @author Sam Brannen
  * @author Sebastien Deleuze
+ * @author Wonyong Hwang
  */
 public abstract class BeanUtils {
 
@@ -186,7 +187,7 @@ public static <T> T instantiateClass(Constructor<T> ctor, @Nullable Object... ar
 		Assert.notNull(ctor, "Constructor must not be null");
 		try {
 			ReflectionUtils.makeAccessible(ctor);
-			if (KotlinDetector.isKotlinType(ctor.getDeclaringClass())) {
+			if (KotlinDetector.isKotlinType(ctor.getDeclaringClass()) && KotlinDetector.isKotlinReflectPresent()) {
 				return KotlinDelegate.instantiateClass(ctor, args);
 			}
 			else {
@@ -279,7 +280,7 @@ else if (ctors.length == 0) {
 	 */
 	public static <T> @Nullable Constructor<T> findPrimaryConstructor(Class<T> clazz) {
 		Assert.notNull(clazz, "Class must not be null");
-		if (KotlinDetector.isKotlinType(clazz)) {
+		if (KotlinDetector.isKotlinType(clazz) && KotlinDetector.isKotlinReflectPresent()) {
 			return KotlinDelegate.findPrimaryConstructor(clazz);
 		}
 		if (clazz.isRecord()) {

spring-beans/src/test/java/org/springframework/beans/BeanUtilsTests.java

@@ -61,6 +61,7 @@
  * @author Chris Beams
  * @author Sebastien Deleuze
  * @author Sam Brannen
+ * @author Wonyong Hwang
  * @since 19.05.2003
  */
 class BeanUtilsTests {
@@ -533,6 +534,20 @@ void resolveMultipleRecordePackagePrivateConstructor() throws NoSuchMethodExcept
 				.isEqualTo(RecordWithMultiplePackagePrivateConstructors.class.getDeclaredConstructor(String.class, String.class));
 	}
 
+	@Test
+	void instantiateClassWithJavaTypeWorksNormally() throws NoSuchMethodException {
+		Constructor<TestBean> ctor = TestBean.class.getDeclaredConstructor();
+		TestBean instance = BeanUtils.instantiateClass(ctor);
+		assertThat(instance).isNotNull();
+		assertThat(instance.getClass()).isEqualTo(TestBean.class);
+	}
+
+	@Test
+	void findPrimaryConstructorWithJavaTypeReturnsNull() {
+		Constructor<?> primaryConstructor = BeanUtils.findPrimaryConstructor(TestBean.class);
+		assertThat(primaryConstructor).isNull();
+	}
+
 	private void assertSignatureEquals(Method desiredMethod, String signature) {
 		assertThat(BeanUtils.resolveSignature(signature, MethodSignatureBean.class)).isEqualTo(desiredMethod);
 	}

spring-beans/src/test/kotlin/org/springframework/beans/BeanUtilsKotlinTests.kt

@@ -23,6 +23,7 @@ import org.junit.jupiter.api.Test
  * Kotlin tests for [BeanUtils].
  * 
  * @author Sebastien Deleuze
+ * @author Wonyong Hwang
  */
 @Suppress("unused", "UNUSED_PARAMETER")
 class BeanUtilsKotlinTests {
@@ -192,6 +193,20 @@ class BeanUtilsKotlinTests {
 		assertThat(names).isEmpty()
 	}
 
+	@Test
+	fun `instantiateClass with Kotlin type works correctly`() {
+		val ctor = Foo::class.java.getDeclaredConstructor(String::class.java, Int::class.java)
+		val foo = BeanUtils.instantiateClass(ctor, "test", 42)
+		assertThat(foo.param1).isEqualTo("test")
+		assertThat(foo.param2).isEqualTo(42)
+	}
+
+	@Test
+	fun `findPrimaryConstructor with Kotlin type works correctly`() {
+		val primaryConstructor = BeanUtils.findPrimaryConstructor(Foo::class.java)
+		assertThat(primaryConstructor).isNotNull()
+		assertThat(primaryConstructor!!.parameterCount).isEqualTo(2)
+	}
 
 	class Foo(val param1: String, val param2: Int)