SPR-6186: removed remaining duplicate check for @Configuration

master
Chris Beams 15 years ago
parent cbadf350e1
commit d020d73118
  1. 9
      org.springframework.web/src/main/java/org/springframework/web/context/support/ConfigurationClassWebApplicationContext.java

@ -19,10 +19,14 @@ package org.springframework.web.context.support;
import java.io.IOException; import java.io.IOException;
import org.springframework.beans.BeansException; import org.springframework.beans.BeansException;
import org.springframework.beans.factory.NoSuchBeanDefinitionException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.support.DefaultBeanNameGenerator;
import org.springframework.beans.factory.support.DefaultListableBeanFactory; import org.springframework.beans.factory.support.DefaultListableBeanFactory;
import org.springframework.context.annotation.AnnotationConfigUtils;
import org.springframework.context.annotation.Configuration; import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.ConfigurationClassApplicationContext; import org.springframework.context.annotation.ConfigurationClassApplicationContext;
import org.springframework.core.annotation.AnnotationUtils; import org.springframework.context.annotation.ConfigurationClassPostProcessor;
import org.springframework.util.Assert; import org.springframework.util.Assert;
import org.springframework.util.ClassUtils; import org.springframework.util.ClassUtils;
@ -88,9 +92,6 @@ public class ConfigurationClassWebApplicationContext extends AbstractRefreshable
for (String configLocation : getConfigLocations()) { for (String configLocation : getConfigLocations()) {
try { try {
Class<?> configClass = ClassUtils.getDefaultClassLoader().loadClass(configLocation); Class<?> configClass = ClassUtils.getDefaultClassLoader().loadClass(configLocation);
if (AnnotationUtils.findAnnotation(configClass, Configuration.class) == null) {
throw new IllegalArgumentException("Class [" + configClass.getName() + "] is not annotated with @Configuration");
}
this.delegate.addConfigurationClass(configClass); this.delegate.addConfigurationClass(configClass);
} catch (ClassNotFoundException ex) { } catch (ClassNotFoundException ex) {
throw new IOException("Could not load @Configuration class [" + configLocation + "]", ex); throw new IOException("Could not load @Configuration class [" + configLocation + "]", ex);

Loading…
Cancel
Save