DATAMONGO-1619 - Use ReactiveQueryByExampleExecutor in ReactiveMongoRepository.

Related ticket: DATACMNS-995.

Author: mp911de

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

@@ -15,16 +15,15 @@
  */
 package org.springframework.data.mongodb.repository;
 
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+
 import java.io.Serializable;
 
 import org.reactivestreams.Publisher;
-import org.springframework.data.domain.Example;
-import org.springframework.data.domain.Sort;
 import org.springframework.data.repository.NoRepositoryBean;
-
+import org.springframework.data.repository.query.ReactiveQueryByExampleExecutor;
 import org.springframework.data.repository.reactive.ReactiveSortingRepository;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
 
 /**
  * Mongo specific {@link org.springframework.data.repository.Repository} interface with reactive support.
@@ -33,7 +32,8 @@
  * @since 2.0
  */
 @NoRepositoryBean
-public interface ReactiveMongoRepository<T, ID extends Serializable> extends ReactiveSortingRepository<T, ID> {
+public interface ReactiveMongoRepository<T, ID extends Serializable>
+		extends ReactiveSortingRepository<T, ID>, ReactiveQueryByExampleExecutor<T> {
 
 	/**
 	 * Inserts the given entity. Assumes the instance to be new to be able to apply insertion optimizations. Use
@@ -65,14 +65,4 @@ public interface ReactiveMongoRepository<T, ID extends Serializable> extends Rea
 	 */
 	<S extends T> Flux<S> insert(Publisher<S> entities);
 
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example)
-	 */
-	<S extends T> Flux<S> findAll(Example<S> example);
-
-	/* (non-Javadoc)
-	 * @see org.springframework.data.repository.query.QueryByExampleExecutor#findAll(org.springframework.data.domain.Example, org.springframework.data.domain.Sort)
-	 */
-	<S extends T> Flux<S> findAll(Example<S> example, Sort sort);
-
 }

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

@@ -18,10 +18,16 @@
 
 import static org.hamcrest.Matchers.*;
 import static org.junit.Assert.*;
+import static org.springframework.data.domain.ExampleMatcher.*;
+
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import reactor.core.publisher.Flux;
+import reactor.core.publisher.Mono;
+import reactor.test.TestSubscriber;
 
 import java.util.Arrays;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import org.junit.Before;
 import org.junit.Test;
@@ -32,8 +38,7 @@
 import org.springframework.beans.factory.BeanFactoryAware;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.annotation.Id;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Example;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
 import org.springframework.data.domain.Sort.Order;
@@ -45,12 +50,6 @@
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 import org.springframework.util.ClassUtils;
 
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import reactor.core.publisher.Flux;
-import reactor.core.publisher.Mono;
-import reactor.test.TestSubscriber;
-
 /**
  * Test for {@link ReactiveMongoRepository}.
  *
@@ -422,7 +421,6 @@ public void deleteIterableOfEntitiesShouldRemoveEntities() {
 		List<ReactivePerson> matthews = repository.findByLastname("Matthews").collectList().block();
 		assertThat(matthews, hasSize(1));
 		assertThat(matthews, contains(oliver));
-
 	}
 
 	@Test // DATAMONGO-1444
@@ -438,7 +436,67 @@ public void deletePublisherOfEntitiesShouldRemoveEntities() {
 		List<ReactivePerson> matthews = repository.findByLastname("Matthews").collectList().block();
 		assertThat(matthews, hasSize(1));
 		assertThat(matthews, contains(oliver));
+	}
+
+	@Test // DATAMONGO-1619
+	public void findOneByExampleShouldReturnObject() {
+
+		Example<ReactivePerson> example = Example.of(dave);
+
+		TestSubscriber<ReactivePerson> testSubscriber = TestSubscriber.subscribe(repository.findOne(example));
+
+		testSubscriber.await().assertComplete().assertValues(dave);
+	}
+
+	@Test // DATAMONGO-1619
+	public void findAllByExampleShouldReturnObjects() {
+
+		Example<ReactivePerson> example = Example.of(dave, matching().withIgnorePaths("id", "age", "firstname"));
+
+		TestSubscriber<ReactivePerson> testSubscriber = TestSubscriber.subscribe(repository.findAll(example));
+
+		testSubscriber.await().assertComplete().assertValueCount(2);
+	}
+
+	@Test // DATAMONGO-1619
+	public void findAllByExampleAndSortShouldReturnObjects() {
+
+		Example<ReactivePerson> example = Example.of(dave, matching().withIgnorePaths("id", "age", "firstname"));
+
+		TestSubscriber<ReactivePerson> testSubscriber = TestSubscriber
+				.subscribe(repository.findAll(example, new Sort("firstname")));
+
+		testSubscriber.await().assertComplete().assertValues(dave, oliver);
+	}
+
+	@Test // DATAMONGO-1619
+	public void countByExampleShouldCountObjects() {
+
+		Example<ReactivePerson> example = Example.of(dave, matching().withIgnorePaths("id", "age", "firstname"));
+
+		TestSubscriber<Long> testSubscriber = TestSubscriber.subscribe(repository.count(example));
+
+		testSubscriber.await().assertComplete().assertValues(2L);
+	}
+
+	@Test // DATAMONGO-1619
+	public void existsByExampleShouldReturnExisting() {
+
+		Example<ReactivePerson> example = Example.of(dave, matching().withIgnorePaths("id", "age", "firstname"));
+
+		TestSubscriber<Boolean> testSubscriber = TestSubscriber.subscribe(repository.exists(example));
+
+		testSubscriber.await().assertComplete().assertValues(true);
+	}
+
+	@Test // DATAMONGO-1619
+	public void existsByExampleShouldReturnNonExisting() {
+
+		Example<ReactivePerson> example = Example.of(new ReactivePerson("foo", "bar", -1));
+
+		TestSubscriber<Boolean> testSubscriber = TestSubscriber.subscribe(repository.exists(example));
 
+		testSubscriber.await().assertComplete().assertValues(false);
 	}
 
 	interface ReactivePersonRepostitory extends ReactiveMongoRepository<ReactivePerson, String> {