Add hint for use of Qualifier in meta-annotations

Closes gh-29000

spring-beans/src/main/java/org/springframework/beans/factory/annotation/BeanFactoryAnnotationsRuntimeHints.java

@@ -0,0 +1,36 @@
+/*
+ * 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.beans.factory.annotation;
+
+import org.springframework.aot.hint.RuntimeHints;
+import org.springframework.aot.hint.RuntimeHintsRegistrar;
+import org.springframework.aot.hint.support.RuntimeHintsUtils;
+import org.springframework.lang.Nullable;
+
+/**
+ * {@link RuntimeHintsRegistrar} implementation for bean factory annotations.
+ *
+ * @author Stephane Nicoll
+ * @since 6.0
+ */
+class BeanFactoryAnnotationsRuntimeHints implements RuntimeHintsRegistrar {
+
+	@Override
+	public void registerHints(RuntimeHints hints, @Nullable ClassLoader classLoader) {
+		RuntimeHintsUtils.registerSynthesizedAnnotation(hints, Qualifier.class);
+	}
+}

spring-beans/src/main/resources/META-INF/spring/aot.factories

@@ -1,2 +1,5 @@
+org.springframework.aot.hint.RuntimeHintsRegistrar=\
+org.springframework.beans.factory.annotation.BeanFactoryAnnotationsRuntimeHints
+
 org.springframework.beans.factory.aot.BeanFactoryInitializationAotProcessor=\
 org.springframework.beans.factory.aot.BeanRegistrationsAotProcessor

spring-context/src/test/java/org/springframework/context/aot/ApplicationContextAotGeneratorTests.java

@@ -18,12 +18,15 @@
 
 import java.io.IOException;
 import java.lang.reflect.Proxy;
+import java.util.List;
 import java.util.function.BiConsumer;
+import java.util.function.Consumer;
 
 import org.junit.jupiter.api.Test;
 
 import org.springframework.aot.generate.GeneratedFiles.Kind;
 import org.springframework.aot.generate.GenerationContext;
+import org.springframework.aot.hint.JdkProxyHint;
 import org.springframework.aot.hint.MemberCategory;
 import org.springframework.aot.hint.RuntimeHints;
 import org.springframework.aot.hint.TypeReference;
@@ -111,7 +114,8 @@ void processAheadOfTimeWhenHasLazyAutowiringOnField() {
 			ResourceLoader resourceLoader = bean.getResourceLoader();
 			assertThat(resourceLoader).isNotInstanceOf(Proxy.class);
 			RuntimeHints runtimeHints = generationContext.getRuntimeHints();
-			assertThat(runtimeHints.proxies().jdkProxies()).singleElement().satisfies(proxyHint ->
+			assertThat(runtimeHints.proxies().jdkProxies()).satisfies(doesNotHaveProxyFor(ResourceLoader.class));
+			assertThat(runtimeHints.proxies().jdkProxies()).anySatisfy(proxyHint ->
 					assertThat(proxyHint.getProxiedInterfaces()).isEqualTo(TypeReference.listOf(
 							environment.getClass().getInterfaces())));
 
@@ -126,7 +130,8 @@ void processAheadOfTimeWhenHasLazyAutowiringOnMethod() {
 			ResourceLoader resourceLoader = bean.getResourceLoader();
 			assertThat(resourceLoader).isInstanceOf(Proxy.class);
 			RuntimeHints runtimeHints = generationContext.getRuntimeHints();
-			assertThat(runtimeHints.proxies().jdkProxies()).singleElement().satisfies(proxyHint ->
+			assertThat(runtimeHints.proxies().jdkProxies()).satisfies(doesNotHaveProxyFor(Environment.class));
+			assertThat(runtimeHints.proxies().jdkProxies()).anySatisfy(proxyHint ->
 					assertThat(proxyHint.getProxiedInterfaces()).isEqualTo(TypeReference.listOf(
 							resourceLoader.getClass().getInterfaces())));
 		});
@@ -140,7 +145,8 @@ void processAheadOfTimeWhenHasLazyAutowiringOnConstructor() {
 			ResourceLoader resourceLoader = bean.getResourceLoader();
 			assertThat(resourceLoader).isNotInstanceOf(Proxy.class);
 			RuntimeHints runtimeHints = generationContext.getRuntimeHints();
-			assertThat(runtimeHints.proxies().jdkProxies()).singleElement().satisfies(proxyHint ->
+			assertThat(runtimeHints.proxies().jdkProxies()).satisfies(doesNotHaveProxyFor(ResourceLoader.class));
+			assertThat(runtimeHints.proxies().jdkProxies()).anySatisfy(proxyHint ->
 					assertThat(proxyHint.getProxiedInterfaces()).isEqualTo(TypeReference.listOf(
 							environment.getClass().getInterfaces())));
 		});
@@ -156,7 +162,8 @@ void processAheadOfTimeWhenHasLazyAutowiringOnFactoryMethod() {
 			ResourceLoader resourceLoader = bean.getResourceLoader();
 			assertThat(resourceLoader).isNotInstanceOf(Proxy.class);
 			RuntimeHints runtimeHints = generationContext.getRuntimeHints();
-			assertThat(runtimeHints.proxies().jdkProxies()).singleElement().satisfies(proxyHint ->
+			assertThat(runtimeHints.proxies().jdkProxies()).satisfies(doesNotHaveProxyFor(ResourceLoader.class));
+			assertThat(runtimeHints.proxies().jdkProxies()).anySatisfy(proxyHint ->
 					assertThat(proxyHint.getProxiedInterfaces()).isEqualTo(TypeReference.listOf(
 							environment.getClass().getInterfaces())));
 		});
@@ -272,6 +279,10 @@ void processAheadOfTimeWhenHasCglibProxyWriteProxyAndGenerateReflectionHints() t
 				.withMemberCategory(MemberCategory.INVOKE_DECLARED_CONSTRUCTORS)).accepts(context.getRuntimeHints());
 	}
 
+	private Consumer<List<? extends JdkProxyHint>> doesNotHaveProxyFor(Class<?> target) {
+		return hints -> assertThat(hints).noneMatch(hint -> hint.getProxiedInterfaces().get(0).equals(target));
+	}
+
 	private static TestGenerationContext processAheadOfTime(GenericApplicationContext applicationContext) {
 		ApplicationContextAotGenerator generator = new ApplicationContextAotGenerator();
 		TestGenerationContext generationContext = new TestGenerationContext();