Allow TypeDescriptor create with null generics

Restore the ability to create a TypeDescriptor for a collection or
map where the generics may be null.

Issue: SPR-11006

Author: Phillip Webb

spring-core/src/main/java/org/springframework/core/convert/TypeDescriptor.java

@@ -498,12 +498,13 @@ public static TypeDescriptor valueOf(Class<?> type) {
 	 */
 	public static TypeDescriptor collection(Class<?> collectionType, TypeDescriptor elementTypeDescriptor) {
 		Assert.notNull(collectionType, "CollectionType must not be null");
-		Assert.notNull(elementTypeDescriptor, "ElementTypeDesciptor must not be null");
 		if (!Collection.class.isAssignableFrom(collectionType)) {
 			throw new IllegalArgumentException("collectionType must be a java.util.Collection");
 		}
+		ResolvableType element = (elementTypeDescriptor == null ? null
+				: elementTypeDescriptor.resolvableType);
 		return new TypeDescriptor(ResolvableType.forClassWithGenerics(collectionType,
-				elementTypeDescriptor.resolvableType), null, null);
+				element), null, null);
 	}
 
 	/**
@@ -520,8 +521,9 @@ public static TypeDescriptor map(Class<?> mapType, TypeDescriptor keyTypeDescrip
 		if (!Map.class.isAssignableFrom(mapType)) {
 			throw new IllegalArgumentException("mapType must be a java.util.Map");
 		}
-		return new TypeDescriptor(ResolvableType.forClassWithGenerics(mapType,
-				keyTypeDescriptor.resolvableType, valueTypeDescriptor.resolvableType), null, null);
+		ResolvableType key = (keyTypeDescriptor == null ? null : keyTypeDescriptor.resolvableType);
+		ResolvableType value = (valueTypeDescriptor == null ? null : valueTypeDescriptor.resolvableType);
+		return new TypeDescriptor(ResolvableType.forClassWithGenerics(mapType, key, value), null, null);
 	}
 
 	/**

spring-core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java

@@ -918,4 +918,18 @@ public void serializable() throws Exception {
 		TypeDescriptor readObject = (TypeDescriptor) inputStream.readObject();
 		assertThat(readObject, equalTo(typeDescriptor));
 	}
+
+	@Test
+	public void createCollectionWithNullElement() throws Exception {
+		TypeDescriptor typeDescriptor = TypeDescriptor.collection(List.class, null);
+		assertThat(typeDescriptor.getElementTypeDescriptor(), nullValue());
+	}
+
+	@Test
+	public void createMapWithNullElements() throws Exception {
+		TypeDescriptor typeDescriptor = TypeDescriptor.map(LinkedHashMap.class, null, null);
+		assertThat(typeDescriptor.getMapKeyTypeDescriptor(), nullValue());
+		assertThat(typeDescriptor.getMapValueTypeDescriptor(), nullValue());
+	}
+
 }