diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java index 032b3484af..85f118ed49 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java @@ -118,11 +118,9 @@ class ConfigurationClassBeanDefinitionReader { */ private void loadBeanDefinitionsForConfigurationClass(ConfigurationClass configClass) { doLoadBeanDefinitionForConfigurationClassIfNecessary(configClass); - for (ConfigurationClassMethod method : configClass.getMethods()) { loadBeanDefinitionsForModelMethod(method); } - loadBeanDefinitionsFromImportedResources(configClass.getImportedResources()); } @@ -139,7 +137,7 @@ class ConfigurationClassBeanDefinitionReader { GenericBeanDefinition configBeanDef = new GenericBeanDefinition(); String className = configClass.getMetadata().getClassName(); configBeanDef.setBeanClassName(className); - if(checkConfigurationClassCandidate(configBeanDef, this.metadataReaderFactory)) { + if (checkConfigurationClassCandidate(configBeanDef, this.metadataReaderFactory)) { String configBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(configBeanDef, this.registry); configClass.setBeanName(configBeanName); if (logger.isDebugEnabled()) { @@ -160,8 +158,8 @@ class ConfigurationClassBeanDefinitionReader { } /** - * Reads a particular {@link ConfigurationClassMethod}, registering bean definitions with - * the BeanDefinitionRegistry based on its contents. + * Reads a particular {@link ConfigurationClassMethod}, registering bean definitions + * with the BeanDefinitionRegistry based on its contents. */ private void loadBeanDefinitionsForModelMethod(ConfigurationClassMethod method) { ConfigurationClass configClass = method.getConfigurationClass(); diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java index 22473758f3..4457dc2bb1 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java @@ -139,8 +139,8 @@ class ConfigurationClassParser { } } Set beanMethods = metadata.getAnnotatedMethods(Bean.class.getName()); - for (MethodMetadata methodMetadata : beanMethods) { - configClass.addMethod(new ConfigurationClassMethod(methodMetadata, configClass)); + for (MethodMetadata beanMethod : beanMethods) { + configClass.addMethod(new ConfigurationClassMethod(beanMethod, configClass)); } } diff --git a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd index 2bb4c1de94..ce51a1a4f7 100644 --- a/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd +++ b/org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd @@ -30,7 +30,7 @@