Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support nested annotations in ASM-based processing again

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

10
spring-context/src/test/java/org/springframework/context/annotation/ClassPathScanningCandidateComponentProviderTests.java
View File

@@ -21,7 +21,7 @@ import java.lang.annotation.RetentionPolicy;
import java.util.Set;
import java.util.regex.Pattern;
import example.gh24375.MyComponent;
import example.gh24375.AnnotatedComponent;
import example.profilescan.DevComponent;
import example.profilescan.ProfileAnnotatedComponent;
import example.profilescan.ProfileMetaAnnotatedComponent;
@@ -39,7 +39,6 @@ import example.scannable.ServiceInvocationCounter;
import example.scannable.StubFooDao;
import example.scannable.sub.BarComponent;
import org.aspectj.lang.annotation.Aspect;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.springframework.beans.factory.annotation.AnnotatedGenericBeanDefinition;
@@ -503,12 +502,11 @@ public class ClassPathScanningCandidateComponentProviderTests {
}
@Test
@Disabled("Disabled until gh-24375 is resolved")
public void gh24375() {
public void componentScanningFindsComponentsAnnotatedWithAnnotationsContainingNestedAnnotations() {
ClassPathScanningCandidateComponentProvider provider = new ClassPathScanningCandidateComponentProvider(true);
Set<BeanDefinition> components = provider.findCandidateComponents(MyComponent.class.getPackage().getName());
Set<BeanDefinition> components = provider.findCandidateComponents(AnnotatedComponent.class.getPackage().getName());
assertThat(components).hasSize(1);
assertThat(components.iterator().next().getBeanClassName()).isEqualTo(MyComponent.class.getName());
assertThat(components.iterator().next().getBeanClassName()).isEqualTo(AnnotatedComponent.class.getName());
}