From 6fcea8b99da45f287149796ef2598f0d71758793 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Tue, 17 May 2011 19:15:17 +0000 Subject: [PATCH] Remove ConfigurationClassParser from public API Issue: SPR-8200 --- .../annotation/ConfigurationClassPostProcessor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 055e5aef74..597f452454 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 @@ -197,9 +197,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo */ private void processConfigurationClasses(BeanDefinitionRegistry registry) { ConfigurationClassBeanDefinitionReader reader = getConfigurationClassBeanDefinitionReader(registry); - ConfigurationClassParser parser = new ConfigurationClassParser( - this.metadataReaderFactory, this.problemReporter, this.environment, this.resourceLoader, registry); - processConfigBeanDefinitions(parser, reader, registry); + processConfigBeanDefinitions(reader, registry); enhanceConfigurationClasses((ConfigurableListableBeanFactory)registry); } @@ -215,7 +213,7 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo * Build and validate a configuration model based on the registry of * {@link Configuration} classes. */ - public void processConfigBeanDefinitions(ConfigurationClassParser parser, ConfigurationClassBeanDefinitionReader reader, BeanDefinitionRegistry registry) { + public void processConfigBeanDefinitions(ConfigurationClassBeanDefinitionReader reader, BeanDefinitionRegistry registry) { Set configCandidates = new LinkedHashSet(); for (String beanName : registry.getBeanDefinitionNames()) { BeanDefinition beanDef = registry.getBeanDefinition(beanName); @@ -230,6 +228,8 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo } // Parse each @Configuration class + ConfigurationClassParser parser = new ConfigurationClassParser( + this.metadataReaderFactory, this.problemReporter, this.environment, this.resourceLoader, registry); for (BeanDefinitionHolder holder : configCandidates) { BeanDefinition bd = holder.getBeanDefinition(); try {