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

DATADOC-145 - Removed obsolete methods from MappingBeanHelper.

Browse Source 
Fixed inverted isAssignableFrom(…) check as well.
This commit is contained in:
Oliver Gierke
2011-05-22 14:44:05 +02:00
parent cbf8218cc0
commit 1583aea2b7
1 changed files with 1 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
spring-data-commons-core/src/main/java/org/springframework/data/mapping/MappingBeanHelper.java
View File

@@ -218,47 +218,10 @@ public abstract class MappingBeanHelper {
ReflectionUtils.makeAccessible(getter);
obj = ReflectionUtils.invokeMethod(getter, from);
}
if (null != obj && !obj.getClass().isAssignableFrom(type)) {
if (null != obj && !type.isAssignableFrom(obj.getClass())) {
return conversionService.convert(obj, type);
} else {
return (T) obj;
}
}
public static Class<?> getTargetType(TypeVariable<?> tv) {
Class<?> targetType = Object.class;
Type[] bounds = tv.getBounds();
if (bounds.length > 0) {
if (bounds[0] instanceof ParameterizedType) {
return getTargetType((ParameterizedType) bounds[0]);
} else if (bounds[0] instanceof TypeVariable) {
return getTargetType((TypeVariable<?>) bounds[0]);
} else {
targetType = (Class<?>) bounds[0];
}
}
return targetType;
}
public static Class<?> getTargetType(ParameterizedType ptype) {
Class<?> targetType;
Type[] types = ptype.getActualTypeArguments();
if (types.length == 1) {
if (types[0] instanceof TypeVariable) {
// Placeholder type
targetType = Object.class;
} else {
if (types[0] instanceof ParameterizedType) {
return getTargetType((ParameterizedType) types[0]);
} else {
targetType = (Class<?>) types[0];
}
}
} else {
targetType = (Class<?>) ptype.getRawType();
}
return targetType;
}
}