diff --git a/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverterRuntimeHints.java b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverterRuntimeHints.java new file mode 100644 index 00000000000..1eae9ab133e --- /dev/null +++ b/spring-core/src/main/java/org/springframework/core/convert/support/ObjectToObjectConverterRuntimeHints.java @@ -0,0 +1,47 @@ +/* + * Copyright 2002-2022 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.core.convert.support; + +import java.time.LocalDate; +import java.util.Collections; +import java.util.List; + +import org.springframework.aot.hint.ExecutableMode; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.TypeReference; +import org.springframework.lang.Nullable; + +/** + * {@link RuntimeHintsRegistrar} to register hints for {@link ObjectToObjectConverter} + * popular conventions. + * + * @author Sebastien Deleuze + * @since 6.0 + */ +class ObjectToObjectConverterRuntimeHints implements RuntimeHintsRegistrar { + + @Override + public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) { + TypeReference sqlDateTypeReference = TypeReference.of("java.sql.Date"); + hints.reflection().registerTypeIfPresent(classLoader, sqlDateTypeReference.getName(), hint -> hint + .withMethod("toLocalDate", Collections.emptyList(), ExecutableMode.INVOKE) + .onReachableType(sqlDateTypeReference) + .withMethod("valueOf", List.of(TypeReference.of(LocalDate.class)), ExecutableMode.INVOKE) + .onReachableType(sqlDateTypeReference)); + } +} diff --git a/spring-core/src/main/resources/META-INF/spring/aot.factories b/spring-core/src/main/resources/META-INF/spring/aot.factories index e1e6672e561..776f4c8c734 100644 --- a/spring-core/src/main/resources/META-INF/spring/aot.factories +++ b/spring-core/src/main/resources/META-INF/spring/aot.factories @@ -1,2 +1,3 @@ org.springframework.aot.hint.RuntimeHintsRegistrar=\ -org.springframework.aot.hint.support.SpringFactoriesLoaderRuntimeHints +org.springframework.aot.hint.support.SpringFactoriesLoaderRuntimeHints,\ +org.springframework.core.convert.support.ObjectToObjectConverterRuntimeHints diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/ObjectToObjectConverterRuntimeHintsTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/ObjectToObjectConverterRuntimeHintsTests.java new file mode 100644 index 00000000000..d3889a15149 --- /dev/null +++ b/spring-core/src/test/java/org/springframework/core/convert/support/ObjectToObjectConverterRuntimeHintsTests.java @@ -0,0 +1,55 @@ +/* + * Copyright 2002-2022 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.core.convert.support; + +import java.time.LocalDate; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.predicate.RuntimeHintsPredicates; +import org.springframework.core.io.support.SpringFactoriesLoader; +import org.springframework.util.ClassUtils; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link ObjectToObjectConverterRuntimeHints}. + * + * @author Sebastien Deleuze + */ +class ObjectToObjectConverterRuntimeHintsTests { + + private RuntimeHints hints; + + @BeforeEach + void setup() { + this.hints = new RuntimeHints(); + SpringFactoriesLoader.forResourceLocation("META-INF/spring/aot.factories") + .load(RuntimeHintsRegistrar.class).forEach(registrar -> registrar + .registerHints(this.hints, ClassUtils.getDefaultClassLoader())); + } + + @Test + void javaSqlDateHasHints() throws NoSuchMethodException { + assertThat(RuntimeHintsPredicates.reflection().onMethod(java.sql.Date.class, "toLocalDate")).accepts(this.hints); + assertThat(RuntimeHintsPredicates.reflection().onMethod(java.sql.Date.class.getMethod("valueOf", LocalDate.class))).accepts(this.hints); + } + +}