DATAMONGO-1188 - Add suport for findAndModify in query derivation.

We now also support findAndModify semantic for single entity query executions.

Author: Thomas Darimont

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/query/AbstractMongoQuery.java

@@ -111,6 +111,11 @@ public Object execute(Object[] parameters) {
 		} else if (method.isPageQuery()) {
 			return new PagedExecution(accessor.getPageable()).execute(query);
 		} else {
+
+			if (method.isModifyingQuery()) {
+				return new UpdatingSingleEntityExecution(accessor.getUpdate()).execute(query);
+			}
+
 			return new SingleEntityExecution(isCountQuery()).execute(query);
 		}
 	}
@@ -343,6 +348,31 @@ Object execute(Query query) {
 		}
 	}
 
+	/**
+	 * {@link Execution} to return a single entity with update.
+	 * 
+	 * @author Thomas Darimont
+	 */
+	final class UpdatingSingleEntityExecution extends Execution {
+
+		private final Update update;
+
+		private UpdatingSingleEntityExecution(Update update) {
+			this.update = update;
+		}
+
+		/*
+		 * (non-Javadoc)
+		 * @see org.springframework.data.mongodb.repository.AbstractMongoQuery.Execution#execute(org.springframework.data.mongodb.core.core.query.Query)
+		 */
+		@Override
+		Object execute(Query query) {
+
+			MongoEntityMetadata<?> metadata = method.getEntityInformation();
+			return operations.findAndModify(query.limit(1), update, metadata.getJavaType(), metadata.getCollectionName());
+		}
+	}
+
 	/**
 	 * {@link Execution} to execute geo-near queries.
 	 * 

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/AbstractPersonRepositoryIntegrationTests.java

@@ -1189,7 +1189,7 @@ public void executesGeoNearQueryForResultsCorrectlyWhenGivenMinAndMaxDistance()
 	 * @see DATAMONGO-1188
 	 */
 	@Test
-	public void shouldSupportFindAndModfiyForQueryDerivation() {
+	public void shouldSupportFindAndModfiyForQueryDerivationWithCollectionResult() {
 
 		List<Person> result = repository.findAndModifyByFirstname("Dave", new Update().inc("visits", 42));
 
@@ -1200,4 +1200,20 @@ public void shouldSupportFindAndModfiyForQueryDerivation() {
 
 		assertThat(dave.visits, is(42));
 	}
+
+	/**
+	 * @see DATAMONGO-1188
+	 */
+	@Test
+	public void shouldSupportFindAndModfiyForQueryDerivationWithSingleResult() {
+
+		Person result = repository.findOneAndModifyByFirstname("Dave", new Update().inc("visits", 1337));
+
+		assertThat(result, is(dave));
+
+		Person dave = repository.findOne(result.getId());
+
+		assertThat(dave.visits, is(1337));
+	}
+
 }

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/repository/PersonRepository.java

@@ -336,4 +336,6 @@ public interface PersonRepository extends MongoRepository<Person, String>, Query
 	Stream<Person> findByCustomQueryWithStreamingCursorByFirstnames(List<String> firstnames);
 
 	List<Person> findAndModifyByFirstname(String firstname, Update update);
+
+	Person findOneAndModifyByFirstname(String firstname, Update update);
 }