Fixed resolveReturnTypeForFactoryMethod to unwrap TypedStringValue

XML-defined arguments values are initially turned into TypedStringValue wrappers. If we encounter an unresolved argument, we need to unwrap such a TypedStringValue and then try to treat its content as a class name.

Issue: SPR-11034

Author: jhoeller

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

@@ -31,7 +31,9 @@
 import java.util.Comparator;
 import java.util.Set;
 
+import org.springframework.beans.BeanMetadataElement;
 import org.springframework.beans.factory.ObjectFactory;
+import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 
@@ -192,8 +194,8 @@ public static Class<?> resolveReturnTypeForFactoryMethod(Method method, Object[]
 
 		TypeVariable<Method>[] declaredTypeVariables = method.getTypeParameters();
 		Type genericReturnType = method.getGenericReturnType();
-		Type[] methodArgumentTypes = method.getGenericParameterTypes();
-		Assert.isTrue(args.length == methodArgumentTypes.length, "Argument array does not match parameter count");
+		Type[] methodParameterTypes = method.getGenericParameterTypes();
+		Assert.isTrue(args.length == methodParameterTypes.length, "Argument array does not match parameter count");
 
 		// Ensure that the type variable (e.g., T) is declared directly on the method
 		// itself (e.g., via <T>), not on the enclosing class or interface.
@@ -206,30 +208,57 @@ public static Class<?> resolveReturnTypeForFactoryMethod(Method method, Object[]
 		}
 
 		if (locallyDeclaredTypeVariableMatchesReturnType) {
-			for (int i = 0; i < methodArgumentTypes.length; i++) {
-				Type currentMethodArgumentType = methodArgumentTypes[i];
-				if (currentMethodArgumentType.equals(genericReturnType)) {
-					return args[i].getClass();
+			for (int i = 0; i < methodParameterTypes.length; i++) {
+				Type methodParameterType = methodParameterTypes[i];
+				Object arg = args[i];
+				if (methodParameterType.equals(genericReturnType)) {
+					if (arg instanceof TypedStringValue) {
+						TypedStringValue typedValue = ((TypedStringValue) arg);
+						if (typedValue.hasTargetType()) {
+							return typedValue.getTargetType();
+						}
+						try {
+							return typedValue.resolveTargetType(classLoader);
+						}
+						catch (ClassNotFoundException ex) {
+							throw new IllegalStateException("Failed to resolve typed value", ex);
+						}
+					}
+					// Only consider argument type if it is a simple value...
+					if (arg != null && !(arg instanceof BeanMetadataElement)) {
+						return arg.getClass();
+					}
+					return method.getReturnType();
 				}
-				if (currentMethodArgumentType instanceof ParameterizedType) {
-					ParameterizedType parameterizedType = (ParameterizedType) currentMethodArgumentType;
+				else if (methodParameterType instanceof ParameterizedType) {
+					ParameterizedType parameterizedType = (ParameterizedType) methodParameterType;
 					Type[] actualTypeArguments = parameterizedType.getActualTypeArguments();
 					for (Type typeArg : actualTypeArguments) {
 						if (typeArg.equals(genericReturnType)) {
-							Object arg = args[i];
 							if (arg instanceof Class) {
 								return (Class<?>) arg;
 							}
-							else if (arg instanceof String) {
-								try {
-									return classLoader.loadClass((String) arg);
+							else {
+								String className = null;
+								if (arg instanceof String) {
+									className = (String) arg;
 								}
-								catch (ClassNotFoundException ex) {
-									throw new IllegalStateException(
-											"Could not resolve specified class name argument [" + arg + "]", ex);
+								else if (arg instanceof TypedStringValue) {
+									TypedStringValue typedValue = ((TypedStringValue) arg);
+									String targetTypeName = typedValue.getTargetTypeName();
+									if (targetTypeName == null || Class.class.getName().equals(targetTypeName)) {
+										className = typedValue.getValue();
+									}
+								}
+								if (className != null) {
+									try {
+										return classLoader.loadClass(className);
+									}
+									catch (ClassNotFoundException ex) {
+										throw new IllegalStateException(
+												"Could not resolve specified class name argument [" + arg + "]", ex);
+									}
 								}
-							}
-							else {
 								// Consider adding logic to determine the class of the typeArg, if possible.
 								// For now, just fall back...
 								return method.getReturnType();

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

@@ -37,6 +37,7 @@
 import org.springframework.beans.PropertyEditorRegistrar;
 import org.springframework.beans.PropertyEditorRegistry;
 import org.springframework.beans.factory.BeanCreationException;
+import org.springframework.beans.factory.config.TypedStringValue;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.beans.propertyeditors.CustomNumberEditor;
 import org.springframework.core.io.ClassPathResource;
@@ -720,6 +721,21 @@ public void parameterizedInstanceFactoryMethodWithNonResolvedClassName() {
 		assertEquals(1, beans.size());
 	}
 
+	@Test
+	public void parameterizedInstanceFactoryMethodWithWrappedClassName() {
+		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();
+
+		RootBeanDefinition rbd = new RootBeanDefinition();
+		rbd.setBeanClassName(Mockito.class.getName());
+		rbd.setFactoryMethodName("mock");
+		// TypedStringValue used to be equivalent to an XML-defined argument String
+		rbd.getConstructorArgumentValues().addGenericArgumentValue(new TypedStringValue(Runnable.class.getName()));
+		bf.registerBeanDefinition("mock", rbd);
+
+		Map<String, Runnable> beans = bf.getBeansOfType(Runnable.class);
+		assertEquals(1, beans.size());
+	}
+
 	@Test
 	public void parameterizedInstanceFactoryMethodWithIndexedArgument() {
 		DefaultListableBeanFactory bf = new DefaultListableBeanFactory();