From e7e60f7cb9c73339294e3f078fe722ca28d49b44 Mon Sep 17 00:00:00 2001 From: Phillip Webb Date: Tue, 10 May 2022 15:14:20 -0700 Subject: [PATCH] Add native hints for core annotations Add `CoreAnnotationsRuntimeHintsRegistrar` to provide native hints for `@Order` and `@AliasFor`. Closes gh-28442 --- .../CoreAnnotationsRuntimeHintsRegistrar.java | 43 +++++++++++++ .../resources/META-INF/spring/aot.factories | 2 + ...AnnotationsRuntimeHintsRegistrarTests.java | 62 +++++++++++++++++++ 3 files changed, 107 insertions(+) create mode 100644 spring-core/src/main/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrar.java create mode 100644 spring-core/src/main/resources/META-INF/spring/aot.factories create mode 100644 spring-core/src/test/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java diff --git a/spring-core/src/main/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrar.java b/spring-core/src/main/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrar.java new file mode 100644 index 00000000000..53fc59a6928 --- /dev/null +++ b/spring-core/src/main/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrar.java @@ -0,0 +1,43 @@ +/* + * 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.annotation; + +import java.util.function.Consumer; + +import org.springframework.aot.hint.MemberCategory; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.TypeHint; + +/** + * {@link RuntimeHintsRegistrar} for core annotations. + * + * @author Phillip Webb + * @since 6.0 + */ +class CoreAnnotationsRuntimeHintsRegistrar implements RuntimeHintsRegistrar { + + private static final Consumer HINT = builder -> builder.withMembers( + MemberCategory.INVOKE_DECLARED_METHODS); + + @Override + public void registerHints(RuntimeHints hints, ClassLoader classLoader) { + hints.reflection().registerType(AliasFor.class, HINT); + hints.reflection().registerType(Order.class, HINT); + } + +} diff --git a/spring-core/src/main/resources/META-INF/spring/aot.factories b/spring-core/src/main/resources/META-INF/spring/aot.factories new file mode 100644 index 00000000000..dad3ddfbee9 --- /dev/null +++ b/spring-core/src/main/resources/META-INF/spring/aot.factories @@ -0,0 +1,2 @@ +org.springframework.aot.hint.RuntimeHintsRegistrar=\ +org.springframework.core.annotation.CoreAnnotationsRuntimeHintsRegistrar diff --git a/spring-core/src/test/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java b/spring-core/src/test/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java new file mode 100644 index 00000000000..84873b10edf --- /dev/null +++ b/spring-core/src/test/java/org/springframework/core/annotation/CoreAnnotationsRuntimeHintsRegistrarTests.java @@ -0,0 +1,62 @@ +/* + * 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.annotation; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import org.springframework.aot.hint.MemberCategory; +import org.springframework.aot.hint.RuntimeHints; +import org.springframework.aot.hint.RuntimeHintsRegistrar; +import org.springframework.aot.hint.TypeReference; +import org.springframework.core.io.support.SpringFactoriesLoader; +import org.springframework.util.ClassUtils; + +import static org.assertj.core.api.Assertions.assertThat; + +/** + * Tests for {@link CoreAnnotationsRuntimeHintsRegistrar}. + * + * @author Phillip Webb + */ +class CoreAnnotationsRuntimeHintsRegistrarTests { + + 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 aliasForHasHints() { + assertThat(this.hints.reflection().getTypeHint(TypeReference.of(AliasFor.class))) + .satisfies((hint) -> assertThat(hint.getMemberCategories()) + .containsExactly(MemberCategory.INVOKE_DECLARED_METHODS)); + } + + @Test + void orderAnnotationHasHints() { + assertThat(this.hints.reflection().getTypeHint(TypeReference.of(Order.class))) + .satisfies((hint) -> assertThat(hint.getMemberCategories()) + .containsExactly(MemberCategory.INVOKE_DECLARED_METHODS)); + } + +}