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

[SPR-6184] AnnotationConfigContextLoader now calls AnnotationConfigApplicationContext's register(Class<?>...) method in one go, via var-args.

Browse Source
This commit is contained in:
Sam Brannen
2011-03-31 00:00:31 +00:00
parent 732493951e
commit ec1b230ae5
1 changed files with 8 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
org.springframework.test/src/main/java/org/springframework/test/context/support/AnnotationConfigContextLoader.java
View File

@@ -16,15 +16,13 @@
package org.springframework.test.context.support;
import java.util.ArrayList;
import java.util.List;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.springframework.beans.factory.support.BeanDefinitionReader;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.support.GenericApplicationContext;
import org.springframework.util.Assert;
import org.springframework.util.ObjectUtils;
/**
* TODO Document AnnotationConfigContextLoader.
@@ -56,25 +54,22 @@ public class AnnotationConfigContextLoader extends AbstractGenericContextLoader
AnnotationConfigApplicationContext annotationConfigApplicationContext = (AnnotationConfigApplicationContext) context;
List<Class<?>> configClasses = new ArrayList<Class<?>>();
for (String location : locations) {
Class<?>[] configClasses = new Class<?>[locations.length];
for (int i = 0; i < locations.length; i++) {
try {
Class<?> clazz = getClass().getClassLoader().loadClass(location);
configClasses.add(clazz);
Class<?> clazz = getClass().getClassLoader().loadClass(locations[i]);
configClasses[i] = clazz;
}
catch (ClassNotFoundException e) {
throw new IllegalArgumentException(String.format(
"The supplied resource location [%s] does not represent a class.", location), e);
"The supplied resource location [%s] does not represent a class.", locations[i]), e);
}
}
if (logger.isDebugEnabled()) {
logger.debug("Registering configuration classes: " + configClasses);
}
for (Class<?> configClass : configClasses) {
annotationConfigApplicationContext.register(configClass);
logger.debug("Registering configuration classes: " + ObjectUtils.nullSafeToString(configClasses));
}
annotationConfigApplicationContext.register(configClasses);
}
/**