Skip to content

Commit 047eb18

Browse files
committed
DATAMONGO-1843 - Polishing.
Convert anonymous classes to lambdas. Typo fixes. Migrate test to AssertJ. Original pull request: #526.
1 parent d3a54e7 commit 047eb18

File tree

2 files changed

+274
-272
lines changed

2 files changed

+274
-272
lines changed

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

+7-17
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
* Gateway to {@literal array} aggregation operations.
3333
*
3434
* @author Christoph Strobl
35+
* @author Mark Paluch
3536
* @since 1.0
3637
*/
3738
public class ArrayOperators {
@@ -224,15 +225,10 @@ public ReverseArray reverse() {
224225
* @param expression must not be {@literal null}.
225226
* @return
226227
*/
227-
public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(final AggregationExpression expression) {
228-
return new ArrayOperatorFactory.ReduceInitialValueBuilder() {
228+
public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(AggregationExpression expression) {
229229

230-
@Override
231-
public Reduce startingWith(Object initialValue) {
232-
return (usesFieldRef() ? Reduce.arrayOf(fieldReference)
233-
: Reduce.arrayOf(ArrayOperatorFactory.this.expression)).withInitialValue(initialValue).reduce(expression);
234-
}
235-
};
230+
return initialValue -> (usesFieldRef() ? Reduce.arrayOf(fieldReference)
231+
: Reduce.arrayOf(ArrayOperatorFactory.this.expression)).withInitialValue(initialValue).reduce(expression);
236232
}
237233

238234
/**
@@ -242,16 +238,10 @@ public Reduce startingWith(Object initialValue) {
242238
* @param expressions
243239
* @return
244240
*/
245-
public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(final PropertyExpression... expressions) {
246-
247-
return new ArrayOperatorFactory.ReduceInitialValueBuilder() {
241+
public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(PropertyExpression... expressions) {
248242

249-
@Override
250-
public Reduce startingWith(Object initialValue) {
251-
return (usesFieldRef() ? Reduce.arrayOf(fieldReference) : Reduce.arrayOf(expression))
252-
.withInitialValue(initialValue).reduce(expressions);
253-
}
254-
};
243+
return initialValue -> (usesFieldRef() ? Reduce.arrayOf(fieldReference) : Reduce.arrayOf(expression))
244+
.withInitialValue(initialValue).reduce(expressions);
255245
}
256246

257247
/**

0 commit comments

Comments
 (0)