Spring/spring-data-cassandra
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

DATACASS-462 - Adopt to ReactiveCrudRepository.findById(Publisher) and existsById(Publisher).

Browse Source 
Related ticket: DATACMNS-1063.

Related Pull Request: #106
This commit is contained in:
Mark Paluch
2017-06-09 11:36:15 +02:00
committed by Christoph Strobl
parent d7623f979b
commit 3f5d2589fb
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepository.java
View File

@@ -162,14 +162,14 @@ public class SimpleReactiveCassandraRepository<T, ID> implements ReactiveCassand
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(reactor.core.publisher.Mono)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#findById(org.reactivestreams.Publisher)
*/
@Override
public Mono<T> findById(Mono<ID> mono) {
public Mono<T> findById(Publisher<ID> publisher) {
Assert.notNull(mono, "The given id must not be null");
Assert.notNull(publisher, "The given id must not be null");
return mono.flatMap(id -> operations.selectOneById(id, entityInformation.getJavaType()));
return Mono.from(publisher).flatMap(id -> operations.selectOneById(id, entityInformation.getJavaType()));
}
/* (non-Javadoc)
@@ -184,14 +184,14 @@ public class SimpleReactiveCassandraRepository<T, ID> implements ReactiveCassand
}
/* (non-Javadoc)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(reactor.core.publisher.Mono)
* @see org.springframework.data.repository.reactive.ReactiveCrudRepository#existsById(org.reactivestreams.Publisher)
*/
@Override
public Mono<Boolean> existsById(Mono<ID> mono) {
public Mono<Boolean> existsById(Publisher<ID> publisher) {
Assert.notNull(mono, "The given id must not be null");
Assert.notNull(publisher, "The given id must not be null");
return mono.flatMap(id -> operations.exists(id, entityInformation.getJavaType()));
return Mono.from(publisher).flatMap(id -> operations.exists(id, entityInformation.getJavaType()));
}
/* (non-Javadoc)

17
spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/support/SimpleReactiveCassandraRepositoryIntegrationTests.java
View File

@@ -127,6 +127,15 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
StepVerifier.create(repository.existsById(Mono.just(dave.getId()))).expectNext(true).verifyComplete();
}
@Test // DATACASS-335
public void existsByFluxOfIdShouldReturnTrueForExistingObject() {
insertTestData();
StepVerifier.create(repository.existsById(Flux.just(dave.getId(), oliver.getId()))).expectNext(true)
.verifyComplete();
}
@Test // DATACASS-335
public void existsByEmptyMonoOfIdShouldReturnEmptyMono() {
StepVerifier.create(repository.existsById(Mono.empty())).verifyComplete();
@@ -153,6 +162,14 @@ public class SimpleReactiveCassandraRepositoryIntegrationTests extends AbstractK
StepVerifier.create(repository.findById(Mono.just(dave.getId()))).expectNext(dave).verifyComplete();
}
@Test // DATACASS-462
public void findByIdByFluxOfIdShouldReturnTrueForExistingObject() {
insertTestData();
StepVerifier.create(repository.findById(Flux.just(dave.getId(), oliver.getId()))).expectNext(dave).verifyComplete();
}
@Test // DATACASS-335
public void findByIdByEmptyMonoOfIdShouldReturnEmptyMono() {
StepVerifier.create(repository.findById(Mono.empty())).verifyComplete();