DATAMONGO-675 - MongoTemplate now maps Update in findAndModify(…).

The Update object handed to ….findAndModify(…) is now handed through the QueryMapper before being executed.

Author: odrotbohm

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

@@ -1335,8 +1335,8 @@ protected <T> T doFindOne(String collectionName, DBObject query, DBObject fields
 	/**
 	 * Map the results of an ad-hoc query on the default MongoDB collection to a List of the specified type. The object is
 	 * converted from the MongoDB native representation using an instance of {@see MongoConverter}. Unless configured
-	 * otherwise, an instance of MappingMongoConverter will be used. The query document is specified as a standard DBObject
-	 * and so is the fields specification. Can be overridden by subclasses.
+	 * otherwise, an instance of MappingMongoConverter will be used. The query document is specified as a standard
+	 * DBObject and so is the fields specification. Can be overridden by subclasses.
 	 * 
 	 * @param collectionName name of the collection to retrieve the objects from
 	 * @param query the query document that specifies the criteria used to find a record
@@ -1437,19 +1437,15 @@ protected <T> T doFindAndModify(String collectionName, DBObject query, DBObject
 
 		MongoPersistentEntity<?> entity = mappingContext.getPersistentEntity(entityClass);
 
-		DBObject updateObj = update.getUpdateObject();
-		for (String key : updateObj.keySet()) {
-			updateObj.put(key, mongoConverter.convertToMongoType(updateObj.get(key)));
-		}
-
+		DBObject mappedUpdate = mapper.getMappedObject(update.getUpdateObject(), entity);
 		DBObject mappedQuery = mapper.getMappedObject(query, entity);
 
 		if (LOGGER.isDebugEnabled()) {
 			LOGGER.debug("findAndModify using query: " + mappedQuery + " fields: " + fields + " sort: " + sort
-					+ " for class: " + entityClass + " and update: " + updateObj + " in collection: " + collectionName);
+					+ " for class: " + entityClass + " and update: " + mappedUpdate + " in collection: " + collectionName);
 		}
 
-		return executeFindOneInternal(new FindAndModifyCallback(mappedQuery, fields, sort, updateObj, options),
+		return executeFindOneInternal(new FindAndModifyCallback(mappedQuery, fields, sort, mappedUpdate, options),
 				new ReadDbObjectCallback<T>(readerToUse, entityClass), collectionName);
 	}
 

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/query/Update.java

@@ -217,22 +217,23 @@ public DBObject getUpdateObject() {
 		return dbo;
 	}
 
-	@SuppressWarnings("unchecked")
 	protected void addMultiFieldOperation(String operator, String key, Object value) {
+
 		Object existingValue = this.modifierOps.get(operator);
-		LinkedHashMap<String, Object> keyValueMap;
+		DBObject keyValueMap;
+
 		if (existingValue == null) {
-			keyValueMap = new LinkedHashMap<String, Object>();
+			keyValueMap = new BasicDBObject();
 			this.modifierOps.put(operator, keyValueMap);
 		} else {
-			if (existingValue instanceof LinkedHashMap) {
-				keyValueMap = (LinkedHashMap<String, Object>) existingValue;
+			if (existingValue instanceof BasicDBObject) {
+				keyValueMap = (BasicDBObject) existingValue;
 			} else {
 				throw new InvalidDataAccessApiUsageException("Modifier Operations should be a LinkedHashMap but was "
 						+ existingValue.getClass());
 			}
 		}
+
 		keyValueMap.put(key, value);
 	}
-
 }

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

@@ -61,6 +61,7 @@
 import org.springframework.data.mongodb.core.index.Index.Duplicates;
 import org.springframework.data.mongodb.core.index.IndexField;
 import org.springframework.data.mongodb.core.index.IndexInfo;
+import org.springframework.data.mongodb.core.mapping.Field;
 import org.springframework.data.mongodb.core.mapping.MongoMappingContext;
 import org.springframework.data.mongodb.core.query.BasicQuery;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -92,15 +93,12 @@
 @ContextConfiguration("classpath:infrastructure.xml")
 public class MongoTemplateTests {
 
-	@Autowired
-	MongoTemplate template;
-	@Autowired
-	MongoDbFactory factory;
+	@Autowired MongoTemplate template;
+	@Autowired MongoDbFactory factory;
 
 	MongoTemplate mappingTemplate;
 
-	@Rule
-	public ExpectedException thrown = ExpectedException.none();
+	@Rule public ExpectedException thrown = ExpectedException.none();
 
 	@Autowired
 	@SuppressWarnings("unchecked")
@@ -150,6 +148,7 @@ protected void cleanDb() {
 		template.dropCollection(TestClass.class);
 		template.dropCollection(Sample.class);
 		template.dropCollection(MyPerson.class);
+		template.dropCollection(TypeWithFieldAnnotation.class);
 		template.dropCollection("collection");
 		template.dropCollection("personX");
 	}
@@ -772,8 +771,7 @@ public void testUsingInQueryWithList() throws Exception {
 			Query q3 = new Query(Criteria.where("age").in(l1, l2));
 			template.find(q3, PersonWithIdPropertyOfTypeObjectId.class);
 			Assert.fail("Should have trown an InvalidDocumentStoreApiUsageException");
-		} catch (InvalidMongoDbApiUsageException e) {
-		}
+		} catch (InvalidMongoDbApiUsageException e) {}
 	}
 
 	@Test
@@ -1625,6 +1623,25 @@ public void executesExistsCorrectly() {
 		assertThat(template.exists(query, Sample.class, template.getCollectionName(Sample.class)), is(true));
 	}
 
+	/**
+	 * @see DATAMONGO-675
+	 */
+	@Test
+	public void updateConsidersMappingAnnotations() {
+
+		TypeWithFieldAnnotation entity = new TypeWithFieldAnnotation();
+		entity.emailAddress = "old";
+
+		template.save(entity);
+
+		Query query = query(where("_id").is(entity.id));
+		Update update = Update.update("emailAddress", "new");
+
+		FindAndModifyOptions options = new FindAndModifyOptions().returnNew(true);
+		TypeWithFieldAnnotation result = template.findAndModify(query, update, options, TypeWithFieldAnnotation.class);
+		assertThat(result.emailAddress, is("new"));
+	}
+
 	static class MyId {
 
 		String first;
@@ -1633,14 +1650,12 @@ static class MyId {
 
 	static class TypeWithMyId {
 
-		@Id
-		MyId id;
+		@Id MyId id;
 	}
 
 	public static class Sample {
 
-		@Id
-		String id;
+		@Id String id;
 		String field;
 	}
 
@@ -1697,8 +1712,13 @@ static class Address {
 
 	static class VersionedPerson {
 
-		@Version
-		Long version;
+		@Version Long version;
 		String id, firstname, lastname;
 	}
+
+	static class TypeWithFieldAnnotation {
+
+		@Id ObjectId id;
+		@Field("email") String emailAddress;
+	}
 }