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

Register proxy hint for meta-annotations with attribute override 

Closes gh-28767
This commit is contained in:
Stephane Nicoll 2022-07-29 13:23:32 +02:00
parent e0190c12d4
commit 56a8c1a9db
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
spring-core/src/main/java/org/springframework/aot/hint/support/RuntimeHintsUtils.java
View File

@ -60,7 +60,10 @@ public abstract class RuntimeHintsUtils {
hints.reflection().registerType(annotationType, ANNOTATION_HINT); hints.reflection().registerType(annotationType, ANNOTATION_HINT);
Set<Class<?>> allAnnotations = new LinkedHashSet<>(); Set<Class<?>> allAnnotations = new LinkedHashSet<>();
collectAliasedAnnotations(new HashSet<>(), allAnnotations, annotationType); collectAliasedAnnotations(new HashSet<>(), allAnnotations, annotationType);
allAnnotations.forEach(annotation -> hints.reflection().registerType(annotation, ANNOTATION_HINT)); allAnnotations.forEach(annotation -> {
hints.reflection().registerType(annotation, ANNOTATION_HINT);
hints.proxies().registerJdkProxy(annotation, SynthesizedAnnotation.class);
});
if (!allAnnotations.isEmpty()) { if (!allAnnotations.isEmpty()) {
hints.proxies().registerJdkProxy(annotationType, SynthesizedAnnotation.class); hints.proxies().registerJdkProxy(annotationType, SynthesizedAnnotation.class);
} }

15
spring-core/src/test/java/org/springframework/aot/hint/support/RuntimeHintsUtilsTests.java
View File

@ -60,13 +60,15 @@ class RuntimeHintsUtilsTests {
} }
@Test @Test
void registerAnnotationTypeProxyRegistersJdkProxy() { void registerAnnotationTypeProxyRegistersJdkProxies() {
RuntimeHintsUtils.registerAnnotation(this.hints, RetryInvoker.class); RuntimeHintsUtils.registerAnnotation(this.hints, RetryInvoker.class);
assertThat(this.hints.reflection().typeHints()) assertThat(this.hints.reflection().typeHints())
.anySatisfy(annotationHint(RetryInvoker.class)) .anySatisfy(annotationHint(RetryInvoker.class))
.anySatisfy(annotationHint(SampleInvoker.class)); .anySatisfy(annotationHint(SampleInvoker.class));
assertThat(this.hints.proxies().jdkProxies()).singleElement() assertThat(this.hints.proxies().jdkProxies())
.satisfies(annotationProxy(RetryInvoker.class)); .anySatisfy(annotationProxy(RetryInvoker.class))
.anySatisfy(annotationProxy(SampleInvoker.class))
.hasSize(2);
} }
@Test @Test
@ -78,8 +80,11 @@ class RuntimeHintsUtilsTests {
.anySatisfy(annotationHint(RetryInvoker.class)) .anySatisfy(annotationHint(RetryInvoker.class))
.anySatisfy(annotationHint(SampleInvoker.class)) .anySatisfy(annotationHint(SampleInvoker.class))
.hasSize(3); .hasSize(3);
assertThat(this.hints.proxies().jdkProxies()).singleElement() assertThat(this.hints.proxies().jdkProxies())
.satisfies(annotationProxy(RetryWithEnabledFlagInvoker.class)); .anySatisfy(annotationProxy(RetryWithEnabledFlagInvoker.class))
.anySatisfy(annotationProxy(RetryInvoker.class))
.anySatisfy(annotationProxy(SampleInvoker.class))
.hasSize(3);
} }
private Consumer<TypeHint> annotationHint(Class<?> type) { private Consumer<TypeHint> annotationHint(Class<?> type) {