Consider @import classes as lite @configuration

philwebb · philwebb · commit e55630744537 · 2013-05-02T10:34:44.000-07:00
Allow classes that are annotated with @import to be considered as 'lite' @configuration candidates. Allows the AnnotationConfigApplicationContext to directly register @import beans even if they are not @components.
diff --git a/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java b/spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
@@ -101,9 +101,12 @@ public static boolean isFullConfigurationCandidate(AnnotationMetadata metadata)
 	}
 
 	public static boolean isLiteConfigurationCandidate(AnnotationMetadata metadata) {
-		return !metadata.isInterface() && // not an interface or an annotation
-				(metadata.isAnnotated(Component.class.getName()) ||
-				metadata.hasAnnotatedMethods(Bean.class.getName()));
+		if(metadata.isInterface()) {
+			return false; // do not consider an interface or an annotation
+		}
+		return metadata.isAnnotated(Import.class.getName()) ||
+				metadata.isAnnotated(Component.class.getName()) ||
+				metadata.hasAnnotatedMethods(Bean.class.getName());
 	}
 
 
diff --git a/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportAnnotationDetectionTests.java b/spring-context/src/test/java/org/springframework/context/annotation/configuration/ImportAnnotationDetectionTests.java
@@ -25,12 +25,15 @@
 import java.lang.annotation.Target;
 
 import org.junit.Test;
+import org.springframework.stereotype.Service;
 import org.springframework.tests.sample.beans.TestBean;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Import;
 
+import static org.junit.Assert.*;
+
 /**
  * Tests that @Import may be used both as a locally declared and meta-declared
  * annotation, that all declarations are processed, and that any local declaration
@@ -70,6 +73,16 @@ public void localImportIsProcessedLast() {
 		assertThat(ctx.getBean("testBean2", TestBean.class).getName(), is("2a"));
 	}
 
+	@Test
+	public void importFromBean() throws Exception {
+		AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
+		ctx.register(ImportFromBean.class);
+		ctx.refresh();
+		assertThat(ctx.containsBean("importAnnotationDetectionTests.ImportFromBean"), is(true));
+		assertThat(ctx.containsBean("testBean1"), is(true));
+		assertThat(ctx.getBean("testBean1", TestBean.class).getName(), is("1"));
+	}
+
 	@Configuration
 	@MetaImport1
 	@MetaImport2
@@ -136,4 +149,9 @@ TestBean testBean3() {
 			return new TestBean("3");
 		}
 	}
+
+	@MetaImport1
+	static class ImportFromBean {
+
+	}
 }

Original file line number	Diff line number	Diff line change
`@@ -101,9 +101,12 @@ public static boolean isFullConfigurationCandidate(AnnotationMetadata metadata)`
`101`	`101`	`}`
`102`	`102`
`103`	`103`	`public static boolean isLiteConfigurationCandidate(AnnotationMetadata metadata) {`
`104`		`- return !metadata.isInterface() && // not an interface or an annotation`
`105`		`- (metadata.isAnnotated(Component.class.getName()) \|\|`
`106`		`- metadata.hasAnnotatedMethods(Bean.class.getName()));`
	`104`	`+ if(metadata.isInterface()) {`
	`105`	`+ return false; // do not consider an interface or an annotation`
	`106`	`+ }`
	`107`	`+ return metadata.isAnnotated(Import.class.getName()) \|\|`
	`108`	`+ metadata.isAnnotated(Component.class.getName()) \|\|`
	`109`	`+ metadata.hasAnnotatedMethods(Bean.class.getName());`
`107`	`110`	`}`
`108`	`111`
`109`	`112`