Skip to content

Commit 8b0ecf1

Browse files
mp911demp911de
committed
DATAMONGO-2651 - Polishing.
Update since tag. Reduce test class/method visibility, update license headers. Original pull request: #898.
1 parent 19e6278 commit 8b0ecf1

File tree

2 files changed

+41
-38
lines changed

2 files changed

+41
-38
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2020 the original author or authors.
2+
* Copyright 2013-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -381,7 +381,7 @@ public GroupOperationBuilder stdDevPop(AggregationExpression expr) {
381381
*
382382
* @param accumulator must not be {@literal null}.
383383
* @return never {@literal null}.
384-
* @since 1.10
384+
* @since 3.2
385385
*/
386386
public GroupOperationBuilder accumulate(Accumulator accumulator) {
387387
return new GroupOperationBuilder(this, new Operation(accumulator));
@@ -444,7 +444,7 @@ public Document toDocument(AggregationOperationContext context) {
444444
return new Document(getOperator(), operationObject);
445445
}
446446

447-
/*
447+
/*
448448
* (non-Javadoc)
449449
* @see org.springframework.data.mongodb.core.aggregation.AggregationOperation#getOperator()
450450
*/

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

+38-35
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2013-2020 the original author or authors.
2+
* Copyright 2013-2021 the original author or authors.
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
2020
import static org.springframework.data.mongodb.core.aggregation.Fields.*;
2121

2222
import java.util.Arrays;
23+
import java.util.Collections;
2324

2425
import org.bson.Document;
2526
import org.junit.jupiter.api.Test;
@@ -33,15 +34,15 @@
3334
* @author Thomas Darimont
3435
* @author Gustavo de Geus
3536
*/
36-
public class GroupOperationUnitTests {
37+
class GroupOperationUnitTests {
3738

3839
@Test
39-
public void rejectsNullFields() {
40+
void rejectsNullFields() {
4041
assertThatIllegalArgumentException().isThrownBy(() -> new GroupOperation((Fields) null));
4142
}
4243

4344
@Test // DATAMONGO-759
44-
public void groupOperationWithNoGroupIdFieldsShouldGenerateNullAsGroupId() {
45+
void groupOperationWithNoGroupIdFieldsShouldGenerateNullAsGroupId() {
4546

4647
GroupOperation operation = new GroupOperation(Fields.from());
4748
ExposedFields fields = operation.getFields();
@@ -53,7 +54,7 @@ public void groupOperationWithNoGroupIdFieldsShouldGenerateNullAsGroupId() {
5354
}
5455

5556
@Test // DATAMONGO-759
56-
public void groupOperationWithNoGroupIdFieldsButAdditionalFieldsShouldGenerateNullAsGroupId() {
57+
void groupOperationWithNoGroupIdFieldsButAdditionalFieldsShouldGenerateNullAsGroupId() {
5758

5859
GroupOperation operation = new GroupOperation(Fields.from()).count().as("cnt").last("foo").as("foo");
5960
ExposedFields fields = operation.getFields();
@@ -67,121 +68,121 @@ public void groupOperationWithNoGroupIdFieldsButAdditionalFieldsShouldGenerateNu
6768
}
6869

6970
@Test
70-
public void createsGroupOperationWithSingleField() {
71+
void createsGroupOperationWithSingleField() {
7172

7273
GroupOperation operation = new GroupOperation(fields("a"));
7374

7475
Document groupClause = extractDocumentFromGroupOperation(operation);
7576

76-
assertThat(groupClause.get(UNDERSCORE_ID)).isEqualTo((Object) "$a");
77+
assertThat(groupClause).containsEntry(UNDERSCORE_ID, "$a");
7778
}
7879

7980
@Test
80-
public void createsGroupOperationWithMultipleFields() {
81+
void createsGroupOperationWithMultipleFields() {
8182

8283
GroupOperation operation = new GroupOperation(fields("a").and("b", "c"));
8384

8485
Document groupClause = extractDocumentFromGroupOperation(operation);
8586
Document idClause = DocumentTestUtils.getAsDocument(groupClause, UNDERSCORE_ID);
8687

87-
assertThat(idClause.get("a")).isEqualTo((Object) "$a");
88-
assertThat(idClause.get("b")).isEqualTo((Object) "$c");
88+
assertThat(idClause).containsEntry("a", "$a")
89+
.containsEntry("b", "$c");
8990
}
9091

9192
@Test
92-
public void groupFactoryMethodWithMultipleFieldsAndSumOperation() {
93+
void groupFactoryMethodWithMultipleFieldsAndSumOperation() {
9394

9495
GroupOperation groupOperation = Aggregation.group(fields("a", "b").and("c")) //
9596
.sum("e").as("e");
9697

9798
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
9899
Document eOp = DocumentTestUtils.getAsDocument(groupClause, "e");
99-
assertThat(eOp).isEqualTo((Document) new Document("$sum", "$e"));
100+
assertThat(eOp).isEqualTo(new Document("$sum", "$e"));
100101
}
101102

102103
@Test
103-
public void groupFactoryMethodWithMultipleFieldsAndSumOperationWithAlias() {
104+
void groupFactoryMethodWithMultipleFieldsAndSumOperationWithAlias() {
104105

105106
GroupOperation groupOperation = Aggregation.group(fields("a", "b").and("c")) //
106107
.sum("e").as("ee");
107108

108109
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
109110
Document eOp = DocumentTestUtils.getAsDocument(groupClause, "ee");
110-
assertThat(eOp).isEqualTo((Document) new Document("$sum", "$e"));
111+
assertThat(eOp).isEqualTo(new Document("$sum", "$e"));
111112
}
112113

113114
@Test
114-
public void groupFactoryMethodWithMultipleFieldsAndCountOperationWithout() {
115+
void groupFactoryMethodWithMultipleFieldsAndCountOperationWithout() {
115116

116117
GroupOperation groupOperation = Aggregation.group(fields("a", "b").and("c")) //
117118
.count().as("count");
118119

119120
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
120121
Document eOp = DocumentTestUtils.getAsDocument(groupClause, "count");
121-
assertThat(eOp).isEqualTo((Document) new Document("$sum", 1));
122+
assertThat(eOp).isEqualTo(new Document("$sum", 1));
122123
}
123124

124125
@Test
125-
public void groupFactoryMethodWithMultipleFieldsAndMultipleAggregateOperationsWithAlias() {
126+
void groupFactoryMethodWithMultipleFieldsAndMultipleAggregateOperationsWithAlias() {
126127

127128
GroupOperation groupOperation = Aggregation.group(fields("a", "b").and("c")) //
128129
.sum("e").as("sum") //
129130
.min("e").as("min"); //
130131

131132
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
132133
Document sum = DocumentTestUtils.getAsDocument(groupClause, "sum");
133-
assertThat(sum).isEqualTo((Document) new Document("$sum", "$e"));
134+
assertThat(sum).isEqualTo(new Document("$sum", "$e"));
134135

135136
Document min = DocumentTestUtils.getAsDocument(groupClause, "min");
136-
assertThat(min).isEqualTo((Document) new Document("$min", "$e"));
137+
assertThat(min).isEqualTo(new Document("$min", "$e"));
137138
}
138139

139140
@Test
140-
public void groupOperationPushWithValue() {
141+
void groupOperationPushWithValue() {
141142

142143
GroupOperation groupOperation = Aggregation.group("a", "b").push(1).as("x");
143144

144145
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
145146
Document push = DocumentTestUtils.getAsDocument(groupClause, "x");
146147

147-
assertThat(push).isEqualTo((Document) new Document("$push", 1));
148+
assertThat(push).isEqualTo(new Document("$push", 1));
148149
}
149150

150151
@Test
151-
public void groupOperationPushWithReference() {
152+
void groupOperationPushWithReference() {
152153

153154
GroupOperation groupOperation = Aggregation.group("a", "b").push("ref").as("x");
154155

155156
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
156157
Document push = DocumentTestUtils.getAsDocument(groupClause, "x");
157158

158-
assertThat(push).isEqualTo((Document) new Document("$push", "$ref"));
159+
assertThat(push).isEqualTo(new Document("$push", "$ref"));
159160
}
160161

161162
@Test
162-
public void groupOperationAddToSetWithReference() {
163+
void groupOperationAddToSetWithReference() {
163164

164165
GroupOperation groupOperation = Aggregation.group("a", "b").addToSet("ref").as("x");
165166

166167
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
167168
Document push = DocumentTestUtils.getAsDocument(groupClause, "x");
168169

169-
assertThat(push).isEqualTo((Document) new Document("$addToSet", "$ref"));
170+
assertThat(push).isEqualTo(new Document("$addToSet", "$ref"));
170171
}
171172

172173
@Test
173-
public void groupOperationAddToSetWithValue() {
174+
void groupOperationAddToSetWithValue() {
174175

175176
GroupOperation groupOperation = Aggregation.group("a", "b").addToSet(42).as("x");
176177

177178
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
178179
Document push = DocumentTestUtils.getAsDocument(groupClause, "x");
179180

180-
assertThat(push).isEqualTo((Document) new Document("$addToSet", 42));
181+
assertThat(push).isEqualTo(new Document("$addToSet", 42));
181182
}
182183

183184
@Test // DATAMONGO-979
184-
public void shouldRenderSizeExpressionInGroup() {
185+
void shouldRenderSizeExpressionInGroup() {
185186

186187
GroupOperation groupOperation = Aggregation //
187188
.group("username") //
@@ -191,11 +192,13 @@ public void shouldRenderSizeExpressionInGroup() {
191192
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
192193
Document tagsCount = DocumentTestUtils.getAsDocument(groupClause, "tags_count");
193194

194-
assertThat(tagsCount.get("$first")).isEqualTo((Object) new Document("$size", Arrays.asList("$tags")));
195+
assertThat(tagsCount)
196+
.containsEntry("$first", new Document("$size", Collections
197+
.singletonList("$tags")));
195198
}
196199

197200
@Test // DATAMONGO-1327
198-
public void groupOperationStdDevSampWithValue() {
201+
void groupOperationStdDevSampWithValue() {
199202

200203
GroupOperation groupOperation = Aggregation.group("a", "b").stdDevSamp("field").as("fieldStdDevSamp");
201204

@@ -206,7 +209,7 @@ public void groupOperationStdDevSampWithValue() {
206209
}
207210

208211
@Test // DATAMONGO-1327
209-
public void groupOperationStdDevPopWithValue() {
212+
void groupOperationStdDevPopWithValue() {
210213

211214
GroupOperation groupOperation = Aggregation.group("a", "b").stdDevPop("field").as("fieldStdDevPop");
212215

@@ -217,7 +220,7 @@ public void groupOperationStdDevPopWithValue() {
217220
}
218221

219222
@Test // DATAMONGO-1784
220-
public void shouldRenderSumWithExpressionInGroup() {
223+
void shouldRenderSumWithExpressionInGroup() {
221224

222225
GroupOperation groupOperation = Aggregation //
223226
.group("username") //
@@ -230,12 +233,12 @@ public void shouldRenderSumWithExpressionInGroup() {
230233
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
231234
Document foobar = DocumentTestUtils.getAsDocument(groupClause, "foobar");
232235

233-
assertThat(foobar.get("$sum")).isEqualTo(new Document("$cond",
236+
assertThat(foobar).containsEntry("$sum", new Document("$cond",
234237
new Document("if", new Document("$eq", Arrays.asList("$foo", "bar"))).append("then", 1).append("else", -1)));
235238
}
236239

237240
@Test // DATAMONGO-1784
238-
public void sumWithNullExpressionShouldThrowException() {
241+
void sumWithNullExpressionShouldThrowException() {
239242
assertThatIllegalArgumentException()
240243
.isThrownBy(() -> Aggregation.group("username").sum((AggregationExpression) null));
241244
}
@@ -251,7 +254,7 @@ void accumulatorShouldBeAllowedOnGroupOperation() {
251254
Document groupClause = extractDocumentFromGroupOperation(groupOperation);
252255
Document accumulatedValue = DocumentTestUtils.getAsDocument(groupClause, "accumulated-value");
253256

254-
assertThat(accumulatedValue.get("$accumulator")).isNotNull();
257+
assertThat(accumulatedValue).containsKey("$accumulator");
255258
}
256259

257260
private Document extractDocumentFromGroupOperation(GroupOperation groupOperation) {

0 commit comments

Comments
 (0)