Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ConfigurationClassPostProcessor supports use of same processor instance with several factories (SPR-8527)

Browse Source
This commit is contained in:
Juergen Hoeller
2011-07-18 20:45:02 +00:00
parent aa4ecdb79e
commit f18fa08aa0
1 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/* /*
* Copyright 2002-2010 the original author or authors. * Copyright 2002-2011 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
package org.springframework.context.annotation; package org.springframework.context.annotation;
import java.io.IOException; import java.io.IOException;
import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.Map; import java.util.Map;
@@ -80,9 +81,9 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
private boolean setMetadataReaderFactoryCalled = false; private boolean setMetadataReaderFactoryCalled = false;
private boolean postProcessBeanDefinitionRegistryCalled = false; private final Set<Integer> registriesPostProcessed = new HashSet<Integer>();
private boolean postProcessBeanFactoryCalled = false; private final Set<Integer> factoriesPostProcessed = new HashSet<Integer>();
/** /**
@@ -130,15 +131,16 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
* Derive further bean definitions from the configuration classes in the registry. * Derive further bean definitions from the configuration classes in the registry.
*/ */
public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) { public void postProcessBeanDefinitionRegistry(BeanDefinitionRegistry registry) {
if (this.postProcessBeanDefinitionRegistryCalled) { int registryId = System.identityHashCode(registry);
if (this.registriesPostProcessed.contains(registryId)) {
throw new IllegalStateException( throw new IllegalStateException(
"postProcessBeanDefinitionRegistry already called for this post-processor"); "postProcessBeanDefinitionRegistry already called for this post-processor against " + registry);
} }
if (this.postProcessBeanFactoryCalled) { if (this.factoriesPostProcessed.contains(registryId)) {
throw new IllegalStateException( throw new IllegalStateException(
"postProcessBeanFactory already called for this post-processor"); "postProcessBeanFactory already called for this post-processor against " + registry);
} }
this.postProcessBeanDefinitionRegistryCalled = true; this.registriesPostProcessed.add(registryId);
processConfigBeanDefinitions(registry); processConfigBeanDefinitions(registry);
} }
@@ -147,12 +149,13 @@ public class ConfigurationClassPostProcessor implements BeanDefinitionRegistryPo
* by replacing them with CGLIB-enhanced subclasses. * by replacing them with CGLIB-enhanced subclasses.
*/ */
public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) { public void postProcessBeanFactory(ConfigurableListableBeanFactory beanFactory) {
if (this.postProcessBeanFactoryCalled) { int factoryId = System.identityHashCode(beanFactory);
if (this.factoriesPostProcessed.contains(factoryId)) {
throw new IllegalStateException( throw new IllegalStateException(
"postProcessBeanFactory already called for this post-processor"); "postProcessBeanFactory already called for this post-processor against " + beanFactory);
} }
this.postProcessBeanFactoryCalled = true; this.factoriesPostProcessed.add((factoryId));
if (!this.postProcessBeanDefinitionRegistryCalled) { if (!this.registriesPostProcessed.contains((factoryId))) {
// BeanDefinitionRegistryPostProcessor hook apparently not supported... // BeanDefinitionRegistryPostProcessor hook apparently not supported...
// Simply call processConfigBeanDefinitions lazily at this point then. // Simply call processConfigBeanDefinitions lazily at this point then.
processConfigBeanDefinitions((BeanDefinitionRegistry) beanFactory); processConfigBeanDefinitions((BeanDefinitionRegistry) beanFactory);