mindol1004/spring-data-mongodb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DATAMONGO-1774 - Fix infinite loop in ReactiveMongoOperations#remove(Mono, String).

Browse Source 
Original pull request: #498.
This commit is contained in:
Christoph Strobl
2017-09-05 10:07:16 +02:00
committed by Mark Paluch
parent 7cf69c5b1a
commit d3d6242a16
2 changed files with 47 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
View File

@@ -1446,7 +1446,7 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
*/
@Override
public Mono<DeleteResult> remove(Mono<? extends Object> objectToRemove, String collection) {
return objectToRemove.flatMap(o -> remove(objectToRemove, collection));
return objectToRemove.flatMap(it -> remove(it, collection));
}
/*

46
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateTests.java
View File

@@ -461,6 +461,52 @@ public class ReactiveMongoTemplateTests {
StepVerifier.create(template.findOne(new Query(), Sample.class)).expectNext(data).verifyComplete();
}
@Test // DATAMONGO-1774
public void removeWithEmptyMonoShouldDoNothing() {
Sample spring = new Sample("100", "spring");
Sample data = new Sample("200", "data");
Sample mongodb = new Sample("300", "mongodb");
StepVerifier.create(template.insert(Arrays.asList(spring, data, mongodb), Sample.class)) //
.expectNextCount(3) //
.verifyComplete();
StepVerifier.create(template.remove(Mono.empty())).verifyComplete();
StepVerifier.create(template.count(new Query(), Sample.class)).expectNext(3L).verifyComplete();
}
@Test // DATAMONGO-1774
public void removeWithMonoShouldDeleteElement() {
Sample spring = new Sample("100", "spring");
Sample data = new Sample("200", "data");
Sample mongodb = new Sample("300", "mongodb");
StepVerifier.create(template.insert(Arrays.asList(spring, data, mongodb), Sample.class)) //
.expectNextCount(3) //
.verifyComplete();
StepVerifier.create(template.remove(Mono.just(spring))).expectNextCount(1).verifyComplete();
StepVerifier.create(template.count(new Query(), Sample.class)).expectNext(2L).verifyComplete();
}
@Test // DATAMONGO-1774
public void removeWithMonoAndCollectionShouldDeleteElement() {
Sample spring = new Sample("100", "spring");
Sample data = new Sample("200", "data");
Sample mongodb = new Sample("300", "mongodb");
StepVerifier.create(template.insert(Arrays.asList(spring, data, mongodb), Sample.class)) //
.expectNextCount(3) //
.verifyComplete();
StepVerifier.create(template.remove(Mono.just(spring), template.determineCollectionName(Sample.class)))
.expectNextCount(1).verifyComplete();
StepVerifier.create(template.count(new Query(), Sample.class)).expectNext(2L).verifyComplete();
}
@Test // DATAMONGO-1444
public void optimisticLockingHandling() {