Add of(BigDecimal)

Author: katcharov

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

@@ -21,6 +21,7 @@
 import org.bson.BsonArray;
 import org.bson.BsonBoolean;
 import org.bson.BsonDateTime;
+import org.bson.BsonDecimal128;
 import org.bson.BsonDocument;
 import org.bson.BsonDouble;
 import org.bson.BsonInt32;
@@ -29,7 +30,9 @@
 import org.bson.BsonString;
 import org.bson.BsonValue;
 import org.bson.conversions.Bson;
+import org.bson.types.Decimal128;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -73,6 +76,10 @@ public static IntegerExpression of(final long of) {
     public static NumberExpression of(final double of) {
         return new MqlExpression<>((codecRegistry) -> new AstPlaceholder(new BsonDouble(of)));
     }
+    public static NumberExpression of(@NonNull final BigDecimal of) {
+        Assertions.notNull("BigDecimal", of);
+        return new MqlExpression<>((codecRegistry) -> new AstPlaceholder(new BsonDecimal128(new Decimal128(of))));
+    }
     public static DateExpression of(@NonNull final Instant of) {
         Assertions.notNull("Instant", of);
         return new MqlExpression<>((codecRegistry) -> new AstPlaceholder(new BsonDateTime(of.toEpochMilli())));

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

@@ -21,8 +21,6 @@
  */
 public interface NumberExpression extends Expression {
 
-    // TODO this must not return <T extends NumberExpression> T
-    // since it allows: IntegerEx result = oneNum.multiply(oneInt)
     NumberExpression multiply(NumberExpression n);
 
     default NumberExpression multiply(final double multiply) {

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

@@ -16,12 +16,17 @@
 
 package com.mongodb.client.model.expressions;
 
+import org.bson.types.Decimal128;
 import org.junit.jupiter.api.Test;
 
+import java.math.BigDecimal;
+
 import static com.mongodb.client.model.expressions.Expressions.of;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
 
+@SuppressWarnings("ConstantConditions")
 class ArithmeticExpressionsFunctionalTest extends AbstractExpressionsFunctionalTest {
     // https://www.mongodb.com/docs/manual/reference/operator/aggregation/#arithmetic-expression-operators
 
@@ -30,13 +35,15 @@ public void literalsTest() {
         assertExpression(1, of(1), "1");
         assertExpression(1L, of(1L));
         assertExpression(1.0, of(1.0));
+        assertExpression(BigDecimal.valueOf(1.0), of(BigDecimal.valueOf(1.0)));
+        assertThrows(IllegalArgumentException.class, () -> of((BigDecimal) null));
 
         // expression equality differs from bson equality
         assertExpression(true, of(1L).eq(of(1.0)));
         assertExpression(true, of(1L).eq(of(1)));
 
         // bson equality; underlying type is preserved
-        // this is not defined by the API, but tested for clarity
+        // this behaviour is not defined by the API, but tested for clarity
         assertEquals(toBsonValue(1), evaluate(of(1)));
         assertEquals(toBsonValue(1L), evaluate(of(1L)));
         assertEquals(toBsonValue(1.0), evaluate(of(1.0)));
@@ -89,8 +96,6 @@ public void divideTest() {
         // convenience
         assertExpression(0.5, of(1.0).divide(2.0));
         assertExpression(0.5, of(1).divide(2.0));
-        // TODO these convenience methods are all for doubles, so while they
-        // TODO allow longs and ints, they do not carry that through to the server:
         assertExpression(0.5, of(1).divide(2L));
         assertExpression(0.5, of(1).divide(2));
     }