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

Revised test for ImportBeanDefinitionRegistrar double scan 

Issue: SPR-12334
(cherry picked from commit 6e5711a)
This commit is contained in:
Juergen Hoeller 2014-10-22 02:16:39 +02:00
parent 3106905877
commit a2731f1a4f
2 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
View File

@ -456,7 +456,8 @@ class ConfigurationClassParser {
ImportSelector selector = BeanUtils.instantiateClass(candidateClass, ImportSelector.class); ImportSelector selector = BeanUtils.instantiateClass(candidateClass, ImportSelector.class);
invokeAwareMethods(selector); invokeAwareMethods(selector);
if (!deferred && selector instanceof DeferredImportSelector) { if (!deferred && selector instanceof DeferredImportSelector) {
this.deferredImportSelectors.add(new DeferredImportSelectorHolder(configClass, (DeferredImportSelector) selector)); this.deferredImportSelectors.add(
new DeferredImportSelectorHolder(configClass, (DeferredImportSelector) selector));
} }
else { else {
String[] importClassNames = selector.selectImports(currentSourceClass.getMetadata()); String[] importClassNames = selector.selectImports(currentSourceClass.getMetadata());
@ -465,15 +466,19 @@ class ConfigurationClassParser {
} }
} }
else if (candidate.isAssignable(ImportBeanDefinitionRegistrar.class)) { else if (candidate.isAssignable(ImportBeanDefinitionRegistrar.class)) {
// Candidate class is an ImportBeanDefinitionRegistrar -> delegate to it to register additional bean definitions // Candidate class is an ImportBeanDefinitionRegistrar ->
// delegate to it to register additional bean definitions
Class<?> candidateClass = candidate.loadClass(); Class<?> candidateClass = candidate.loadClass();
ImportBeanDefinitionRegistrar registrar = BeanUtils.instantiateClass(candidateClass, ImportBeanDefinitionRegistrar.class); ImportBeanDefinitionRegistrar registrar =
BeanUtils.instantiateClass(candidateClass, ImportBeanDefinitionRegistrar.class);
invokeAwareMethods(registrar); invokeAwareMethods(registrar);
configClass.addImportBeanDefinitionRegistrar(registrar, currentSourceClass.getMetadata()); configClass.addImportBeanDefinitionRegistrar(registrar, currentSourceClass.getMetadata());
} }
else { else {
// Candidate class not an ImportSelector or ImportBeanDefinitionRegistrar -> process it as a @Configuration class // Candidate class not an ImportSelector or ImportBeanDefinitionRegistrar ->
this.importStack.registerImport(currentSourceClass.getMetadata(), candidate.getMetadata().getClassName()); // process it as a @Configuration class
this.importStack.registerImport(
currentSourceClass.getMetadata(), candidate.getMetadata().getClassName());
processConfigurationClass(candidate.asConfigClass(configClass)); processConfigurationClass(candidate.asConfigClass(configClass));
} }
} }
@ -678,12 +683,12 @@ class ConfigurationClassParser {
/** /**
* Simple wrapper that allows annotated source classes to be dealt with in a uniform * Simple wrapper that allows annotated source classes to be dealt with
* manor, regardless of how they are loaded. * in a uniform manner, regardless of how they are loaded.
*/ */
private class SourceClass { private class SourceClass {
private final Object source; // Class or MetaDataReader private final Object source; // Class or MetadataReader
private final AnnotationMetadata metadata; private final AnnotationMetadata metadata;

8
spring-context/src/test/java/org/springframework/context/annotation/spr12334/Spr12334Tests.java
View File

@ -33,6 +33,8 @@ public class Spr12334Tests {
@Test @Test
public void shouldNotScanTwice() { public void shouldNotScanTwice() {
TestImport.scanned = false;
AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext(); AnnotationConfigApplicationContext context = new AnnotationConfigApplicationContext();
context.scan(TestImport.class.getPackage().getName()); context.scan(TestImport.class.getPackage().getName());
context.refresh(); context.refresh();
@ -53,14 +55,14 @@ public class Spr12334Tests {
public static class TestImport implements ImportBeanDefinitionRegistrar { public static class TestImport implements ImportBeanDefinitionRegistrar {
private boolean scanned = false; private static boolean scanned = false;
@Override @Override
public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) { public void registerBeanDefinitions(AnnotationMetadata metadata, BeanDefinitionRegistry registry) {
if (this.scanned) { if (scanned) {
throw new IllegalStateException("Already scanned"); throw new IllegalStateException("Already scanned");
} }
this.scanned = true; scanned = true;
} }
} }