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

ConfigurationClassEnhancer leniently allows for null bean references

Browse Source 
Issue: SPR-15829
This commit is contained in:
Juergen Hoeller
2017-09-01 14:05:14 +02:00
parent 204ddebd68
commit 30bd5827b0
2 changed files with 44 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
spring-context/src/test/java/org/springframework/context/annotation/configuration/ConfigurationClassProcessingTests.java
View File

@@ -205,6 +205,15 @@ public class ConfigurationClassProcessingTests {
assertNotSame(bar.getSpouse(), baz);
}
@Test
public void configurationWithNullReference() {
BeanFactory factory = initBeanFactory(ConfigWithNullReference.class);
TestBean foo = factory.getBean("foo", TestBean.class);
assertTrue(factory.getBean("bar").equals(null));
assertNull(foo.getSpouse());
}
@Test
public void configurationWithAdaptivePrototypes() {
AnnotationConfigApplicationContext ctx = new AnnotationConfigApplicationContext();
@@ -307,7 +316,7 @@ public class ConfigurationClassProcessingTests {
static TestBean testBean = new TestBean(ConfigWithBeanWithAliases.class.getSimpleName());
@Bean(name = { "name1", "alias1", "alias2", "alias3" })
@Bean(name = {"name1", "alias1", "alias2", "alias3"})
public TestBean methodName() {
return testBean;
}
@@ -319,7 +328,7 @@ public class ConfigurationClassProcessingTests {
static TestBean testBean = new TestBean(ConfigWithBeanWithAliasesConfiguredViaValueAttribute.class.getSimpleName());
@Bean({ "enigma", "alias1", "alias2", "alias3" })
@Bean({"enigma", "alias1", "alias2", "alias3"})
public TestBean methodName() {
return testBean;
}
@@ -415,6 +424,16 @@ public class ConfigurationClassProcessingTests {
}
@Configuration
static class ConfigWithNullReference extends ConfigWithPrototypeBean {
@Override
public TestBean bar() {
return null;
}
}
@Scope("prototype")
static class AdaptiveInjectionPoints {