Support nested annotations in ASM-based processing again

Spring Framework 5.0 introduced a regression in ASM-based annotation
processing. Specifically, nested annotations were no longer supported,
and component scanning resulted in an exception if a candidate
component was annotated with an annotation that contained nested
annotations.

This commit fixes this regression by introducing special handling in
AnnotationTypeMapping that supports extracting values from objects of
type TypeMappedAnnotation when necessary.

Closes gh-24375
This commit is contained in:
Sam Brannen
2020-01-19 16:55:46 +01:00
parent 9277b47040
commit 974cacac31
11 changed files with 130 additions and 28 deletions

View File

@@ -19,6 +19,6 @@ package example.gh24375;
import org.springframework.stereotype.Component;
@Component
@A(other = @B)
public class MyComponent {
@EnclosingAnnotation(nested2 = @NestedAnnotation)
public class AnnotatedComponent {
}

View File

@@ -25,11 +25,12 @@ import org.springframework.core.annotation.AliasFor;
@Target(ElementType.TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface A {
public @interface EnclosingAnnotation {
@AliasFor("value")
B other() default @B;
@AliasFor("nested2")
NestedAnnotation nested1() default @NestedAnnotation;
@AliasFor("nested1")
NestedAnnotation nested2() default @NestedAnnotation;
@AliasFor("other")
B value() default @B;
}

View File

@@ -23,7 +23,8 @@ import java.lang.annotation.Target;
@Target(ElementType.ANNOTATION_TYPE)
@Retention(RetentionPolicy.RUNTIME)
public @interface B {
public @interface NestedAnnotation {
String name() default "";
}