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

DATACMNS-422 - Mitigate semantic changes in Spring 4.0's GenericTypeResolver.

Browse Source 
In case of an unresolvable generic parameter in TypeDiscoverer's getTypeArgument(…) we check for a generic super type for the given bound and fall back to Object in case we find a parameterized type.
This commit is contained in:
Oliver Gierke
2014-01-19 15:26:06 +01:00
parent 3fc927ceb8
commit 1f172725f0
2 changed files with 30 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2011-2013 the original author or authors.
* Copyright 2011-2014 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -308,7 +308,7 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
public TypeInformation<?> getMapValueType() {
if (isMap()) {
return getTypeArgument(getType(), Map.class, 1);
return getTypeArgument(Map.class, 1);
}
List<TypeInformation<?>> arguments = getTypeArguments();
@@ -348,11 +348,11 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
}
if (isMap()) {
return getTypeArgument(rawType, Map.class, 0);
return getTypeArgument(Map.class, 0);
}
if (Iterable.class.isAssignableFrom(rawType)) {
return getTypeArgument(rawType, Iterable.class, 0);
return getTypeArgument(Iterable.class, 0);
}
List<TypeInformation<?>> arguments = getTypeArguments();
@@ -448,9 +448,16 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
return target.getSuperTypeInformation(getType()).equals(this);
}
private TypeInformation<?> getTypeArgument(Class<?> type, Class<?> bound, int index) {
Class<?>[] arguments = GenericTypeResolver.resolveTypeArguments(type, bound);
return arguments == null ? null : createInfo(arguments[index]);
private TypeInformation<?> getTypeArgument(Class<?> bound, int index) {
Class<?>[] arguments = GenericTypeResolver.resolveTypeArguments(getType(), bound);
if (arguments == null) {
return getSuperTypeInformation(bound) instanceof ParameterizedTypeInformation ? ClassTypeInformation.OBJECT
: null;
}
return createInfo(arguments[index]);
}
/*