Browse Source

Polishing.

Reformat code.

See #4167.
Original pull request: #4168.
3.4.x
Mark Paluch 3 years ago
parent
commit
c700e9d0c5
No known key found for this signature in database
GPG Key ID: 4406B84C1661DCD1
  1. 8
      spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java
  2. 5
      spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUnitTests.java

8
spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/ReactiveMongoTemplate.java

@ -2221,10 +2221,12 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati @@ -2221,10 +2221,12 @@ public class ReactiveMongoTemplate implements ReactiveMongoOperations, Applicati
publisher = filter.isEmpty() ? db.watch(Document.class) : db.watch(filter, Document.class);
}
if(options.isResumeAfter()) {
publisher = options.getResumeToken().map(BsonValue::asDocument).map(publisher::resumeAfter).orElse(publisher);
if (options.isResumeAfter()) {
publisher = options.getResumeToken().map(BsonValue::asDocument).map(publisher::resumeAfter)
.orElse(publisher);
} else if (options.isStartAfter()) {
publisher = options.getResumeToken().map(BsonValue::asDocument).map(publisher::startAfter).orElse(publisher);
publisher = options.getResumeToken().map(BsonValue::asDocument).map(publisher::startAfter)
.orElse(publisher);
}
publisher = options.getCollation().map(Collation::toMongoCollation).map(publisher::collation)
.orElse(publisher);

5
spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/ReactiveMongoTemplateUnitTests.java

@ -1500,7 +1500,9 @@ public class ReactiveMongoTemplateUnitTests { @@ -1500,7 +1500,9 @@ public class ReactiveMongoTemplateUnitTests {
when(changeStreamPublisher.fullDocument(any())).thenReturn(changeStreamPublisher);
BsonDocument token = new BsonDocument("token", new BsonString("id"));
template.changeStream("database", "collection", ChangeStreamOptions.builder().startAfter(token).build(), Object.class).subscribe();
template
.changeStream("database", "collection", ChangeStreamOptions.builder().startAfter(token).build(), Object.class)
.subscribe();
verify(changeStreamPublisher).startAfter(eq(token));
}
@ -1530,6 +1532,7 @@ public class ReactiveMongoTemplateUnitTests { @@ -1530,6 +1532,7 @@ public class ReactiveMongoTemplateUnitTests {
AutogenerateableId foo;
}
static class PersonExtended extends Person {
String lastname;

Loading…
Cancel
Save