Fixes

Author: katcharov

driver-core/src/main/com/mongodb/client/model/expressions/ArrayExpression.java

@@ -54,17 +54,17 @@ public interface ArrayExpression<T extends Expression> extends Expression {
 
     IntegerExpression size();
 
-    BooleanExpression any(Function<T, BooleanExpression> mapper);
+    BooleanExpression any(Function<T, BooleanExpression> predicate);
 
-    BooleanExpression all(Function<T, BooleanExpression> mapper);
+    BooleanExpression all(Function<T, BooleanExpression> predicate);
 
     NumberExpression sum(Function<T, NumberExpression> mapper);
 
     NumberExpression multiply(Function<T, NumberExpression> mapper);
 
-    <R extends Expression> R max(Function<T, R> mapper, R orElse);
+    <R extends Expression> R max(R other, Function<? super T, ? extends R> mapper);
 
-    <R extends Expression> R min(Function<T, R> mapper, R orElse);
+    <R extends Expression> R min(R other, Function<? super T, ? extends R> mapper);
 
     <R extends Expression> ArrayExpression<R> maxN(IntegerExpression n, Function<? super T, ? extends R> mapper);
     <R extends Expression> ArrayExpression<R> minN(IntegerExpression n, Function<? super T, ? extends R> mapper);

driver-core/src/main/com/mongodb/client/model/expressions/MqlExpression.java

@@ -411,13 +411,13 @@ private <R extends Expression> R reduceMap(
     }
 
     @Override
-    public BooleanExpression any(final Function<T, BooleanExpression> mapper) {
-        return reduceMap(mapper, of(false), (a, b) -> a.or(b));
+    public BooleanExpression any(final Function<T, BooleanExpression> predicate) {
+        return reduceMap(predicate, of(false), (a, b) -> a.or(b));
     }
 
     @Override
-    public BooleanExpression all(final Function<T, BooleanExpression> mapper) {
-        return reduceMap(mapper, of(true), (a, b) -> a.and(b));
+    public BooleanExpression all(final Function<T, BooleanExpression> predicate) {
+        return reduceMap(predicate, of(true), (a, b) -> a.and(b));
     }
 
     @Override
@@ -432,16 +432,16 @@ public NumberExpression multiply(final Function<T, NumberExpression> mapper) {
     }
 
     @Override
-    public <R extends Expression> R max(final Function<T, R> mapper, final R orElse) {
+    public <R extends Expression> R max(final R other, final Function<? super T, ? extends R> mapper) {
         MqlExpression<R> results = (MqlExpression<R>) this.map(mapper);
-        return this.size().eq(of(0)).cond(orElse, results.maxN(of(1), v -> v).first());
+        return this.size().eq(of(0)).cond(other, results.maxN(of(1), v -> v).first());
     }
 
 
     @Override
-    public <R extends Expression> R min(final Function<T, R> mapper, final R orElse) {
+    public <R extends Expression> R min(final R other, final Function<? super T, ? extends R> mapper) {
         MqlExpression<R> results = (MqlExpression<R>) this.map(mapper);
-        return this.size().eq(of(0)).cond(orElse, results.minN(of(1), v -> v).first());
+        return this.size().eq(of(0)).cond(other, results.minN(of(1), v -> v).first());
     }
 
     @Override

driver-core/src/test/functional/com/mongodb/client/model/expressions/ArrayExpressionsFunctionalTest.java

@@ -198,26 +198,26 @@ public void reduceSumTest() {
     public void reduceMaxTest() {
         assertExpression(
                 3,
-                ofIntegerArray(1, 2, 3).max(a -> a, of(9)),
+                ofIntegerArray(1, 2, 3).max(of(9), a -> a),
                 "{'$cond': [{'$eq': [{'$size': [[1, 2, 3]]}, 0]}, 9, "
                         + "{'$first': [{'$maxN': {'input': {'$map': {'input': {'$map': "
                         + "{'input': [1, 2, 3], 'in': '$$this'}}, 'in': '$$this'}}, 'n': 1}}]}]}");
         assertExpression(
                 9,
-                ofIntegerArray().max(a -> a, of(9)));
+                ofIntegerArray().max(of(9), a -> a));
     }
 
     @Test
     public void reduceMinTest() {
         assertExpression(
                 1,
-                ofIntegerArray(1, 2, 3).min(a -> a, of(9)),
+                ofIntegerArray(1, 2, 3).min(of(9), a -> a),
                 "{'$cond': [{'$eq': [{'$size': [[1, 2, 3]]}, 0]}, 9, "
                         + "{'$first': [{'$minN': {'input': {'$map': {'input': {'$map': "
                         + "{'input': [1, 2, 3], 'in': '$$this'}}, 'in': '$$this'}}, 'n': 1}}]}]}");
         assertExpression(
                 9,
-                ofIntegerArray().min(a -> a, of(9)));
+                ofIntegerArray().min(of(9), a -> a));
     }
 
     @Test