Merge branch '6.1.x'

sdeleuze · Apr 10, 2024 · 47f274a · 47f274a
2 parents 35a0d24 + cf1e432
commit 47f274a
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/...in/java/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessor.java b/...in/java/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -66,6 +66,10 @@ private void registerHints(Class<?> type, RuntimeHints runtimeHints) {
 			if (superClass != null) {
 				registerHints(superClass, runtimeHints);
 			}
+			Class<?> enclosingClass = type.getEnclosingClass();
+			if (enclosingClass != null) {
+				registerHints(enclosingClass, runtimeHints);
+			}
 		}
 	}
 

diff --git a/...tlin/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessorTests.kt b/...tlin/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessorTests.kt
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2023 the original author or authors.
+ * Copyright 2002-2024 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.
@@ -66,6 +66,17 @@ class KotlinReflectionBeanRegistrationAotProcessorTests {
 		assertThat(generationContext.runtimeHints.reflection().typeHints()).isEmpty()
 	}
 
+	@Test
+	fun shouldGenerateOuterClassHints() {
+		process(OuterBean.NestedBean::class.java)
+		assertThat(
+			RuntimeHintsPredicates.reflection()
+				.onType(OuterBean.NestedBean::class.java)
+				.withMemberCategory(MemberCategory.INTROSPECT_DECLARED_METHODS).and(RuntimeHintsPredicates.reflection()
+					.onType(OuterBean::class.java).withMemberCategory(MemberCategory.INTROSPECT_DECLARED_METHODS))
+		).accepts(generationContext.runtimeHints)
+	}
+
 	private fun process(beanClass: Class<*>) {
 		createContribution(beanClass)?.applyTo(generationContext, Mockito.mock(BeanRegistrationCode::class.java))
 	}
@@ -87,4 +98,8 @@ class KotlinReflectionBeanRegistrationAotProcessorTests {
 		}
 	}
 
+	class OuterBean {
+		class NestedBean
+	}
+
 }