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

Revise multiple beans resolution for custom collection types

Browse Source 
Closes gh-30022
This commit is contained in:
Juergen Hoeller
2023-08-12 12:48:14 +02:00
parent c65b0a199e
commit 9ede1d07a0
2 changed files with 154 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
spring-beans/src/test/java/org/springframework/beans/factory/annotation/AutowiredAnnotationBeanPostProcessorTests.java
View File

@@ -34,6 +34,8 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.Set;
import java.util.SortedMap;
import java.util.SortedSet;
import java.util.concurrent.Callable;
import java.util.function.Consumer;
import java.util.function.Function;
@@ -1403,6 +1405,20 @@ public class AutowiredAnnotationBeanPostProcessorTests {
assertThat(bean.getTestBeanMap()).isSameAs(bf.getBean("myTestBeanMap"));
}
@Test
void constructorInjectionWithSortedMapFallback() {
RootBeanDefinition bd = new RootBeanDefinition(SortedMapConstructorInjectionBean.class);
bf.registerBeanDefinition("annotatedBean", bd);
TestBean tb1 = new TestBean();
TestBean tb2 = new TestBean();
bf.registerSingleton("testBean1", tb1);
bf.registerSingleton("testBean2", tb2);
SortedMapConstructorInjectionBean bean = bf.getBean("annotatedBean", SortedMapConstructorInjectionBean.class);
assertThat(bean.getTestBeanMap()).containsEntry("testBean1", tb1);
assertThat(bean.getTestBeanMap()).containsEntry("testBean2", tb2);
}
@Test
void constructorInjectionWithTypedSetAsBean() {
RootBeanDefinition bd = new RootBeanDefinition(SetConstructorInjectionBean.class);
@@ -1444,6 +1460,8 @@ public class AutowiredAnnotationBeanPostProcessorTests {
RootBeanDefinition tbs = new RootBeanDefinition(CustomCollectionFactoryMethods.class);
tbs.setUniqueFactoryMethodName("testBeanSet");
bf.registerBeanDefinition("myTestBeanSet", tbs);
bf.registerSingleton("testBean1", new TestBean());
bf.registerSingleton("testBean2", new TestBean());
CustomSetConstructorInjectionBean bean = bf.getBean("annotatedBean", CustomSetConstructorInjectionBean.class);
assertThat(bean.getTestBeanSet()).isSameAs(bf.getBean("myTestBeanSet"));
@@ -1451,6 +1469,19 @@ public class AutowiredAnnotationBeanPostProcessorTests {
assertThat(bean.getTestBeanSet()).isSameAs(bf.getBean("myTestBeanSet"));
}
@Test
void constructorInjectionWithSortedSetFallback() {
RootBeanDefinition bd = new RootBeanDefinition(SortedSetConstructorInjectionBean.class);
bf.registerBeanDefinition("annotatedBean", bd);
TestBean tb1 = new TestBean();
TestBean tb2 = new TestBean();
bf.registerSingleton("testBean1", tb1);
bf.registerSingleton("testBean2", tb2);
SortedSetConstructorInjectionBean bean = bf.getBean("annotatedBean", SortedSetConstructorInjectionBean.class);
assertThat(bean.getTestBeanSet()).contains(tb1, tb2);
}
@Test
void selfReference() {
bf.registerBeanDefinition("annotatedBean", new RootBeanDefinition(SelfInjectionBean.class));
@@ -3116,6 +3147,21 @@ public class AutowiredAnnotationBeanPostProcessorTests {
}
public static class SortedMapConstructorInjectionBean {
private SortedMap<String, TestBean> testBeanMap;
@Autowired
public SortedMapConstructorInjectionBean(SortedMap<String, TestBean> testBeanMap) {
this.testBeanMap = testBeanMap;
}
public SortedMap<String, TestBean> getTestBeanMap() {
return this.testBeanMap;
}
}
public static class QualifiedMapConstructorInjectionBean {
private Map<String, TestBean> testBeanMap;
@@ -3146,6 +3192,21 @@ public class AutowiredAnnotationBeanPostProcessorTests {
}
public static class SortedSetConstructorInjectionBean {
private SortedSet<TestBean> testBeanSet;
@Autowired
public SortedSetConstructorInjectionBean(SortedSet<TestBean> testBeanSet) {
this.testBeanSet = testBeanSet;
}
public SortedSet<TestBean> getTestBeanSet() {
return this.testBeanSet;
}
}
public static class SelfInjectionBean {
@Autowired