root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Reuse ResolvableType in getDependencyType 

See gh-24525
This commit is contained in:
陈其苗 2020-02-14 22:40:47 +08:00 committed by Stephane Nicoll
parent f64ede3c83
commit b69ab8d568
1 changed files with 2 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
spring-beans/src/main/java/org/springframework/beans/factory/config/DependencyDescriptor.java
View File

@ -21,8 +21,6 @@ import java.io.ObjectInputStream;
import java.io.Serializable; import java.io.Serializable;
import java.lang.annotation.Annotation; import java.lang.annotation.Annotation;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.ParameterizedType;
import java.lang.reflect.Type;
import java.util.Map; import java.util.Map;
import java.util.Optional; import java.util.Optional;
@ -365,23 +363,8 @@ public class DependencyDescriptor extends InjectionPoint implements Serializable
public Class<?> getDependencyType() { public Class<?> getDependencyType() {
if (this.field != null) { if (this.field != null) {
if (this.nestingLevel > 1) { if (this.nestingLevel > 1) {
Type type = this.field.getGenericType(); Class<?> clazz = getResolvableType().getRawClass();
for (int i = 2; i <= this.nestingLevel; i++) { return clazz != null ? clazz : Object.class;
if (type instanceof ParameterizedType) {
Type[] args = ((ParameterizedType) type).getActualTypeArguments();
type = args[args.length - 1];
}
}
if (type instanceof Class) {
return (Class<?>) type;
}
else if (type instanceof ParameterizedType) {
Type arg = ((ParameterizedType) type).getRawType();
if (arg instanceof Class) {
return (Class<?>) arg;
}
}
return Object.class;
} }
else { else {
return this.field.getType(); return this.field.getType();