Polishing

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

@@ -21,7 +21,6 @@ import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.lang.reflect.TypeVariable;
 import java.security.AccessController;
 import java.security.PrivilegedAction;
 import java.security.PrivilegedActionException;
@@ -666,9 +665,8 @@ public abstract class AbstractAutowireCapableBeanFactory extends AbstractBeanFac
 			if (Modifier.isStatic(factoryMethod.getModifiers()) == isStatic &&
 					factoryMethod.getName().equals(mbd.getFactoryMethodName()) &&
 					factoryMethod.getParameterTypes().length >= minNrOfArgs) {
-				TypeVariable<Method>[] declaredTypeVariables = factoryMethod.getTypeParameters();
 				// No declared type variables to inspect, so just process the standard return type.
-				if (declaredTypeVariables.length > 0) {
+				if (factoryMethod.getTypeParameters().length > 0) {
 					// Fully resolve parameter names and argument values.
 					Class<?>[] paramTypes = factoryMethod.getParameterTypes();
 					String[] paramNames = null;

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

@@ -654,17 +654,12 @@ public class BeanFactoryGenericsTests {
 	/**
 	 * Tests support for parameterized static {@code factory-method} declarations such as
 	 * Mockito's {@code mock()} method which has the following signature.
-	 * 
 	 * <pre>
 	 * {@code
 	 * public static <T> T mock(Class<T> classToMock)
 	 * }
 	 * </pre>
-	 * 
-	 * <p>
-	 * See SPR-9493
-	 * 
-	 * @since 3.2
+	 * <p>See SPR-9493
 	 */
 	@Test
 	public void parameterizedStaticFactoryMethod() {