DATAMONGO-1251 - Fixed potential NullPointerException in UpdateMapper.

We now explicitly handle the possibility of the source object a type hint needs to be calculated for being null.

Author: christophstrobl

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/convert/UpdateMapper.java

@@ -142,19 +142,18 @@ private DBObject getMappedValue(Field field, Modifier modifier) {
 	}
 
 	private TypeInformation<?> getTypeHintForEntity(Object source, MongoPersistentEntity<?> entity) {
-		return processTypeHintForNestedDocuments(source, entity.getTypeInformation());
-	}
-
-	private TypeInformation<?> processTypeHintForNestedDocuments(Object source, TypeInformation<?> info) {
 
+		TypeInformation<?> info = entity.getTypeInformation();
 		Class<?> type = info.getActualType().getType();
-		if (type.isInterface() || java.lang.reflect.Modifier.isAbstract(type.getModifiers())) {
+
+		if (source == null || type.isInterface() || java.lang.reflect.Modifier.isAbstract(type.getModifiers())) {
 			return info;
 		}
 
 		if (!type.equals(source.getClass())) {
 			return info;
 		}
+
 		return NESTED_DOCUMENT;
 	}
 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/convert/UpdateMapperUnitTests.java

@@ -22,6 +22,7 @@
 import static org.springframework.data.mongodb.core.DBObjectTestUtils.*;
 import static org.springframework.data.mongodb.test.util.IsBsonObject.*;
 
+import java.time.LocalDate;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
@@ -792,6 +793,70 @@ public void mapsUpdateWithBothReadingAndWritingConverterRegistered() {
 		assertThat(result, isBsonObject().containing("$set.allocation", Allocation.AVAILABLE.code));
 	}
 
+	/**
+	 * see DATAMONGO-1251
+	 */
+	@Test
+	public void mapsNullValueCorrectlyForSimpleTypes() {
+
+		Update update = new Update().set("value", null);
+
+		DBObject mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ConcreteChildClass.class));
+
+		DBObject $set = DBObjectTestUtils.getAsDBObject(mappedUpdate, "$set");
+		assertThat($set.containsField("value"), is(true));
+		assertThat($set.get("value"), nullValue());
+	}
+
+	/**
+	 * see DATAMONGO-1251
+	 */
+	@Test
+	public void mapsNullValueCorrectlyForJava8Date() {
+
+		Update update = new Update().set("date", null);
+
+		DBObject mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ClassWithJava8Date.class));
+
+		DBObject $set = DBObjectTestUtils.getAsDBObject(mappedUpdate, "$set");
+		assertThat($set.containsField("date"), is(true));
+		assertThat($set.get("value"), nullValue());
+	}
+
+	/**
+	 * see DATAMONGO-1251
+	 */
+	@Test
+	public void mapsNullValueCorrectlyForCollectionTypes() {
+
+		Update update = new Update().set("values", null);
+
+		DBObject mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(ListModel.class));
+
+		DBObject $set = DBObjectTestUtils.getAsDBObject(mappedUpdate, "$set");
+		assertThat($set.containsField("values"), is(true));
+		assertThat($set.get("value"), nullValue());
+	}
+
+	/**
+	 * see DATAMONGO-1251
+	 */
+	@Test
+	public void mapsNullValueCorrectlyForPropertyOfNestedDocument() {
+
+		Update update = new Update().set("concreteValue.name", null);
+
+		DBObject mappedUpdate = mapper.getMappedObject(update.getUpdateObject(),
+				context.getPersistentEntity(EntityWithObject.class));
+
+		DBObject $set = DBObjectTestUtils.getAsDBObject(mappedUpdate, "$set");
+		assertThat($set.containsField("concreteValue.name"), is(true));
+		assertThat($set.get("concreteValue.name"), nullValue());
+	}
+
 	static class DomainTypeWrappingConcreteyTypeHavingListOfInterfaceTypeAttributes {
 		ListModelWrapper concreteTypeWithListAttributeOfInterfaceType;
 	}
@@ -1061,4 +1126,9 @@ public Allocation convert(String source) {
 			}
 		}
 	}
+
+	static class ClassWithJava8Date {
+
+		LocalDate date;
+	}
 }