Add missing reflection hint in BeanRegistrationsAotContribution

Prior to this commit, the `BeanRegistrationsAotContribution` would only contribute introspection hints for declared methods. This does not cover inherited public methods. This commit adds the missing hint on public methods. Fixes gh-31293
spring-projects · Sep 22, 2023 · 1e5e8db · 1e5e8db
1 parent db5ba85
commit 1e5e8db
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 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
@@ -117,10 +117,10 @@ private void generateRegisterHints(RuntimeHints runtimeHints, Map<BeanRegistrati
 		registrations.keySet().forEach(beanRegistrationKey -> {
 			ReflectionHints hints = runtimeHints.reflection();
 			Class<?> beanClass = beanRegistrationKey.beanClass();
-			hints.registerType(beanClass, MemberCategory.INTROSPECT_DECLARED_METHODS);
+			hints.registerType(beanClass, MemberCategory.INTROSPECT_PUBLIC_METHODS, MemberCategory.INTROSPECT_DECLARED_METHODS);
 			// Workaround for https://github.com/oracle/graal/issues/6510
 			if (beanClass.isRecord()) {
-				hints.registerType(beanClass, MemberCategory.INVOKE_DECLARED_METHODS);
+				hints.registerType(beanClass, MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_DECLARED_METHODS);
 			}
 			// Workaround for https://github.com/oracle/graal/issues/6529
 			ReflectionUtils.doWithMethods(beanClass, method -> {

diff --git a/...est/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java b/...est/java/org/springframework/beans/factory/aot/BeanRegistrationsAotContributionTests.java
@@ -147,7 +147,7 @@ void applyToRegisterReflectionHints() {
 		BeanRegistrationsAotContribution contribution = createContribution(TestBean.class, generator);
 		contribution.applyTo(this.generationContext, this.beanFactoryInitializationCode);
 		assertThat(reflection().onType(TestBean.class)
-				.withMemberCategory(MemberCategory.INTROSPECT_DECLARED_METHODS))
+				.withMemberCategories(MemberCategory.INTROSPECT_PUBLIC_METHODS, MemberCategory.INTROSPECT_DECLARED_METHODS))
 				.accepts(this.generationContext.getRuntimeHints());
 	}
 
@@ -159,7 +159,8 @@ void applyToRegisterReflectionHintsOnRecordBean() {
 		BeanRegistrationsAotContribution contribution = createContribution(RecordBean.class, generator);
 		contribution.applyTo(this.generationContext, this.beanFactoryInitializationCode);
 		assertThat(reflection().onType(RecordBean.class)
-				.withMemberCategories(MemberCategory.INTROSPECT_DECLARED_METHODS, MemberCategory.INVOKE_DECLARED_METHODS))
+				.withMemberCategories(MemberCategory.INTROSPECT_PUBLIC_METHODS, MemberCategory.INTROSPECT_DECLARED_METHODS,
+						MemberCategory.INVOKE_PUBLIC_METHODS, MemberCategory.INVOKE_DECLARED_METHODS))
 				.accepts(this.generationContext.getRuntimeHints());
 	}