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

polishing

This commit is contained in:
Juergen Hoeller 2010-10-10 18:31:43 +00:00
parent 061063257a
commit d78eda8aeb
3 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassBeanDefinitionReader.java
View File

@ -118,11 +118,9 @@ class ConfigurationClassBeanDefinitionReader {
*/ */
private void loadBeanDefinitionsForConfigurationClass(ConfigurationClass configClass) { private void loadBeanDefinitionsForConfigurationClass(ConfigurationClass configClass) {
doLoadBeanDefinitionForConfigurationClassIfNecessary(configClass); doLoadBeanDefinitionForConfigurationClassIfNecessary(configClass);
for (ConfigurationClassMethod method : configClass.getMethods()) { for (ConfigurationClassMethod method : configClass.getMethods()) {
loadBeanDefinitionsForModelMethod(method); loadBeanDefinitionsForModelMethod(method);
} }
loadBeanDefinitionsFromImportedResources(configClass.getImportedResources()); loadBeanDefinitionsFromImportedResources(configClass.getImportedResources());
} }
@ -139,7 +137,7 @@ class ConfigurationClassBeanDefinitionReader {
GenericBeanDefinition configBeanDef = new GenericBeanDefinition(); GenericBeanDefinition configBeanDef = new GenericBeanDefinition();
String className = configClass.getMetadata().getClassName(); String className = configClass.getMetadata().getClassName();
configBeanDef.setBeanClassName(className); configBeanDef.setBeanClassName(className);
if(checkConfigurationClassCandidate(configBeanDef, this.metadataReaderFactory)) { if (checkConfigurationClassCandidate(configBeanDef, this.metadataReaderFactory)) {
String configBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(configBeanDef, this.registry); String configBeanName = BeanDefinitionReaderUtils.registerWithGeneratedName(configBeanDef, this.registry);
configClass.setBeanName(configBeanName); configClass.setBeanName(configBeanName);
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
@ -160,8 +158,8 @@ class ConfigurationClassBeanDefinitionReader {
} }
/** /**
* Reads a particular {@link ConfigurationClassMethod}, registering bean definitions with * Reads a particular {@link ConfigurationClassMethod}, registering bean definitions
* the BeanDefinitionRegistry based on its contents. * with the BeanDefinitionRegistry based on its contents.
*/ */
private void loadBeanDefinitionsForModelMethod(ConfigurationClassMethod method) { private void loadBeanDefinitionsForModelMethod(ConfigurationClassMethod method) {
ConfigurationClass configClass = method.getConfigurationClass(); ConfigurationClass configClass = method.getConfigurationClass();

4
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassParser.java
View File

@ -139,8 +139,8 @@ class ConfigurationClassParser {
} }
} }
Set<MethodMetadata> beanMethods = metadata.getAnnotatedMethods(Bean.class.getName()); Set<MethodMetadata> beanMethods = metadata.getAnnotatedMethods(Bean.class.getName());
for (MethodMetadata methodMetadata : beanMethods) { for (MethodMetadata beanMethod : beanMethods) {
configClass.addMethod(new ConfigurationClassMethod(methodMetadata, configClass)); configClass.addMethod(new ConfigurationClassMethod(beanMethod, configClass));
} }
} }

2
org.springframework.context/src/main/resources/org/springframework/scheduling/config/spring-task-3.0.xsd
View File

@ -30,7 +30,7 @@
<xsd:documentation><![CDATA[ <xsd:documentation><![CDATA[
Specifies the java.util.Executor instance to use when invoking asynchronous methods. Specifies the java.util.Executor instance to use when invoking asynchronous methods.
If not provided, an instance of org.springframework.core.task.SimpleAsyncTaskExecutor If not provided, an instance of org.springframework.core.task.SimpleAsyncTaskExecutor
will be used by default will be used by default.
]]></xsd:documentation> ]]></xsd:documentation>
</xsd:annotation> </xsd:annotation>
</xsd:attribute> </xsd:attribute>