From 236b0305e88adbf51fbe3da82a2730263ab8fd51 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Mon, 18 Jul 2011 21:23:55 +0000 Subject: [PATCH] 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. --- .../annotation/ConfigurationClassPostProcessor.java | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java index 08caf119620..c787fc22ace 100644 --- a/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java +++ b/org.springframework.context/src/main/java/org/springframework/context/annotation/ConfigurationClassPostProcessor.java @@ -174,7 +174,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo "postProcessBeanFactory already called for this post-processor against " + registry); } this.registriesPostProcessed.add(registryID); - processConfigurationClasses(registry); + processConfigBeanDefinitions(registry); } /** @@ -191,16 +191,9 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo if (!this.registriesPostProcessed.contains(factoryID)) { // BeanDefinitionRegistryPostProcessor hook apparently not supported... // Simply call processConfigurationClasses lazily at this point then. - processConfigurationClasses((BeanDefinitionRegistry)beanFactory); + processConfigBeanDefinitions((BeanDefinitionRegistry)beanFactory); } - } - - /** - * Find and process all @Configuration classes in the given registry. - */ - private void processConfigurationClasses(BeanDefinitionRegistry registry) { - processConfigBeanDefinitions(registry); - enhanceConfigurationClasses((ConfigurableListableBeanFactory)registry); + enhanceConfigurationClasses(beanFactory); } private ConfigurationClassBeanDefinitionReader getConfigurationClassBeanDefinitionReader(BeanDefinitionRegistry registry) {