Ignore overridden factory methods for unique candidate resolution

See gh-27920

Author: jhoeller

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

@@ -371,7 +371,7 @@ private boolean isParamMismatch(Method uniqueCandidate, Method candidate) {
 	 */
 	private Method[] getCandidateMethods(Class<?> factoryClass, RootBeanDefinition mbd) {
 		return (mbd.isNonPublicAccessAllowed() ?
-				ReflectionUtils.getAllDeclaredMethods(factoryClass) : factoryClass.getMethods());
+				ReflectionUtils.getUniqueDeclaredMethods(factoryClass) : factoryClass.getMethods());
 	}
 
 	private boolean isStaticCandidate(Method method, Class<?> factoryClass) {

spring-beans/src/test/java/org/springframework/beans/factory/support/ConstructorResolverAotTests.java

@@ -86,7 +86,7 @@ void beanDefinitionWithFactoryMethodNameAndAssignableConstructorArg() {
 	}
 
 	@Test
-	void beanDefinitionWithFactoryMethodNameAndMatchingMethodNamesThatShouldBeIgnored() {
+	void beanDefinitionWithFactoryMethodNameAndMatchingMethodNames() {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 		BeanDefinition beanDefinition = BeanDefinitionBuilder
 				.rootBeanDefinition(DummySampleFactory.class).setFactoryMethod("of")
@@ -96,6 +96,18 @@ void beanDefinitionWithFactoryMethodNameAndMatchingMethodNamesThatShouldBeIgnore
 				.findMethod(DummySampleFactory.class, "of", Integer.class));
 	}
 
+	@Test
+	void beanDefinitionWithFactoryMethodNameAndOverriddenMethod() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerBeanDefinition("config", new RootBeanDefinition(ExtendedSampleFactory.class));
+		BeanDefinition beanDefinition = BeanDefinitionBuilder
+				.rootBeanDefinition(String.class).setFactoryMethodOnBean("resolve", "config")
+				.addConstructorArgValue("test").getBeanDefinition();
+		Executable executable = resolve(beanFactory, beanDefinition);
+		assertThat(executable).isNotNull().isEqualTo(ReflectionUtils
+				.findMethod(ExtendedSampleFactory.class, "resolve", String.class));
+	}
+
 	@Test
 	void detectBeanInstanceExecutableWithBeanClassAndFactoryMethodNameIgnoreTargetType() {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
@@ -386,8 +398,17 @@ static String of(Integer value) {
 			return value.toString();
 		}
 
-		private String of(String ignored) {
-			return ignored;
+		protected String resolve(String value) {
+			return value;
+		}
+	}
+
+	@SuppressWarnings("unused")
+	static class ExtendedSampleFactory extends DummySampleFactory {
+
+		@Override
+		protected String resolve(String value) {
+			return super.resolve(value);
 		}
 	}