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

Fixed potential NullPointerExceptions for TypeDiscoverer.getComponentType() and getMapValueType().

Browse Source
This commit is contained in:
Oliver Gierke
2011-08-19 22:44:13 +02:00
parent c71f2684d3
commit 307993ac9b
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
spring-data-commons-core/src/main/java/org/springframework/data/util/TypeDiscoverer.java
View File

@@ -255,7 +255,12 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
return createInfo(parameterizedType.getActualTypeArguments()[1]);
}
return createInfo(GenericTypeResolver.resolveTypeArguments(getType(), Map.class)[1]);
return getTypeArgument(getType(), Map.class, 1);
}
private TypeInformation<?> getTypeArgument(Class<?> type, Class<?> bound, int index) {
Class<?>[] arguments = GenericTypeResolver.resolveTypeArguments(type, bound);
return arguments == null ? null : createInfo(arguments[index]);
}
/* (non-Javadoc)
@@ -284,11 +289,11 @@ class TypeDiscoverer<S> implements TypeInformation<S> {
Class<S> rawType = getType();
if (isMap()) {
return createInfo(GenericTypeResolver.resolveTypeArguments(rawType, Map.class)[0]);
return getTypeArgument(rawType, Map.class, 0);
}
if (Iterable.class.isAssignableFrom(rawType)) {
return createInfo(GenericTypeResolver.resolveTypeArguments(rawType, Iterable.class)[0]);
return getTypeArgument(rawType, Iterable.class, 0);
}
if (rawType.isArray()) {

8
spring-data-commons-core/src/test/java/org/springframework/data/util/TypeDiscovererUnitTests.java
View File

@@ -126,6 +126,14 @@ public class TypeDiscovererUnitTests {
assertThat(types.get(0).getComponentType().getType(), is(equalTo((Class) String.class)));
}
@Test
@SuppressWarnings("rawtypes")
public void returnsNullForComponentAndValueTypesForRawMaps() {
TypeDiscoverer<Map> discoverer = new TypeDiscoverer<Map>(Map.class, null);
assertThat(discoverer.getComponentType(), is(nullValue()));
assertThat(discoverer.getMapValueType(), is(nullValue()));
}
class SelfReferencing {
Map<String, SelfReferencingMap> parent;