BeanFactory supports ObjectFactory as a dependency type for @Autowired and @Value (SPR-6079)

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1850 50f2f4bb-b051-0410-bef5-90022cba6387

org.springframework.core/src/main/java/org/springframework/core/MethodParameter.java

@@ -49,7 +49,9 @@ public class MethodParameter {
 
 	private final int parameterIndex;
 
-	private Class parameterType;
+	private Class<?> parameterType;
+
+	private Type genericParameterType;
 
 	private Annotation[] parameterAnnotations;
 
@@ -167,7 +169,7 @@ public class MethodParameter {
 	/**
 	 * Set a resolved (generic) parameter type.
 	 */
-	void setParameterType(Class parameterType) {
+	void setParameterType(Class<?> parameterType) {
 		this.parameterType = parameterType;
 	}
 
@@ -175,7 +177,7 @@ public class MethodParameter {
 	 * Return the type of the method/constructor parameter.
 	 * @return the parameter type (never <code>null</code>)
 	 */
-	public Class getParameterType() {
+	public Class<?> getParameterType() {
 		if (this.parameterType == null) {
 			if (this.parameterIndex < 0) {
 				this.parameterType = (this.method != null ? this.method.getReturnType() : null);
@@ -189,6 +191,24 @@ public class MethodParameter {
 		return this.parameterType;
 	}
 
+	/**
+	 * Return the generic type of the method/constructor parameter.
+	 * @return the parameter type (never <code>null</code>)
+	 */
+	public Type getGenericParameterType() {
+		if (this.genericParameterType == null) {
+			if (this.parameterIndex < 0) {
+				this.genericParameterType = (this.method != null ? this.method.getGenericReturnType() : null);
+			}
+			else {
+				this.genericParameterType = (this.method != null ?
+					this.method.getGenericParameterTypes()[this.parameterIndex] :
+					this.constructor.getGenericParameterTypes()[this.parameterIndex]);
+			}
+		}
+		return this.genericParameterType;
+	}
+
 	/**
 	 * Return the annotations associated with the target method/constructor itself.
 	 */