Add bean definition attribute for 'notLite' to skip @bean detection

See https://jira.spring.io/browse/SPR-17412

Author: dsyer

Diff for: spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java

@@ -44,6 +44,7 @@
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.annotation.ConfigurationCondition.ConfigurationPhase;
+import org.springframework.core.Conventions;
 import org.springframework.core.annotation.AnnotationAttributes;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.Resource;
@@ -70,6 +71,10 @@
  */
 class ConfigurationClassBeanDefinitionReader {
 
+	private static final String NOT_LITE_ATTRIBUTE = Conventions
+			.getQualifiedAttributeName(ConfigurationClassPostProcessor.class,
+					"notLite");
+
 	private static final Log logger = LogFactory.getLog(ConfigurationClassBeanDefinitionReader.class);
 
 	private static final ScopeMetadataResolver scopeMetadataResolver = new AnnotationScopeMetadataResolver();
@@ -151,6 +156,9 @@ private void loadBeanDefinitionsForConfigurationClass(
 	private void registerBeanDefinitionForImportedConfigurationClass(ConfigurationClass configClass) {
 		AnnotationMetadata metadata = configClass.getMetadata();
 		AnnotatedGenericBeanDefinition configBeanDef = new AnnotatedGenericBeanDefinition(metadata);
+		if (metadata.hasMetaAnnotation(Configuration.class.getName())) {
+			configBeanDef.setAttribute(NOT_LITE_ATTRIBUTE, true);
+		}
 
 		ScopeMetadata scopeMetadata = scopeMetadataResolver.resolveScopeMetadata(configBeanDef);
 		configBeanDef.setScope(scopeMetadata.getScopeName());
@@ -271,6 +279,7 @@ private void loadBeanDefinitionsForBeanMethod(BeanMethod beanMethod) {
 			logger.trace(String.format("Registering bean definition for @Bean method %s.%s()",
 					configClass.getMetadata().getClassName(), beanName));
 		}
+		beanDefToRegister.setAttribute(NOT_LITE_ATTRIBUTE, true);
 		this.registry.registerBeanDefinition(beanName, beanDefToRegister);
 	}
 

Diff for: spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java

@@ -345,7 +345,7 @@ private void processMemberClasses(ConfigurationClass configClass, SourceClass so
 		if (!memberClasses.isEmpty()) {
 			List<SourceClass> candidates = new ArrayList<>(memberClasses.size());
 			for (SourceClass memberClass : memberClasses) {
-				if (ConfigurationClassUtils.isConfigurationCandidate(memberClass.getMetadata()) &&
+				if (ConfigurationClassUtils.isFullConfigurationCandidate(memberClass.getMetadata()) &&
 						!memberClass.getMetadata().getClassName().equals(configClass.getMetadata().getClassName())) {
 					candidates.add(memberClass);
 				}

Diff for: spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java

@@ -51,13 +51,15 @@ abstract class ConfigurationClassUtils {
 
 	private static final String CONFIGURATION_CLASS_LITE = "lite";
 
+	private static final String CONFIGURATION_CLASS_NOT_LITE = Conventions
+			.getQualifiedAttributeName(ConfigurationClassPostProcessor.class, "notLite");
+
 	private static final String CONFIGURATION_CLASS_ATTRIBUTE =
 			Conventions.getQualifiedAttributeName(ConfigurationClassPostProcessor.class, "configurationClass");
 
 	private static final String ORDER_ATTRIBUTE =
 			Conventions.getQualifiedAttributeName(ConfigurationClassPostProcessor.class, "order");
 
-
 	private static final Log logger = LogFactory.getLog(ConfigurationClassUtils.class);
 
 	private static final Set<String> candidateIndicators = new HashSet<>(8);
@@ -115,7 +117,9 @@ else if (beanDef instanceof AbstractBeanDefinition && ((AbstractBeanDefinition)
 		if (isFullConfigurationCandidate(metadata)) {
 			beanDef.setAttribute(CONFIGURATION_CLASS_ATTRIBUTE, CONFIGURATION_CLASS_FULL);
 		}
-		else if (isLiteConfigurationCandidate(metadata)) {
+		else if (beanDef.getRole() != BeanDefinition.ROLE_INFRASTRUCTURE
+				&& beanDef.getAttribute(CONFIGURATION_CLASS_NOT_LITE) == null
+				&& isLiteConfigurationCandidate(metadata)) {
 			beanDef.setAttribute(CONFIGURATION_CLASS_ATTRIBUTE, CONFIGURATION_CLASS_LITE);
 		}
 		else {