root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions 4 Packages Projects Releases Wiki Activity

DefaultListableBeanFactory skips fallback match attempt for Collection/Map beans 

Issue: SPR-13963
This commit is contained in:
Juergen Hoeller 2016-02-19 00:05:28 +01:00
parent 0adc4921ed
commit 1b53edfc5e
2 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-beans/src/main/java/org/springframework/beans/factory/support/DefaultListableBeanFactory.java
View File

@ -1199,7 +1199,7 @@ public class DefaultListableBeanFactory extends AbstractAutowireCapableBeanFacto
result.put(candidateName, getBean(candidateName)); result.put(candidateName, getBean(candidateName));
} }
} }
if (result.isEmpty()) { if (result.isEmpty() && !Collection.class.isAssignableFrom(requiredType) && !Map.class.isAssignableFrom(requiredType)) {
// Consider fallback matches if the first pass failed to find anything... // Consider fallback matches if the first pass failed to find anything...
DependencyDescriptor fallbackDescriptor = descriptor.forFallbackMatch(); DependencyDescriptor fallbackDescriptor = descriptor.forFallbackMatch();
for (String candidateName : candidateNames) { for (String candidateName : candidateNames) {

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

@ -25,6 +25,7 @@ import java.lang.reflect.InvocationHandler;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.lang.reflect.Proxy; import java.lang.reflect.Proxy;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.LinkedHashMap; import java.util.LinkedHashMap;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
@ -910,16 +911,15 @@ public class AutowiredAnnotationBeanPostProcessorTests {
RootBeanDefinition bd = new RootBeanDefinition(MapConstructorInjectionBean.class); RootBeanDefinition bd = new RootBeanDefinition(MapConstructorInjectionBean.class);
bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE); bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
bf.registerBeanDefinition("annotatedBean", bd); bf.registerBeanDefinition("annotatedBean", bd);
Map<String, TestBean> tbm = new LinkedHashMap<String, TestBean>(); RootBeanDefinition tbm = new RootBeanDefinition(CollectionFactoryMethods.class);
tbm.put("testBean1", new TestBean("tb1")); tbm.setUniqueFactoryMethodName("testBeanMap");
tbm.put("testBean2", new TestBean("tb2")); bf.registerBeanDefinition("myTestBeanMap", tbm);
bf.registerSingleton("testBeans", tbm); bf.registerSingleton("otherMap", new HashMap<Object, Object>());
bf.registerSingleton("otherMap", new Properties());
MapConstructorInjectionBean bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean"); MapConstructorInjectionBean bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean");
assertSame(tbm, bean.getTestBeanMap()); assertSame(bf.getBean("myTestBeanMap"), bean.getTestBeanMap());
bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean"); bean = (MapConstructorInjectionBean) bf.getBean("annotatedBean");
assertSame(tbm, bean.getTestBeanMap()); assertSame(bf.getBean("myTestBeanMap"), bean.getTestBeanMap());
} }
@Test @Test
@ -954,16 +954,15 @@ public class AutowiredAnnotationBeanPostProcessorTests {
RootBeanDefinition bd = new RootBeanDefinition(SetConstructorInjectionBean.class); RootBeanDefinition bd = new RootBeanDefinition(SetConstructorInjectionBean.class);
bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE); bd.setScope(RootBeanDefinition.SCOPE_PROTOTYPE);
bf.registerBeanDefinition("annotatedBean", bd); bf.registerBeanDefinition("annotatedBean", bd);
Set<TestBean> tbs = new LinkedHashSet<TestBean>(); RootBeanDefinition tbs = new RootBeanDefinition(CollectionFactoryMethods.class);
tbs.add(new TestBean("tb1")); tbs.setUniqueFactoryMethodName("testBeanSet");
tbs.add(new TestBean("tb2")); bf.registerBeanDefinition("myTestBeanSet", tbs);
bf.registerSingleton("testBeanSet", tbs);
bf.registerSingleton("otherSet", new HashSet<Object>()); bf.registerSingleton("otherSet", new HashSet<Object>());
SetConstructorInjectionBean bean = (SetConstructorInjectionBean) bf.getBean("annotatedBean"); SetConstructorInjectionBean bean = (SetConstructorInjectionBean) bf.getBean("annotatedBean");
assertSame(tbs, bean.getTestBeanSet()); assertSame(bf.getBean("myTestBeanSet"), bean.getTestBeanSet());
bean = (SetConstructorInjectionBean) bf.getBean("annotatedBean"); bean = (SetConstructorInjectionBean) bf.getBean("annotatedBean");
assertSame(tbs, bean.getTestBeanSet()); assertSame(bf.getBean("myTestBeanSet"), bean.getTestBeanSet());
} }
@Test @Test
@ -3203,4 +3202,23 @@ public class AutowiredAnnotationBeanPostProcessorTests {
} }
} }
public static class CollectionFactoryMethods {
public static Map<String, TestBean> testBeanMap() {
Map<String, TestBean> tbm = new LinkedHashMap<String, TestBean>();
tbm.put("testBean1", new TestBean("tb1"));
tbm.put("testBean2", new TestBean("tb2"));
return tbm;
}
public static Set<TestBean> testBeanSet() {
Set<TestBean> tbs = new LinkedHashSet<TestBean>();
tbs.add(new TestBean("tb1"));
tbs.add(new TestBean("tb2"));
return tbs;
}
}
} }