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

Detect @Autowired constructors for configuration classes

Browse Source 
Issue: SPR-13471
This commit is contained in:
Juergen Hoeller
2015-12-18 15:31:31 +01:00
parent 9e7c791a0f
commit 967ef73765
2 changed files with 44 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spring-context/src/test/java/org/springframework/context/annotation/configuration/AutowiredConfigurationTests.java
View File

@@ -23,7 +23,6 @@ import javax.inject.Provider;
import org.junit.Test;
import org.springframework.beans.factory.BeanCreationException;
import org.springframework.beans.factory.BeanFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -90,7 +89,7 @@ public class AutowiredConfigurationTests {
}
@Test
public void testAutowiredConfigurationConstructorsAreSupported() {
public void testAutowiredSingleConstructorSupported() {
DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(factory).loadBeanDefinitions(
new ClassPathResource("annotation-config.xml", AutowiredConstructorConfig.class));
@@ -98,8 +97,19 @@ public class AutowiredConfigurationTests {
ctx.registerBeanDefinition("config1", new RootBeanDefinition(AutowiredConstructorConfig.class));
ctx.registerBeanDefinition("config2", new RootBeanDefinition(ColorConfig.class));
ctx.refresh();
assertSame(ctx.getBean(AutowiredConstructorConfig.class).colour,
ctx.getBean(Colour.class));
assertSame(ctx.getBean(AutowiredConstructorConfig.class).colour, ctx.getBean(Colour.class));
}
@Test
public void testAutowiredAnnotatedConstructorSupported() {
DefaultListableBeanFactory factory = new DefaultListableBeanFactory();
new XmlBeanDefinitionReader(factory).loadBeanDefinitions(
new ClassPathResource("annotation-config.xml", MultipleConstructorConfig.class));
GenericApplicationContext ctx = new GenericApplicationContext(factory);
ctx.registerBeanDefinition("config1", new RootBeanDefinition(MultipleConstructorConfig.class));
ctx.registerBeanDefinition("config2", new RootBeanDefinition(ColorConfig.class));
ctx.refresh();
assertSame(ctx.getBean(MultipleConstructorConfig.class).colour, ctx.getBean(Colour.class));
}
@Test
@@ -223,13 +233,29 @@ public class AutowiredConfigurationTests {
Colour colour;
@Autowired
// @Autowired
AutowiredConstructorConfig(Colour colour) {
this.colour = colour;
}
}
@Configuration
static class MultipleConstructorConfig {
Colour colour;
@Autowired
MultipleConstructorConfig(Colour colour) {
this.colour = colour;
}
MultipleConstructorConfig(String test) {
this.colour = new Colour(test);
}
}
@Configuration
static class ColorConfig {