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

IN PROGRESS - issue SPR-6779: imported @Configuration classes do not get enhanced and fail to satisfy scoping requirements

Browse Source 
All tests in ImportedConfigurationClassEnhancementTests now pass.  The fix was simple - imported @Configuration class bean definitions were not getting marked with the attribute that indicates that they are indeed @Configuration class bean definitions.  To make this happen, ConfigurationClassPostProcessor's protected checkConfigurationClassCandidate(beanDef) method is being called from within ConfigurationClassBeanDefinitionReader when imported @Configuration classes are being processed.  This is quick and dirty, and the subsequent check-in will refactor the solution appropriately.
This commit is contained in:
Chris Beams
2010-01-29 20:55:03 +00:00
parent 5fdee47841
commit 110b032ad9
4 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
org.springframework.context/src/test/java/org/springframework/context/annotation/configuration/ImportedConfigurationClassEnhancementTests.java
View File

@@ -4,7 +4,6 @@ import static org.hamcrest.CoreMatchers.sameInstance;
import static org.junit.Assert.assertThat;
import static org.junit.Assert.assertTrue;
import org.junit.Ignore;
import org.junit.Test;
import org.springframework.aop.support.AopUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +23,9 @@ import test.beans.TestBean;
public class ImportedConfigurationClassEnhancementTests {
@Ignore @Test
@Test
public void autowiredConfigClassIsEnhancedWhenImported() {
autowiredConfigClassIsEnhanced(ConfigThatImports.class);
autowiredConfigClassIsEnhanced(ConfigThatDoesImport.class);
}
@Test
@@ -37,13 +36,14 @@ public class ImportedConfigurationClassEnhancementTests {
private void autowiredConfigClassIsEnhanced(Class<?>... configClasses) {
ApplicationContext ctx = new AnnotationConfigApplicationContext(configClasses);
Config config = ctx.getBean(Config.class);
assertTrue(AopUtils.isCglibProxyClass(config.autowiredConfig.getClass()));
assertTrue("autowired config class has not been enhanced",
AopUtils.isCglibProxyClass(config.autowiredConfig.getClass()));
}
@Ignore @Test
@Test
public void autowiredConfigClassBeanMethodsRespectScopingWhenImported() {
autowiredConfigClassBeanMethodsRespectScoping(ConfigThatImports.class);
autowiredConfigClassBeanMethodsRespectScoping(ConfigThatDoesImport.class);
}
@Test
@@ -56,7 +56,8 @@ public class ImportedConfigurationClassEnhancementTests {
Config config = ctx.getBean(Config.class);
TestBean testBean1 = config.autowiredConfig.testBean();
TestBean testBean2 = config.autowiredConfig.testBean();
assertThat(testBean1, sameInstance(testBean2));
assertThat("got two distinct instances of testBean when singleton scoping was expected",
testBean1, sameInstance(testBean2));
}
}
@@ -68,14 +69,13 @@ class ConfigToBeAutowired {
}
}
class Config {
@Autowired ConfigToBeAutowired autowiredConfig;
}
@Import(ConfigToBeAutowired.class)
@Configuration
class ConfigThatImports extends Config { }
class ConfigThatDoesImport extends Config { }
@Configuration
class ConfigThatDoesNotImport extends Config { }