DATAMONGO-1245 - Align MongoRepsoitory QBE with DATAJPA-218.

Author: christophstrobl

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2014 the original author or authors.
+ * Copyright 2010-2016 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -76,17 +76,32 @@ public interface MongoRepository<T, ID extends Serializable> extends PagingAndSo
 	<S extends T> List<S> insert(Iterable<S> entities);
 
 	/**
-	 * @param example
+	 * Returns all instances of the type specified by the given {@link Example}.
+	 * 
+	 * @param example must not be {@literal null}.
 	 * @return
 	 * @since 1.8
 	 */
 	<S extends T> List<T> findAllByExample(Example<S> example);
 
 	/**
-	 * @param example
-	 * @param pageable
-	 * @return
+	 * Returns all instances of the type specified by the given {@link Example}.
+	 * 
+	 * @param example must not be {@literal null}.
+	 * @param sort can be {@literal null}.
+	 * @return all entities sorted by the given options
+	 * @since 1.8
+	 */
+	<S extends T> List<T> findAllByExample(Example<S> example, Sort sort);
+
+	/**
+	 * Returns a {@link Page} of entities meeting the paging restriction specified by the given {@link Example} limited to
+	 * criteria provided in the {@code Pageable} object.
+	 * 
+	 * @param example must not be {@literal null}.
+	 * @param pageable can be {@literal null}.
+	 * @return a {@link Page} of entities
 	 * @since 1.8
 	 */
-	<S extends T> Page<T> findByExample(Example<S> example, Pageable pageable);
+	<S extends T> Page<T> findAllByExample(Example<S> example, Pageable pageable);
 }

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/repository/support/SimpleMongoRepository.java

@@ -262,10 +262,10 @@ public <S extends T> List<S> insert(Iterable<S> entities) {
 
 	/*
 	 * (non-Javadoc)
-	 * @see org.springframework.data.mongodb.repository.MongoRepository#findByExample(org.springframework.data.domain.Example, org.springframework.data.domain.Pageable)
+	 * @see org.springframework.data.mongodb.repository.MongoRepository#findAllByExample(org.springframework.data.domain.Example, org.springframework.data.domain.Pageable)
 	 */
 	@Override
-	public <S extends T> Page<T> findByExample(Example<S> example, Pageable pageable) {
+	public <S extends T> Page<T> findAllByExample(Example<S> example, Pageable pageable) {
 
 		Assert.notNull(example, "Sample must not be null!");
 
@@ -279,6 +279,24 @@ public <S extends T> Page<T> findByExample(Example<S> example, Pageable pageable
 				entityInformation.getCollectionName()), pageable, count);
 	}
 
+	/*
+	 * (non-Javadoc)
+	 * @see org.springframework.data.mongodb.repository.MongoRepository#findAllByExample(org.springframework.data.domain.Example, org.springframework.data.domain.Sort)
+	 */
+	@Override
+	public <S extends T> List<T> findAllByExample(Example<S> example, Sort sort) {
+
+		Assert.notNull(example, "Sample must not be null!");
+
+		Query q = new Query(new Criteria().alike(example));
+
+		if (sort != null) {
+			q.with(sort);
+		}
+
+		return findAll(q);
+	}
+
 	/*
 	 * (non-Javadoc)
 	 * @see org.springframework.data.mongodb.repository.MongoRepository#findAllByExample(org.springframework.data.domain.Example)

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

@@ -1240,7 +1240,7 @@ public void findByExampleShouldResolveStuffCorrectly() {
 		ReflectionTestUtils.setField(sample, "createdAt", null);
 		ReflectionTestUtils.setField(sample, "email", null);
 
-		Page<Person> result = repository.findByExample(new Example<Person>(sample), new PageRequest(0, 10));
+		Page<Person> result = repository.findAllByExample(new Example<Person>(sample), new PageRequest(0, 10));
 		Assert.assertThat(result.getNumberOfElements(), Is.is(2));
 	}
 

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

@@ -180,7 +180,7 @@ public void findByExampleShouldLookUpEntriesCorrectly() {
 		sample.setLastname("Matthews");
 		trimDomainType(sample, "id", "createdAt", "email");
 
-		Page<Person> result = repository.findByExample(new Example<Person>(sample), new PageRequest(0, 10));
+		Page<Person> result = repository.findAllByExample(new Example<Person>(sample), new PageRequest(0, 10));
 
 		assertThat(result.getContent(), hasItems(dave, oliver));
 		assertThat(result.getContent(), hasSize(2));