root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Merge branch '6.1.x'

This commit is contained in:
Sébastien Deleuze 2024-04-10 17:55:09 +02:00
parent 35a0d24dc3 ca2b3c170c
commit 711ddd1ac6
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
spring-context/src/main/java/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessor.java
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -66,6 +66,10 @@ class KotlinReflectionBeanRegistrationAotProcessor implements BeanRegistrationAo
if (superClass != null) { if (superClass != null) {
registerHints(superClass, runtimeHints); registerHints(superClass, runtimeHints);
} }
Class<?> enclosingClass = type.getEnclosingClass();
if (enclosingClass != null) {
runtimeHints.reflection().registerType(enclosingClass);
}
} }
} }

17
spring-context/src/test/kotlin/org/springframework/context/aot/KotlinReflectionBeanRegistrationAotProcessorTests.kt
View File

@ -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"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with 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() 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))
).accepts(generationContext.runtimeHints)
}
private fun process(beanClass: Class<*>) { private fun process(beanClass: Class<*>) {
createContribution(beanClass)?.applyTo(generationContext, Mockito.mock(BeanRegistrationCode::class.java)) createContribution(beanClass)?.applyTo(generationContext, Mockito.mock(BeanRegistrationCode::class.java))
} }
@ -87,4 +98,8 @@ class KotlinReflectionBeanRegistrationAotProcessorTests {
} }
} }
class OuterBean {
class NestedBean
}
} }