Skip to content

Commit f3b50c9

Browse files
committed
Ignore null beans in SimpleAutowireCandidateResolver.resolveAutowireCandidates
Closes gh-34543
1 parent 0a6e666 commit f3b50c9

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

spring-beans/src/main/java/org/springframework/beans/factory/support/SimpleAutowireCandidateResolver.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,15 @@ public AutowireCandidateResolver cloneIfNecessary() {
6666
* @see org.springframework.beans.factory.config.BeanDefinition#isAutowireCandidate()
6767
* @see AbstractBeanDefinition#isDefaultCandidate()
6868
*/
69+
@SuppressWarnings("unchecked")
6970
public static <T> Map<String, T> resolveAutowireCandidates(ConfigurableListableBeanFactory lbf, Class<T> type) {
7071
Map<String, T> candidates = new LinkedHashMap<>();
7172
for (String beanName : BeanFactoryUtils.beanNamesForTypeIncludingAncestors(lbf, type)) {
7273
if (AutowireUtils.isAutowireCandidate(lbf, beanName)) {
73-
candidates.put(beanName, lbf.getBean(beanName, type));
74+
Object beanInstance = lbf.getBean(beanName);
75+
if (!(beanInstance instanceof NullBean)) {
76+
candidates.put(beanName, (T) beanInstance);
77+
}
7478
}
7579
}
7680
return candidates;

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1770,6 +1770,10 @@ void objectProviderInjectionWithNonCandidatesInStream() {
17701770
parent.registerBeanDefinition("testBean4", tb4);
17711771
bf.setParentBeanFactory(parent);
17721772

1773+
RootBeanDefinition tb5 = new RootBeanDefinition(NullFactoryMethods.class);
1774+
tb5.setFactoryMethodName("createTestBean");
1775+
bf.registerBeanDefinition("testBean5", tb5);
1776+
17731777
ObjectProviderInjectionBean bean = bf.getBean("annotatedBean", ObjectProviderInjectionBean.class);
17741778
assertThat(bean.streamTestBeans()).containsExactly(bf.getBean("testBean1", TestBean.class),
17751779
bf.getBean("testBean2", TestBean.class));
@@ -1789,7 +1793,7 @@ void objectProviderInjectionWithNonCandidatesInStream() {
17891793
Map<String, TestBean> typeMatches = BeanFactoryUtils.beansOfTypeIncludingAncestors(bf, TestBean.class);
17901794
assertThat(typeMatches.remove("testBean3")).isNotNull();
17911795
Map<String, TestBean> candidates = SimpleAutowireCandidateResolver.resolveAutowireCandidates(bf, TestBean.class);
1792-
assertThat(candidates).containsExactlyEntriesOf(candidates);
1796+
assertThat(candidates).containsExactlyEntriesOf(typeMatches);
17931797
}
17941798

17951799
@Test

0 commit comments

Comments
 (0)