Spring/spring-data-commons
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACMNS-652 - Removed JDK 8 reference from TypeDiscoverer.

Browse Source 
Removed accidentally introduced reference to JDK 8's Executable as common super type of Constructor and Method.
This commit is contained in:
Oliver Gierke
2015-03-05 17:13:56 +01:00
parent 156cb4419a
commit e2a7057af9
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
src/main/java/org/springframework/data/util/TypeDiscoverer.java
View File

@@ -17,7 +17,6 @@ package org.springframework.data.util;
import java.beans.PropertyDescriptor;
import java.lang.reflect.Constructor;
import java.lang.reflect.Executable;
import java.lang.reflect.Field;
import java.lang.reflect.GenericArrayType;
import java.lang.reflect.Method;
@@ -158,7 +157,15 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
public List<TypeInformation<?>> getParameterTypes(Constructor<?> constructor) {
Assert.notNull(constructor, "Constructor must not be null!");
return getParameterTypes((Executable) constructor);
Type[] types = constructor.getGenericParameterTypes();
List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>(types.length);
for (Type parameterType : types) {
result.add(createInfo(parameterType));
}
return result;
}
/*
@@ -408,7 +415,15 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
public List<TypeInformation<?>> getParameterTypes(Method method) {
Assert.notNull(method, "Method most not be null!");
return getParameterTypes((Executable) method);
Type[] types = method.getGenericParameterTypes();
List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>(types.length);
for (Type parameterType : types) {
result.add(createInfo(parameterType));
}
return result;
}
/*
@@ -479,18 +494,6 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
return createInfo(arguments[index]);
}
private List<TypeInformation<?>> getParameterTypes(Executable executable) {
Type[] types = executable.getGenericParameterTypes();
List<TypeInformation<?>> result = new ArrayList<TypeInformation<?>>(types.length);
for (Type parameterType : types) {
result.add(createInfo(parameterType));
}
return result;
}
/*
* (non-Javadoc)
* @see java.lang.Object#equals(java.lang.Object)