Do not register SynthesizedAnnotation proxy for @AliasFor

Closes gh-28953
spring-projects · Aug 11, 2022 · 7631a09 · 7631a09
1 parent 0207f3a
commit 7631a09
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/spring-core/src/main/java/org/springframework/aot/hint/support/RuntimeHintsUtils.java b/spring-core/src/main/java/org/springframework/aot/hint/support/RuntimeHintsUtils.java
@@ -35,6 +35,7 @@
  * Utility methods for runtime hints support code.
  *
  * @author Stephane Nicoll
+ * @author Sam Brannen
  * @since 6.0
  */
 public abstract class RuntimeHintsUtils {
@@ -88,7 +89,8 @@ private static void registerAnnotation(RuntimeHints hints, Class<?> annotationTy
 	}
 
 	private static void collectAliasedAnnotations(Set<Class<?>> seen, Set<Class<?>> types, Class<?> annotationType) {
-		if (seen.contains(annotationType) || Reflective.class.equals(annotationType)) {
+		if (seen.contains(annotationType) || AliasFor.class.equals(annotationType) ||
+				Reflective.class.equals(annotationType)) {
 			return;
 		}
 		seen.add(annotationType);

diff --git a/spring-core/src/test/java/org/springframework/aot/hint/support/RuntimeHintsUtilsTests.java b/spring-core/src/test/java/org/springframework/aot/hint/support/RuntimeHintsUtilsTests.java
@@ -37,6 +37,7 @@
  * Tests for {@link RuntimeHintsUtils}.
  *
  * @author Stephane Nicoll
+ * @author Sam Brannen
  */
 class RuntimeHintsUtilsTests {
 
@@ -80,6 +81,14 @@ void registerAnnotationTypeProxyRegistersJdkProxies() {
 				.hasSize(2);
 	}
 
+	@Test  // gh-28953
+	void registerAnnotationForAliasForShouldNotRegisterSynthesizedAnnotationProxy() {
+		RuntimeHintsUtils.registerAnnotation(this.hints, AliasFor.class);
+		assertThat(this.hints.reflection().typeHints()).singleElement()
+				.satisfies(annotationHint(AliasFor.class));
+		assertThat(this.hints.proxies().jdkProxies()).isEmpty();
+	}
+
 	@Test
 	void registerAnnotationTypeWhereUsedAsAMetaAnnotationRegistersHierarchy() {
 		RuntimeHintsUtils.registerAnnotation(this.hints, RetryWithEnabledFlagInvoker.class);