Introduce fallback flag and annotation (as companion to primary)

Closes gh-26241
This commit is contained in:
Juergen Hoeller
2024-02-20 13:37:41 +01:00
parent c077805761
commit 480051a21c
7 changed files with 197 additions and 3 deletions

View File

@@ -30,7 +30,9 @@ import org.springframework.beans.testfixture.beans.TestBean;
import org.springframework.context.annotation.AnnotationConfigApplicationContext;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
import org.springframework.context.annotation.Fallback;
import org.springframework.context.annotation.Lazy;
import org.springframework.context.annotation.Primary;
import org.springframework.context.annotation.Scope;
import org.springframework.context.annotation.ScopedProxyMode;
import org.springframework.core.annotation.AliasFor;
@@ -80,6 +82,26 @@ class BeanMethodQualificationTests {
ctx.close();
}
@Test
void primary() {
AnnotationConfigApplicationContext ctx =
new AnnotationConfigApplicationContext(PrimaryConfig.class, StandardPojo.class);
StandardPojo pojo = ctx.getBean(StandardPojo.class);
assertThat(pojo.testBean.getName()).isEqualTo("interesting");
assertThat(pojo.testBean2.getName()).isEqualTo("boring");
ctx.close();
}
@Test
void fallback() {
AnnotationConfigApplicationContext ctx =
new AnnotationConfigApplicationContext(FallbackConfig.class, StandardPojo.class);
StandardPojo pojo = ctx.getBean(StandardPojo.class);
assertThat(pojo.testBean.getName()).isEqualTo("interesting");
assertThat(pojo.testBean2.getName()).isEqualTo("boring");
ctx.close();
}
@Test
void customWithLazyResolution() {
AnnotationConfigApplicationContext ctx =
@@ -201,6 +223,58 @@ class BeanMethodQualificationTests {
}
}
@Configuration
static class PrimaryConfig {
@Bean @Qualifier("interesting") @Primary
public static TestBean testBean1() {
return new TestBean("interesting");
}
@Bean @Qualifier("interesting")
public static TestBean testBean1x() {
return new TestBean("interesting");
}
@Bean @Boring @Primary
public TestBean testBean2(TestBean testBean1) {
TestBean tb = new TestBean("boring");
tb.setSpouse(testBean1);
return tb;
}
@Bean @Boring
public TestBean testBean2x() {
return new TestBean("boring");
}
}
@Configuration
static class FallbackConfig {
@Bean @Qualifier("interesting")
public static TestBean testBean1() {
return new TestBean("interesting");
}
@Bean @Qualifier("interesting") @Fallback
public static TestBean testBean1x() {
return new TestBean("interesting");
}
@Bean @Boring
public TestBean testBean2(TestBean testBean1) {
TestBean tb = new TestBean("boring");
tb.setSpouse(testBean1);
return tb;
}
@Bean @Boring @Fallback
public TestBean testBean2x() {
return new TestBean("boring");
}
}
@Component @Lazy
static class StandardPojo {