QualifierAnnotationAutowireCandidateResolver matches regular bean name for FactoryBean dependency type as well

Author: jhoeller

spring-beans/src/main/java/org/springframework/beans/factory/config/BeanDefinitionHolder.java

@@ -17,6 +17,7 @@
 package org.springframework.beans.factory.config;
 
 import org.springframework.beans.BeanMetadataElement;
+import org.springframework.beans.factory.BeanFactoryUtils;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
@@ -118,8 +119,9 @@ public Object getSource() {
 	 * or the aliases stored in this bean definition.
 	 */
 	public boolean matchesName(String candidateName) {
-		return (candidateName != null &&
-				(candidateName.equals(this.beanName) || ObjectUtils.containsElement(this.aliases, candidateName)));
+		return (candidateName != null && (candidateName.equals(this.beanName) ||
+				candidateName.equals(BeanFactoryUtils.transformedBeanName(this.beanName)) ||
+				ObjectUtils.containsElement(this.aliases, candidateName)));
 	}
 
 

spring-context/src/test/java/org/springframework/context/annotation/ConfigurationClassPostProcessorTests.java

@@ -22,6 +22,7 @@
 import org.springframework.beans.factory.FactoryBean;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.AutowiredAnnotationBeanPostProcessor;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.QualifierAnnotationAutowireCandidateResolver;
 import org.springframework.beans.factory.support.ChildBeanDefinition;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
@@ -193,6 +194,8 @@ public void testGenericsBasedInjectionWithFactoryBean() {
 
 		RepositoryFactoryBeanInjectionBean bean = (RepositoryFactoryBeanInjectionBean) beanFactory.getBean("annotatedBean");
 		assertSame(beanFactory.getBean("&repoFactoryBean"), bean.repositoryFactoryBean);
+		assertSame(beanFactory.getBean("&repoFactoryBean"), bean.qualifiedRepositoryFactoryBean);
+		assertSame(beanFactory.getBean("&repoFactoryBean"), bean.prefixQualifiedRepositoryFactoryBean);
 	}
 
 	@Test
@@ -323,6 +326,14 @@ public static class RepositoryFactoryBeanInjectionBean {
 
 		@Autowired
 		public RepositoryFactoryBean<?> repositoryFactoryBean;
+
+		@Autowired
+		@Qualifier("repoFactoryBean")
+		public RepositoryFactoryBean<?> qualifiedRepositoryFactoryBean;
+
+		@Autowired
+		@Qualifier("&repoFactoryBean")
+		public RepositoryFactoryBean<?> prefixQualifiedRepositoryFactoryBean;
 	}