Skip to content

Commit c8a791d

Browse files
committed
Polishing.
Make fields final where possible. Update javadoc. Simplify assertions. Update reference docs. See: #3715, See #3717, See #3727 Original pull request: #3741.
1 parent 510028a commit c8a791d

File tree

6 files changed

+291
-283
lines changed

6 files changed

+291
-283
lines changed

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/DocumentOperators.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ public static DocumentNumber documentNumber() {
8282
*/
8383
public static class DocumentOperatorsFactory {
8484

85-
private Object target;
85+
private final Object target;
8686

8787
public DocumentOperatorsFactory(Object target) {
8888
this.target = target;

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/aggregation/SpelExpressionTransformer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ public Object transform(String expression, AggregationOperationContext context,
102102
ExpressionState state = new ExpressionState(new StandardEvaluationContext(params), CONFIG);
103103
ExpressionNode node = ExpressionNode.from(spelExpression.getAST(), state);
104104

105-
return transform(new AggregationExpressionTransformationContext<ExpressionNode>(node, null, null, context));
105+
return transform(new AggregationExpressionTransformationContext<>(node, null, null, context));
106106
}
107107

108108
/*

spring-data-mongodb/src/main/java/org/springframework/data/mongodb/core/spel/ExpressionTransformer.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
package org.springframework.data.mongodb.core.spel;
1717

1818
/**
19-
* SPI interface to implement components that can transfrom an {@link ExpressionTransformationContextSupport} into an
19+
* SPI interface to implement components that can transform an {@link ExpressionTransformationContextSupport} into an
2020
* object.
2121
*
2222
* @author Oliver Gierke

spring-data-mongodb/src/test/java/org/springframework/data/mongodb/core/aggregation/DocumentOperatorsUnitTests.java

+8-7
Original file line numberDiff line numberDiff line change
@@ -15,45 +15,46 @@
1515
*/
1616
package org.springframework.data.mongodb.core.aggregation;
1717

18-
import static org.assertj.core.api.Assertions.*;
1918
import static org.springframework.data.mongodb.core.aggregation.DocumentOperators.*;
19+
import static org.springframework.data.mongodb.test.util.Assertions.*;
2020

21-
import org.bson.Document;
2221
import org.junit.jupiter.api.Test;
2322

2423
/**
24+
* Unit tests for {@link DocumentOperators}.
25+
*
2526
* @author Christoph Strobl
2627
*/
2728
class DocumentOperatorsUnitTests {
2829

2930
@Test // GH-3715
3031
void rendersRank() {
31-
assertThat(rank().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo(new Document("$rank", new Document()));
32+
assertThat(rank().toDocument(Aggregation.DEFAULT_CONTEXT)).isEqualTo("{ $rank: { } }");
3233
}
3334

3435
@Test // GH-3715
3536
void rendersDenseRank() {
3637
assertThat(denseRank().toDocument(Aggregation.DEFAULT_CONTEXT))
37-
.isEqualTo(new Document("$denseRank", new Document()));
38+
.isEqualTo("{ $denseRank: { } }");
3839
}
3940

4041
@Test // GH-3717
4142
void rendersDocumentNumber() {
4243
assertThat(documentNumber().toDocument(Aggregation.DEFAULT_CONTEXT))
43-
.isEqualTo(new Document("$documentNumber", new Document()));
44+
.isEqualTo("{ $documentNumber: { } }");
4445
}
4546

4647
@Test // GH-3727
4748
void rendersShift() {
4849

4950
assertThat(valueOf("quantity").shift(1).toDocument(Aggregation.DEFAULT_CONTEXT))
50-
.isEqualTo(Document.parse("{ $shift: { output: \"$quantity\", by: 1 } }"));
51+
.isEqualTo("{ $shift: { output: \"$quantity\", by: 1 } }");
5152
}
5253

5354
@Test // GH-3727
5455
void rendersShiftWithDefault() {
5556

5657
assertThat(valueOf("quantity").shift(1).defaultTo("Not available").toDocument(Aggregation.DEFAULT_CONTEXT))
57-
.isEqualTo(Document.parse("{ $shift: { output: \"$quantity\", by: 1, default: \"Not available\" } }"));
58+
.isEqualTo("{ $shift: { output: \"$quantity\", by: 1, default: \"Not available\" } }");
5859
}
5960
}

0 commit comments

Comments
 (0)