Skip to content

Commit a429ff8

Browse files
mp911demp911de
committed
Polishing.
Reformat code. Suppress warnings in tests. Original pull request: #4541 See #4495
1 parent 8b438b4 commit a429ff8

File tree

4 files changed

+23
-24
lines changed

4 files changed

+23
-24
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1906,8 +1906,8 @@ public <T> Flux<ChangeStreamEvent<T>> changeStream(@Nullable String database, @N
19061906
publisher = options.getCollation().map(Collation::toMongoCollation).map(publisher::collation)
19071907
.orElse(publisher);
19081908
publisher = options.getResumeBsonTimestamp().map(publisher::startAtOperationTime).orElse(publisher);
1909-
1910-
if(options.getFullDocumentBeforeChangeLookup().isPresent()) {
1909+
1910+
if (options.getFullDocumentBeforeChangeLookup().isPresent()) {
19111911
publisher = publisher.fullDocumentBeforeChange(options.getFullDocumentBeforeChangeLookup().get());
19121912
}
19131913
return publisher.fullDocument(options.getFullDocumentLookup().orElse(fullDocument));
@@ -2495,7 +2495,7 @@ private WriteConcern potentiallyForceAcknowledgedWrite(@Nullable WriteConcern wc
24952495

24962496
if (ObjectUtils.nullSafeEquals(WriteResultChecking.EXCEPTION, writeResultChecking)) {
24972497
if (wc == null || wc.getWObject() == null
2498-
|| (wc.getWObject() instanceof Number && ((Number) wc.getWObject()).intValue() < 1)) {
2498+
|| (wc.getWObject()instanceof Number && ((Number) wc.getWObject()).intValue() < 1)) {
24992499
return WriteConcern.ACKNOWLEDGED;
25002500
}
25012501
}

‎spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTask.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ protected MongoCursor<ChangeStreamDocument<Document>> initCursor(MongoTemplate t
9191
BsonTimestamp startAt = null;
9292
boolean resumeAfter = true;
9393

94-
if (options instanceof ChangeStreamRequest.ChangeStreamRequestOptions) {
94+
if (options instanceof ChangeStreamRequest.ChangeStreamRequestOptions requestOptions) {
9595

96-
ChangeStreamOptions changeStreamOptions = ((ChangeStreamRequestOptions) options).getChangeStreamOptions();
96+
ChangeStreamOptions changeStreamOptions = requestOptions.getChangeStreamOptions();
9797
filter = prepareFilter(template, changeStreamOptions);
9898

9999
if (changeStreamOptions.getFilter().isPresent()) {
@@ -115,9 +115,7 @@ protected MongoCursor<ChangeStreamDocument<Document>> initCursor(MongoTemplate t
115115
.orElseGet(() -> ClassUtils.isAssignable(Document.class, targetType) ? FullDocument.DEFAULT
116116
: FullDocument.UPDATE_LOOKUP);
117117

118-
if(changeStreamOptions.getFullDocumentBeforeChangeLookup().isPresent()) {
119-
fullDocumentBeforeChange = changeStreamOptions.getFullDocumentBeforeChangeLookup().get();
120-
}
118+
fullDocumentBeforeChange = changeStreamOptions.getFullDocumentBeforeChangeLookup().orElse(null);
121119

122120
startAt = changeStreamOptions.getResumeBsonTimestamp().orElse(null);
123121
}
@@ -158,7 +156,7 @@ protected MongoCursor<ChangeStreamDocument<Document>> initCursor(MongoTemplate t
158156
}
159157

160158
iterable = iterable.fullDocument(fullDocument);
161-
if(fullDocumentBeforeChange != null) {
159+
if (fullDocumentBeforeChange != null) {
162160
iterable = iterable.fullDocumentBeforeChange(fullDocumentBeforeChange);
163161
}
164162

@@ -181,7 +179,8 @@ List<Document> prepareFilter(MongoTemplate template, ChangeStreamOptions options
181179
template.getConverter().getMappingContext(), queryMapper)
182180
: Aggregation.DEFAULT_CONTEXT;
183181

184-
return agg.toPipeline(new PrefixingDelegatingAggregationOperationContext(context, "fullDocument", denylist));
182+
return agg
183+
.toPipeline(new PrefixingDelegatingAggregationOperationContext(context, "fullDocument", denylist));
185184
}
186185

187186
if (filter instanceof List) {

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

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import lombok.AllArgsConstructor;
2424
import lombok.Data;
2525
import lombok.NoArgsConstructor;
26-
import org.springframework.data.mongodb.util.BsonUtils;
2726
import reactor.core.publisher.Flux;
2827
import reactor.core.publisher.Mono;
2928
import reactor.test.StepVerifier;
@@ -93,14 +92,14 @@
9392
import org.springframework.data.mongodb.core.query.Query;
9493
import org.springframework.data.mongodb.core.query.Update;
9594
import org.springframework.data.mongodb.core.timeseries.Granularity;
95+
import org.springframework.data.mongodb.util.BsonUtils;
9696
import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
9797
import org.springframework.lang.Nullable;
9898
import org.springframework.test.util.ReflectionTestUtils;
9999
import org.springframework.util.CollectionUtils;
100100

101101
import com.mongodb.MongoClientSettings;
102102
import com.mongodb.ReadPreference;
103-
import com.mongodb.WriteConcern;
104103
import com.mongodb.client.model.CountOptions;
105104
import com.mongodb.client.model.CreateCollectionOptions;
106105
import com.mongodb.client.model.DeleteOptions;
@@ -1541,11 +1540,11 @@ void changeStreamOptionFullDocumentBeforeChangeShouldBeApplied() {
15411540
when(changeStreamPublisher.fullDocument(any())).thenReturn(changeStreamPublisher);
15421541
when(changeStreamPublisher.fullDocumentBeforeChange(any())).thenReturn(changeStreamPublisher);
15431542

1544-
template
1545-
.changeStream("database", "collection", ChangeStreamOptions.builder().fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.REQUIRED).build(), Object.class)
1546-
.subscribe();
1543+
ChangeStreamOptions options = ChangeStreamOptions.builder()
1544+
.fullDocumentBeforeChangeLookup(FullDocumentBeforeChange.REQUIRED).build();
1545+
template.changeStream("database", "collection", options, Object.class).subscribe();
15471546

1548-
verify(changeStreamPublisher).fullDocumentBeforeChange(eq(FullDocumentBeforeChange.REQUIRED));
1547+
verify(changeStreamPublisher).fullDocumentBeforeChange(FullDocumentBeforeChange.REQUIRED);
15491548

15501549
}
15511550

‎spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/messaging/ChangeStreamTaskUnitTests.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,18 +41,21 @@
4141
import com.mongodb.client.model.changestream.FullDocumentBeforeChange;
4242

4343
/**
44+
* Unit tests for {@link ChangeStreamTask}.
45+
*
4446
* @author Christoph Strobl
4547
* @author Myroslav Kosinskyi
4648
*/
4749
@ExtendWith(MockitoExtension.class)
50+
@SuppressWarnings({ "unchecked", "rawtypes" })
4851
class ChangeStreamTaskUnitTests {
4952

50-
ChangeStreamTask task;
5153
@Mock MongoTemplate template;
5254
@Mock MongoDatabase mongoDatabase;
5355
@Mock MongoCollection<Document> mongoCollection;
5456
@Mock ChangeStreamIterable<Document> changeStreamIterable;
55-
private MongoConverter converter;
57+
58+
MongoConverter converter;
5659

5760
@BeforeEach
5861
void setUp() {
@@ -64,9 +67,7 @@ void setUp() {
6467
when(template.getDb()).thenReturn(mongoDatabase);
6568

6669
when(mongoDatabase.getCollection(any())).thenReturn(mongoCollection);
67-
6870
when(mongoCollection.watch(eq(Document.class))).thenReturn(changeStreamIterable);
69-
7071
when(changeStreamIterable.fullDocument(any())).thenReturn(changeStreamIterable);
7172
}
7273

@@ -84,7 +85,7 @@ void shouldNotBreakLovelaceBehavior() {
8485

8586
initTask(request, Document.class);
8687

87-
verify(changeStreamIterable).resumeAfter(eq(resumeToken));
88+
verify(changeStreamIterable).resumeAfter(resumeToken);
8889
}
8990

9091
@Test // DATAMONGO-2258
@@ -102,7 +103,7 @@ void shouldApplyResumeAfterToChangeStream() {
102103

103104
initTask(request, Document.class);
104105

105-
verify(changeStreamIterable).resumeAfter(eq(resumeToken));
106+
verify(changeStreamIterable).resumeAfter(resumeToken);
106107
}
107108

108109
@Test // DATAMONGO-2258
@@ -120,7 +121,7 @@ void shouldApplyStartAfterToChangeStream() {
120121

121122
initTask(request, Document.class);
122123

123-
verify(changeStreamIterable).startAfter(eq(resumeToken));
124+
verify(changeStreamIterable).startAfter(resumeToken);
124125
}
125126

126127
@Test // GH-4495
@@ -136,7 +137,7 @@ void shouldApplyFullDocumentBeforeChangeToChangeStream() {
136137

137138
initTask(request, Document.class);
138139

139-
verify(changeStreamIterable).fullDocumentBeforeChange(eq(FullDocumentBeforeChange.REQUIRED));
140+
verify(changeStreamIterable).fullDocumentBeforeChange(FullDocumentBeforeChange.REQUIRED);
140141
}
141142

142143
private MongoCursor<ChangeStreamDocument<Document>> initTask(ChangeStreamRequest request, Class<?> targetType) {

0 commit comments

Comments
 (0)