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

Introduce getAliasedStringArray() in AnnotationAttributes

Browse Source 
Issue: SPR-11393
This commit is contained in:
Sam Brannen
2015-06-03 21:18:31 -04:00
parent 08c032d9fd
commit e5dc6e964c
3 changed files with 172 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
spring-context/src/main/java/org/springframework/context/annotation/ComponentScanAnnotationParser.java
View File

@@ -30,7 +30,6 @@ import org.springframework.beans.factory.support.BeanDefinitionRegistry;
import org.springframework.beans.factory.support.BeanNameGenerator;
import org.springframework.context.ConfigurableApplicationContext;
import org.springframework.core.annotation.AnnotationAttributes;
import org.springframework.core.annotation.AnnotationConfigurationException;
import org.springframework.core.env.Environment;
import org.springframework.core.io.ResourceLoader;
import org.springframework.core.type.filter.AbstractTypeHierarchyTraversingFilter;
@@ -41,7 +40,6 @@ import org.springframework.core.type.filter.RegexPatternTypeFilter;
import org.springframework.core.type.filter.TypeFilter;
import org.springframework.util.Assert;
import org.springframework.util.ClassUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.util.StringUtils;
/**
@@ -117,7 +115,8 @@ class ComponentScanAnnotationParser {
}
Set<String> basePackages = new LinkedHashSet<String>();
for (String pkg : getBasePackages(componentScan, declaringClass)) {
String[] basePackagesArray = componentScan.getAliasedStringArray("basePackages", ComponentScan.class, declaringClass);
for (String pkg : basePackagesArray) {
String[] tokenized = StringUtils.tokenizeToStringArray(this.environment.resolvePlaceholders(pkg),
ConfigurableApplicationContext.CONFIG_LOCATION_DELIMITERS);
basePackages.addAll(Arrays.asList(tokenized));
@@ -138,25 +137,6 @@ class ComponentScanAnnotationParser {
return scanner.doScan(StringUtils.toStringArray(basePackages));
}
private String[] getBasePackages(AnnotationAttributes componentScan, String declaringClass) {
String[] value = componentScan.getStringArray("value");
String[] basePackages = componentScan.getStringArray("basePackages");
boolean valueDeclared = !ObjectUtils.isEmpty(value);
boolean basePackagesDeclared = !ObjectUtils.isEmpty(basePackages);
if (valueDeclared && basePackagesDeclared && !ObjectUtils.nullSafeEquals(value, basePackages)) {
String msg = String.format("In @ComponentScan declared on [%s], attribute [value] "
+ "and its alias [basePackages] are present with values of [%s] and [%s], "
+ "but only one is permitted.", declaringClass, ObjectUtils.nullSafeToString(value),
ObjectUtils.nullSafeToString(basePackages));
throw new AnnotationConfigurationException(msg);
}
if (!basePackagesDeclared) {
basePackages = value;
}
return basePackages;
}
private List<TypeFilter> typeFiltersFor(AnnotationAttributes filterAttributes) {
List<TypeFilter> typeFilters = new ArrayList<TypeFilter>();
FilterType filterType = filterAttributes.getEnum("type");