root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Restrict nested configuration class introspection to component types 

Issue: SPR-16839
This commit is contained in:
Juergen Hoeller 2018-09-12 14:02:45 +02:00
parent 45936f0ddd
commit b83bc39ecd
3 changed files with 13 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -76,6 +76,7 @@ import org.springframework.core.type.classreading.MetadataReader;
import org.springframework.core.type.classreading.MetadataReaderFactory; import org.springframework.core.type.classreading.MetadataReaderFactory;
import org.springframework.core.type.filter.AssignableTypeFilter; import org.springframework.core.type.filter.AssignableTypeFilter;
import org.springframework.lang.Nullable; import org.springframework.lang.Nullable;
import org.springframework.stereotype.Component;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
@ -261,8 +262,10 @@ class ConfigurationClassParser {
protected final SourceClass doProcessConfigurationClass(ConfigurationClass configClass, SourceClass sourceClass) protected final SourceClass doProcessConfigurationClass(ConfigurationClass configClass, SourceClass sourceClass)
throws IOException { throws IOException {
if (sourceClass.getMetadata().isAnnotated(Component.class.getName())) {
// Recursively process any member (nested) classes first // Recursively process any member (nested) classes first
processMemberClasses(configClass, sourceClass); processMemberClasses(configClass, sourceClass);
}
// Process any @PropertySource annotations // Process any @PropertySource annotations
for (AnnotationAttributes propertySource : AnnotationConfigUtils.attributesForRepeatable( for (AnnotationAttributes propertySource : AnnotationConfigUtils.attributesForRepeatable(

36
spring-context/src/main/java/org/springframework/context/annotation/ConfigurationClassUtils.java
View File

@ -119,7 +119,7 @@ abstract class ConfigurationClassUtils {
beanDef.setAttribute(CONFIGURATION_CLASS_ATTRIBUTE, CONFIGURATION_CLASS_LITE); beanDef.setAttribute(CONFIGURATION_CLASS_ATTRIBUTE, CONFIGURATION_CLASS_LITE);
} }
else { else {
return hasNestedConfigurationClass(metadata, metadataReaderFactory); return false;
} }
// It's a full or lite configuration candidate... Let's determine the order value, if any. // It's a full or lite configuration candidate... Let's determine the order value, if any.
@ -131,40 +131,6 @@ abstract class ConfigurationClassUtils {
return true; return true;
} }
/**
* Check whether the specified class declares a nested configuration class.
*/
private static boolean hasNestedConfigurationClass(
AnnotationMetadata metadata, MetadataReaderFactory metadataReaderFactory) {
// Potentially nested configuration classes...
if (metadata instanceof StandardAnnotationMetadata) {
Class<?> beanClass = ((StandardAnnotationMetadata) metadata).getIntrospectedClass();
for (Class<?> memberClass : beanClass.getDeclaredClasses()) {
if (isConfigurationCandidate(new StandardAnnotationMetadata(memberClass))) {
return true;
}
}
}
else {
for (String memberName : metadata.getMemberClassNames()) {
try {
MetadataReader metadataReader = metadataReaderFactory.getMetadataReader(memberName);
if (isConfigurationCandidate(metadataReader.getAnnotationMetadata())) {
return true;
}
}
catch (IOException ex) {
if (logger.isDebugEnabled()) {
logger.debug("Could not find class file for introspecting configuration annotations: " +
memberName, ex);
}
}
}
}
return false;
}
/** /**
* Check the given metadata for a configuration class candidate * Check the given metadata for a configuration class candidate
* (or nested component class declared within a configuration/component class). * (or nested component class declared within a configuration/component class).

13
spring-context/src/test/java/org/springframework/context/annotation/ImportVersusDirectRegistrationTests.java
View File

@ -18,6 +18,7 @@ package org.springframework.context.annotation;
import org.junit.Test; import org.junit.Test;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.support.RootBeanDefinition; import org.springframework.beans.factory.support.RootBeanDefinition;
/** /**
@ -25,8 +26,8 @@ import org.springframework.beans.factory.support.RootBeanDefinition;
*/ */
public class ImportVersusDirectRegistrationTests { public class ImportVersusDirectRegistrationTests {
@Test @Test(expected = NoSuchBeanDefinitionException.class)
public void thingIsAvailableWhenOuterConfigurationIsRegisteredDirectly() { public void thingIsNotAvailableWhenOuterConfigurationIsRegisteredDirectly() {
try (AnnotationConfigApplicationContext directRegistration = new AnnotationConfigApplicationContext()) { try (AnnotationConfigApplicationContext directRegistration = new AnnotationConfigApplicationContext()) {
directRegistration.register(AccidentalLiteConfiguration.class); directRegistration.register(AccidentalLiteConfiguration.class);
directRegistration.refresh(); directRegistration.refresh();
@ -34,8 +35,8 @@ public class ImportVersusDirectRegistrationTests {
} }
} }
@Test @Test(expected = NoSuchBeanDefinitionException.class)
public void thingIsAvailableWhenOuterConfigurationIsRegisteredWithClassName() { public void thingIsNotAvailableWhenOuterConfigurationIsRegisteredWithClassName() {
try (AnnotationConfigApplicationContext directRegistration = new AnnotationConfigApplicationContext()) { try (AnnotationConfigApplicationContext directRegistration = new AnnotationConfigApplicationContext()) {
directRegistration.registerBeanDefinition("config", directRegistration.registerBeanDefinition("config",
new RootBeanDefinition(AccidentalLiteConfiguration.class.getName())); new RootBeanDefinition(AccidentalLiteConfiguration.class.getName()));
@ -44,8 +45,8 @@ public class ImportVersusDirectRegistrationTests {
} }
} }
@Test @Test(expected = NoSuchBeanDefinitionException.class)
public void thingIsAvailableWhenOuterConfigurationIsImported() { public void thingIsNotAvailableWhenOuterConfigurationIsImported() {
try (AnnotationConfigApplicationContext viaImport = new AnnotationConfigApplicationContext()) { try (AnnotationConfigApplicationContext viaImport = new AnnotationConfigApplicationContext()) {
viaImport.register(Importer.class); viaImport.register(Importer.class);
viaImport.refresh(); viaImport.refresh();