Ignore target type when resolving factory method

Closes gh-1269

Author: snicoll

spring-aot/src/main/java/org/springframework/aot/context/bootstrap/generator/bean/descriptor/BeanInstanceExecutableSupplier.java

@@ -41,6 +41,7 @@
 import org.springframework.beans.factory.config.ConfigurableBeanFactory;
 import org.springframework.beans.factory.config.ConstructorArgumentValues;
 import org.springframework.beans.factory.config.ConstructorArgumentValues.ValueHolder;
+import org.springframework.beans.factory.support.AbstractBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
 import org.springframework.core.ResolvableType;
 import org.springframework.core.annotation.MergedAnnotations;
@@ -69,7 +70,7 @@ Executable detectBeanInstanceExecutable(BeanDefinition beanDefinition) {
 		Supplier<ResolvableType> beanType = () -> getBeanType(beanDefinition);
 		List<ResolvableType> valueTypes = beanDefinition.hasConstructorArgumentValues()
 				? determineParameterValueTypes(beanDefinition.getConstructorArgumentValues()) : Collections.emptyList();
-		Method resolvedFactoryMethod = resolveFactoryMethod(beanDefinition, beanType, valueTypes);
+		Method resolvedFactoryMethod = resolveFactoryMethod(beanDefinition, valueTypes);
 		if (resolvedFactoryMethod != null) {
 			return resolvedFactoryMethod;
 		}
@@ -129,8 +130,7 @@ private ResolvableType extractTypeFromBeanDefinition(ResolvableType type) {
 		return type;
 	}
 
-	private Method resolveFactoryMethod(BeanDefinition beanDefinition, Supplier<ResolvableType> beanType,
-			List<ResolvableType> valueTypes) {
+	private Method resolveFactoryMethod(BeanDefinition beanDefinition, List<ResolvableType> valueTypes) {
 		if (beanDefinition instanceof RootBeanDefinition) {
 			RootBeanDefinition rootBeanDefinition = (RootBeanDefinition) beanDefinition;
 			Method resolvedFactoryMethod = rootBeanDefinition.getResolvedFactoryMethod();
@@ -141,8 +141,12 @@ private Method resolveFactoryMethod(BeanDefinition beanDefinition, Supplier<Reso
 		String factoryMethodName = beanDefinition.getFactoryMethodName();
 		if (factoryMethodName != null) {
 			List<Method> methods = new ArrayList<>();
-			ReflectionUtils.doWithMethods(beanType.get().toClass(), methods::add,
-					(method) -> isFactoryMethodCandidate(beanDefinition, method, factoryMethodName));
+			Class<?> beanClass = getBeanClass(beanDefinition);
+			if (beanClass == null) {
+				throw new IllegalStateException("Failed to determine bean class of " + beanDefinition);
+			}
+			ReflectionUtils.doWithMethods(beanClass, methods::add,
+					(method) -> isFactoryMethodCandidate(beanClass, method, factoryMethodName));
 			if (methods.size() >= 1) {
 				Function<Method, List<ResolvableType>> parameterTypesFactory = (method) -> {
 					List<ResolvableType> types = new ArrayList<>();
@@ -157,10 +161,10 @@ private Method resolveFactoryMethod(BeanDefinition beanDefinition, Supplier<Reso
 		return null;
 	}
 
-	private boolean isFactoryMethodCandidate(BeanDefinition beanDefinition, Method method, String factoryMethodName) {
+	private boolean isFactoryMethodCandidate(Class<?> beanClass, Method method, String factoryMethodName) {
 		if (method.getName().equals(factoryMethodName)) {
 			if (Modifier.isStatic(method.getModifiers())) {
-				return method.getDeclaringClass().equals(getBeanType(beanDefinition).toClass());
+				return method.getDeclaringClass().equals(beanClass);
 			}
 			return !Modifier.isPrivate(method.getModifiers());
 		}
@@ -314,6 +318,14 @@ private Class<?> getFactoryBeanClass(BeanDefinition beanDefinition) {
 		return null;
 	}
 
+	private Class<?> getBeanClass(BeanDefinition beanDefinition) {
+		if (beanDefinition instanceof AbstractBeanDefinition) {
+			AbstractBeanDefinition abd = (AbstractBeanDefinition) beanDefinition;
+			return abd.hasBeanClass() ? abd.getBeanClass() : loadClass(abd.getBeanClassName());
+		}
+		return (beanDefinition.getBeanClassName() != null) ? loadClass(beanDefinition.getBeanClassName()) : null;
+	}
+
 	private ResolvableType getBeanType(BeanDefinition beanDefinition) {
 		ResolvableType resolvableType = beanDefinition.getResolvableType();
 		if (resolvableType != ResolvableType.NONE) {

spring-aot/src/test/java/org/springframework/aot/context/bootstrap/generator/bean/descriptor/BeanInstanceExecutableSupplierTests.java

@@ -46,7 +46,17 @@
 class BeanInstanceExecutableSupplierTests {
 
 	@Test
-	void detectBeanInstanceExecutableWithFactoryMethodName() {
+	void detectBeanInstanceExecutableWithBeanClassAndFactoryMethodName() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("testBean", "test");
+		BeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(SampleFactory.class)
+				.setFactoryMethod("create").addConstructorArgReference("testBean").getBeanDefinition();
+		Executable executable = detectBeanInstanceExecutable(beanFactory, beanDefinition);
+		assertThat(executable).isNotNull().isEqualTo(ReflectionUtils.findMethod(SampleFactory.class, "create", String.class));
+	}
+
+	@Test
+	void detectBeanInstanceExecutableWithBeanClassNameAndFactoryMethodName() {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 		beanFactory.registerSingleton("testBean", "test");
 		BeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(SampleFactory.class.getName())
@@ -60,7 +70,7 @@ void beanDefinitionWithFactoryMethodNameAndAssignableConstructorArg() {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 		beanFactory.registerSingleton("testNumber", 1L);
 		beanFactory.registerSingleton("testBean", "test");
-		BeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(SampleFactory.class.getName())
+		BeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(SampleFactory.class)
 				.setFactoryMethod("create").addConstructorArgReference("testNumber")
 				.addConstructorArgReference("testBean").getBeanDefinition();
 		Executable executable = detectBeanInstanceExecutable(beanFactory, beanDefinition);
@@ -76,12 +86,23 @@ void beanDefinitionWithFactoryMethodNameAndMatchingMethodNamesThatShouldBeIgnore
 		assertThat(executable).isNotNull().isEqualTo(ReflectionUtils.findMethod(DummySampleFactory.class, "of", Integer.class));
 	}
 
+	@Test
+	void detectBeanInstanceExecutableWithBeanClassAndFactoryMethodNameIgnoreTargetType() {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		beanFactory.registerSingleton("testBean", "test");
+		RootBeanDefinition beanDefinition = (RootBeanDefinition) BeanDefinitionBuilder.rootBeanDefinition(SampleFactory.class)
+				.setFactoryMethod("create").addConstructorArgReference("testBean").getBeanDefinition();
+		beanDefinition.setTargetType(String.class);
+		Executable executable = detectBeanInstanceExecutable(beanFactory, beanDefinition);
+		assertThat(executable).isNotNull().isEqualTo(ReflectionUtils.findMethod(SampleFactory.class, "create", String.class));
+	}
+
 	@Test
 	void beanDefinitionWithConstructorArgsForMultipleConstructors() throws Exception {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 		beanFactory.registerSingleton("testNumber", 1L);
 		beanFactory.registerSingleton("testBean", "test");
-		BeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(SampleBeanWithConstructors.class.getName())
+		BeanDefinition beanDefinition = BeanDefinitionBuilder.rootBeanDefinition(SampleBeanWithConstructors.class)
 				.addConstructorArgReference("testNumber")
 				.addConstructorArgReference("testBean").getBeanDefinition();
 		Executable executable = detectBeanInstanceExecutable(beanFactory, beanDefinition);
@@ -93,7 +114,7 @@ void genericBeanDefinitionWithConstructorArgsForMultipleConstructors() throws Ex
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 		beanFactory.registerSingleton("testNumber", 1L);
 		beanFactory.registerSingleton("testBean", "test");
-		BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(SampleBeanWithConstructors.class.getName())
+		BeanDefinition beanDefinition = BeanDefinitionBuilder.genericBeanDefinition(SampleBeanWithConstructors.class)
 				.addConstructorArgReference("testNumber")
 				.addConstructorArgReference("testBean").getBeanDefinition();
 		Executable executable = detectBeanInstanceExecutable(beanFactory, beanDefinition);