Polish reflection hints on bean registration interfaces

This commit ensures that we register reflection hints on interfaces in the entire type hierarchy, including extended interfaces. Closes gh-31350
spring-projects · Oct 3, 2023 · 28c9761 · 28c9761
1 parent 74fc8bd
commit 28c9761
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 8 deletions.
diff --git a/...src/main/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContribution.java b/...src/main/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContribution.java
@@ -115,16 +115,21 @@ private void generateRegisterHints(RuntimeHints runtimeHints, Map<BeanRegistrati
 			ReflectionHints hints = runtimeHints.reflection();
 			Class<?> beanClass = beanRegistrationKey.beanClass();
 			hints.registerType(beanClass, MemberCategory.INTROSPECT_PUBLIC_METHODS, MemberCategory.INTROSPECT_DECLARED_METHODS);
-			Class<?> currentClass = beanClass;
-			while (currentClass != null && currentClass != Object.class) {
-				for (Class<?> interfaceType : currentClass.getInterfaces()) {
-					if (!ClassUtils.isJavaLanguageInterface(interfaceType)) {
-						hints.registerType(interfaceType, MemberCategory.INTROSPECT_PUBLIC_METHODS);
-					}
+			introspectPublicMethodsOnAllInterfaces(hints, beanClass);
+		});
+	}
+
+	private void introspectPublicMethodsOnAllInterfaces(ReflectionHints hints, Class<?> type) {
+		Class<?> currentClass = type;
+		while (currentClass != null && currentClass != Object.class) {
+			for (Class<?> interfaceType : currentClass.getInterfaces()) {
+				if (!ClassUtils.isJavaLanguageInterface(interfaceType)) {
+					hints.registerType(interfaceType, MemberCategory.INTROSPECT_PUBLIC_METHODS);
+					introspectPublicMethodsOnAllInterfaces(hints, interfaceType);
 				}
-				currentClass = currentClass.getSuperclass();
 			}
-		});
+			currentClass = currentClass.getSuperclass();
+		}
 	}
 
 	/**

diff --git a/...est/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java b/...est/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java
@@ -36,6 +36,7 @@
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.support.RegisteredBean;
 import org.springframework.beans.factory.support.RootBeanDefinition;
+import org.springframework.beans.testfixture.beans.AgeHolder;
 import org.springframework.beans.testfixture.beans.Employee;
 import org.springframework.beans.testfixture.beans.ITestBean;
 import org.springframework.beans.testfixture.beans.TestBean;
@@ -151,6 +152,9 @@ void applyToRegisterReflectionHints() {
 		assertThat(reflection().onType(ITestBean.class)
 				.withMemberCategory(MemberCategory.INTROSPECT_PUBLIC_METHODS))
 				.accepts(this.generationContext.getRuntimeHints());
+		assertThat(reflection().onType(AgeHolder.class)
+				.withMemberCategory(MemberCategory.INTROSPECT_PUBLIC_METHODS))
+				.accepts(this.generationContext.getRuntimeHints());
 	}
 
 	private RegisteredBean registerBean(RootBeanDefinition rootBeanDefinition) {