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

Refactor execution of config class enhancement 

This change returns the invocation order of
ConfigurationClassPostProcessor#enhanceConfigurationClasses to its
pre-3.1 M2 state. An earlier (and now unnecessary) refactoring in
service of @Feature method processing caused the change that this now
reverts.
This commit is contained in:
Chris Beams 2011-07-18 21:23:55 +00:00
parent 4f89459c3d
commit 236b0305e8
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java
View File

@ -174,7 +174,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
"postProcessBeanFactory already called for this post-processor against " + registry); "postProcessBeanFactory already called for this post-processor against " + registry);
} }
this.registriesPostProcessed.add(registryID); this.registriesPostProcessed.add(registryID);
processConfigurationClasses(registry); processConfigBeanDefinitions(registry);
} }
/** /**
@ -191,16 +191,9 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
if (!this.registriesPostProcessed.contains(factoryID)) { if (!this.registriesPostProcessed.contains(factoryID)) {
// BeanDefinitionRegistryPostProcessor hook apparently not supported... // BeanDefinitionRegistryPostProcessor hook apparently not supported...
// Simply call processConfigurationClasses lazily at this point then. // Simply call processConfigurationClasses lazily at this point then.
processConfigurationClasses((BeanDefinitionRegistry)beanFactory); processConfigBeanDefinitions((BeanDefinitionRegistry)beanFactory);
} }
} enhanceConfigurationClasses(beanFactory);
/**
* Find and process all @Configuration classes in the given registry.
*/
private void processConfigurationClasses(BeanDefinitionRegistry registry) {
processConfigBeanDefinitions(registry);
enhanceConfigurationClasses((ConfigurableListableBeanFactory)registry);
} }
private ConfigurationClassBeanDefinitionReader getConfigurationClassBeanDefinitionReader(BeanDefinitionRegistry registry) { private ConfigurationClassBeanDefinitionReader getConfigurationClassBeanDefinitionReader(BeanDefinitionRegistry registry) {