diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindableRuntimeHintsRegistrar.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindableRuntimeHintsRegistrar.java index e046bdf60812..96c88a864f7f 100644 --- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindableRuntimeHintsRegistrar.java +++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/context/properties/bind/BindableRuntimeHintsRegistrar.java @@ -27,7 +27,11 @@ import java.util.Set; import java.util.stream.StreamSupport; +import kotlin.jvm.JvmClassMappingKt; +import kotlin.reflect.KClass; + import org.springframework.aot.hint.ExecutableMode; +import org.springframework.aot.hint.MemberCategory; import org.springframework.aot.hint.ReflectionHints; import org.springframework.aot.hint.RuntimeHints; import org.springframework.aot.hint.RuntimeHintsRegistrar; @@ -163,7 +167,12 @@ else if (!ObjectUtils.isEmpty(this.propertyDescriptors)) { private void handleConstructor(ReflectionHints hints) { if (this.bindConstructor != null) { verifyParameterNamesAreAvailable(); - hints.registerConstructor(this.bindConstructor, ExecutableMode.INVOKE); + if (KotlinDetector.isKotlinType(this.bindConstructor.getDeclaringClass())) { + KotlinDelegate.handleConstructor(hints, this.bindConstructor); + } + else { + hints.registerConstructor(this.bindConstructor, ExecutableMode.INVOKE); + } return; } Arrays.stream(this.type.getDeclaredConstructors()).filter(this::hasNoParameters).findFirst() @@ -302,4 +311,21 @@ private boolean isJavaType(Class candidate) { } + /** + * Inner class to avoid a hard dependency on Kotlin at runtime. + */ + private static class KotlinDelegate { + + static void handleConstructor(ReflectionHints hints, Constructor constructor) { + KClass kClass = JvmClassMappingKt.getKotlinClass(constructor.getDeclaringClass()); + if (kClass.isData()) { + hints.registerType(constructor.getDeclaringClass(), MemberCategory.INVOKE_DECLARED_CONSTRUCTORS); + } + else { + hints.registerConstructor(constructor, ExecutableMode.INVOKE); + } + } + + } + } diff --git a/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/bind/KotlinBindableRuntimeHintsRegistrarTests.kt b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/bind/KotlinBindableRuntimeHintsRegistrarTests.kt new file mode 100644 index 000000000000..c46b2ed80f4a --- /dev/null +++ b/spring-boot-project/spring-boot/src/test/kotlin/org/springframework/boot/context/properties/bind/KotlinBindableRuntimeHintsRegistrarTests.kt @@ -0,0 +1,45 @@ +/* + * Copyright 2012-2023 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. + * You may obtain a copy of the License at + * + * https://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.boot.context.properties.bind + +import org.assertj.core.api.Assertions.assertThat +import org.junit.jupiter.api.Test +import org.springframework.aot.hint.MemberCategory +import org.springframework.aot.hint.RuntimeHints +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates + + +/** + * Tests for {@link BindableRuntimeHintsRegistrar}. + * + * @author Andy Wilkinsin + */ +class KotlinBindableRuntimeHintsRegistrarTests { + + @Test + fun `registerHints for data class with default value should allow declared constructors to be invoked`() { + val runtimeHints = RuntimeHints() + val register = BindableRuntimeHintsRegistrar.forTypes(PropertyWithDefaultValue::class.java) + register.registerHints(runtimeHints) + assertThat(runtimeHints.reflection().typeHints()).hasSize(1) + assertThat(runtimeHints.reflection().typeHints()).allSatisfy { hint -> + assertThat(hint.memberCategories).containsExactly(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS) + } + } + + data class PropertyWithDefaultValue(var a: String = "alpha") +} \ No newline at end of file