Fix failing tests

Author: katcharov

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

@@ -17,7 +17,6 @@
 package com.mongodb.client.model.expressions;
 
 import org.bson.conversions.Bson;
-import org.bson.types.Decimal128;
 
 import java.time.Instant;
 
@@ -47,12 +46,8 @@ default BooleanExpression getBoolean(final String fieldName, final boolean other
 
     NumberExpression getNumber(String fieldName, NumberExpression other);
 
-    default NumberExpression getNumber(final String fieldName, final double other) {
-        return getNumber(fieldName, of(other));
-    }
-
-    default NumberExpression getNumber(final String fieldName, final Decimal128 other) {
-        return getNumber(fieldName, of(other));
+    default NumberExpression getNumber(final String fieldName, final Number other) {
+        return getNumber(fieldName, Expressions.numberToExpression(other));
     }
 
     IntegerExpression getInteger(String fieldName);

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

@@ -206,8 +206,7 @@ public void reduceMaxTest() {
                 3,
                 ofIntegerArray(1, 2, 3).max(of(9)),
                 "{'$cond': [{'$eq': [{'$size': [[1, 2, 3]]}, 0]}, 9, "
-                        + "{'$first': [{'$maxN': {'input': {'$map': {'input': {'$map': "
-                        + "{'input': [1, 2, 3], 'in': '$$this'}}, 'in': '$$this'}}, 'n': 1}}]}]}");
+                        + "{'$first': [{'$maxN': {'input': [1, 2, 3], 'n': 1}}]}]}");
         assertExpression(
                 9,
                 ofIntegerArray().max(of(9)));
@@ -219,8 +218,7 @@ public void reduceMinTest() {
                 1,
                 ofIntegerArray(1, 2, 3).min(of(9)),
                 "{'$cond': [{'$eq': [{'$size': [[1, 2, 3]]}, 0]}, 9, "
-                        + "{'$first': [{'$minN': {'input': {'$map': {'input': {'$map': "
-                        + "{'input': [1, 2, 3], 'in': '$$this'}}, 'in': '$$this'}}, 'n': 1}}]}]}");
+                        + "{'$first': [{'$minN': {'input': [1, 2, 3], 'n': 1}}]}]}");
         assertExpression(
                 9,
                 ofIntegerArray().min(of(9)));