Refine ReflectiveProcessorBeanRegistrationAotProcessor

Add support for processing implemented interfaces and
remove Reflective from runtime hints.

See spring-projectsgh-28518

Author: sdeleuze

spring-context/src/main/java/org/springframework/context/aot/ReflectiveProcessorBeanRegistrationAotProcessor.java

@@ -40,6 +40,7 @@
 import org.springframework.core.annotation.MergedAnnotation;
 import org.springframework.core.annotation.MergedAnnotations;
 import org.springframework.lang.Nullable;
+import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
 /**
@@ -48,6 +49,7 @@
  * underlying {@link ReflectiveProcessor} implementations.
  *
  * @author Stephane Nicoll
+ * @author Sebastien Deleuze
  */
 class ReflectiveProcessorBeanRegistrationAotProcessor implements BeanRegistrationAotProcessor {
 
@@ -58,37 +60,44 @@ class ReflectiveProcessorBeanRegistrationAotProcessor implements BeanRegistratio
 	public BeanRegistrationAotContribution processAheadOfTime(RegisteredBean registeredBean) {
 		Class<?> beanClass = registeredBean.getBeanClass();
 		Set<Entry> entries = new LinkedHashSet<>();
-		if (isReflective(beanClass)) {
-			entries.add(createEntry(beanClass));
+		processType(entries, beanClass);
+		for (Class<?> implementedInterface : ClassUtils.getAllInterfacesForClass(beanClass)) {
+			processType(entries, implementedInterface);
 		}
-		doWithReflectiveConstructors(beanClass, constructor ->
-				entries.add(createEntry(constructor)));
-		ReflectionUtils.doWithFields(beanClass, field ->
-				entries.add(createEntry(field)), this::isReflective);
-		ReflectionUtils.doWithMethods(beanClass, method ->
-				entries.add(createEntry(method)), this::isReflective);
 		if (!entries.isEmpty()) {
 			return new ReflectiveProcessorBeanRegistrationAotContribution(entries);
 		}
 		return null;
 	}
 
-	private void doWithReflectiveConstructors(Class<?> beanClass, Consumer<Constructor<?>> consumer) {
-		for (Constructor<?> constructor : beanClass.getDeclaredConstructors()) {
+	private void processType(Set<Entry> entries, Class<?> typeToProcess) {
+		if (isReflective(typeToProcess)) {
+			entries.add(createEntry(typeToProcess));
+		}
+		doWithReflectiveConstructors(typeToProcess, constructor ->
+				entries.add(createEntry(constructor)));
+		ReflectionUtils.doWithFields(typeToProcess, field ->
+				entries.add(createEntry(field)), this::isReflective);
+		ReflectionUtils.doWithMethods(typeToProcess, method ->
+				entries.add(createEntry(method)), this::isReflective);
+	}
+
+	private void doWithReflectiveConstructors(Class<?> typeToProcess, Consumer<Constructor<?>> consumer) {
+		for (Constructor<?> constructor : typeToProcess.getDeclaredConstructors()) {
 			if (isReflective(constructor)) {
 				consumer.accept(constructor);
 			}
 		}
 	}
 
 	private boolean isReflective(AnnotatedElement element) {
-		return MergedAnnotations.from(element).isPresent(Reflective.class);
+		return MergedAnnotations.from(element, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY).isPresent(Reflective.class);
 	}
 
 	@SuppressWarnings("unchecked")
 	private Entry createEntry(AnnotatedElement element) {
 		Class<? extends ReflectiveProcessor>[] processorClasses = (Class<? extends ReflectiveProcessor>[])
-				MergedAnnotations.from(element).get(Reflective.class).getClassArray("value");
+				MergedAnnotations.from(element, MergedAnnotations.SearchStrategy.TYPE_HIERARCHY).get(Reflective.class).getClassArray("value");
 		List<ReflectiveProcessor> processors = Arrays.stream(processorClasses).distinct()
 				.map(processorClass -> this.processors.computeIfAbsent(processorClass, BeanUtils::instantiateClass))
 				.toList();
@@ -125,7 +134,6 @@ public ReflectiveProcessorBeanRegistrationAotContribution(Iterable<Entry> entrie
 		@Override
 		public void applyTo(GenerationContext generationContext, BeanRegistrationCode beanRegistrationCode) {
 			RuntimeHints runtimeHints = generationContext.getRuntimeHints();
-			RuntimeHintsUtils.registerAnnotation(runtimeHints, Reflective.class);
 			this.entries.forEach(entry -> {
 				AnnotatedElement element = entry.element();
 				entry.processor().registerReflectionHints(runtimeHints.reflection(), element);

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

@@ -48,6 +48,7 @@
  * Tests for {@link ReflectiveProcessorBeanRegistrationAotProcessor}.
  *
  * @author Stephane Nicoll
+ * @author Sebastien Deleuze
  */
 class ReflectiveProcessorBeanRegistrationAotProcessorTests {
 
@@ -109,6 +110,28 @@ void shouldRegisterAnnotationAndProxyWithAliasFor() {
 		assertThat(RuntimeHintsPredicates.proxies().forInterfaces(RetryInvoker.class, SynthesizedAnnotation.class)).accepts(runtimeHints);
 	}
 
+	@Test
+	void shouldProcessAnnotationOnInterface() {
+		process(SampleMethodAnnotatedBeanWithInterface.class);
+		assertThat(this.generationContext.getRuntimeHints().reflection().getTypeHint(SampleInterface.class))
+				.satisfies(typeHint -> assertThat(typeHint.methods()).singleElement()
+						.satisfies(methodHint -> assertThat(methodHint.getName()).isEqualTo("managed")));
+		assertThat(this.generationContext.getRuntimeHints().reflection().getTypeHint(SampleMethodAnnotatedBeanWithInterface.class))
+				.satisfies(typeHint -> assertThat(typeHint.methods()).singleElement()
+						.satisfies(methodHint -> assertThat(methodHint.getName()).isEqualTo("managed")));
+	}
+
+	@Test
+	void shouldProcessAnnotationOnInheritedClass() {
+		process(SampleMethodAnnotatedBeanWithInheritance.class);
+		assertThat(this.generationContext.getRuntimeHints().reflection().getTypeHint(SampleInheritedClass.class))
+				.satisfies(typeHint -> assertThat(typeHint.methods()).singleElement()
+						.satisfies(methodHint -> assertThat(methodHint.getName()).isEqualTo("managed")));
+		assertThat(this.generationContext.getRuntimeHints().reflection().getTypeHint(SampleMethodAnnotatedBeanWithInheritance.class))
+				.satisfies(typeHint -> assertThat(typeHint.methods()).singleElement()
+						.satisfies(methodHint -> assertThat(methodHint.getName()).isEqualTo("managed")));
+	}
+
 	@Nullable
 	private BeanRegistrationAotContribution createContribution(Class<?> beanClass) {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
@@ -193,6 +216,28 @@ void notManaged() {
 
 	}
 
+	static class SampleMethodAnnotatedBeanWithInterface implements SampleInterface {
+
+		@Override
+		public void managed() {
+		}
+
+		public void notManaged() {
+		}
+
+	}
+
+	static class SampleMethodAnnotatedBeanWithInheritance extends SampleInheritedClass {
+
+		@Override
+		public void managed() {
+		}
+
+		public void notManaged() {
+		}
+
+	}
+
 	@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
 	@Retention(RetentionPolicy.RUNTIME)
 	@Documented
@@ -214,4 +259,17 @@ void notManaged() {
 
 	}
 
+	interface SampleInterface {
+
+		@Reflective
+		void managed();
+	}
+
+	static class SampleInheritedClass {
+
+		@Reflective
+		void managed() {
+		}
+	}
+
 }