DATAMONGO-1843 - Polishing.

Convert anonymous classes to lambdas. Typo fixes. Migrate test to AssertJ.

Original pull request: #526.
This commit is contained in:
Mark Paluch
2018-01-23 09:36:23 +01:00
parent d3a54e7fe0
commit 047eb18600
2 changed files with 274 additions and 272 deletions

View File

@@ -32,6 +32,7 @@ import org.springframework.util.Assert;
* Gateway to {@literal array} aggregation operations.
*
* @author Christoph Strobl
* @author Mark Paluch
* @since 1.0
*/
public class ArrayOperators {
@@ -224,15 +225,10 @@ public class ArrayOperators {
* @param expression must not be {@literal null}.
* @return
*/
public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(final AggregationExpression expression) {
return new ArrayOperatorFactory.ReduceInitialValueBuilder() {
public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(AggregationExpression expression) {
@Override
public Reduce startingWith(Object initialValue) {
return (usesFieldRef() ? Reduce.arrayOf(fieldReference)
: Reduce.arrayOf(ArrayOperatorFactory.this.expression)).withInitialValue(initialValue).reduce(expression);
}
};
return initialValue -> (usesFieldRef() ? Reduce.arrayOf(fieldReference)
: Reduce.arrayOf(ArrayOperatorFactory.this.expression)).withInitialValue(initialValue).reduce(expression);
}
/**
@@ -242,16 +238,10 @@ public class ArrayOperators {
* @param expressions
* @return
*/
public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(final PropertyExpression... expressions) {
public ArrayOperatorFactory.ReduceInitialValueBuilder reduce(PropertyExpression... expressions) {
return new ArrayOperatorFactory.ReduceInitialValueBuilder() {
@Override
public Reduce startingWith(Object initialValue) {
return (usesFieldRef() ? Reduce.arrayOf(fieldReference) : Reduce.arrayOf(expression))
.withInitialValue(initialValue).reduce(expressions);
}
};
return initialValue -> (usesFieldRef() ? Reduce.arrayOf(fieldReference) : Reduce.arrayOf(expression))
.withInitialValue(initialValue).reduce(expressions);
}
/**