JAVA-2296: Support Decimal128 in com.mongodb.util.JSON

Author: jyemin

driver/src/main/com/mongodb/util/JSONCallback.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-2016 MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -30,6 +30,7 @@
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.CodeWScope;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
@@ -131,6 +132,8 @@ public Object objectDone() {
             o = new BsonUndefined();
         } else if (b.containsField("$numberLong")) {
             o = Long.valueOf((String) b.get("$numberLong"));
+        } else if (b.containsField("$numberDecimal")) {
+            o = Decimal128.parse((String) b.get("$numberDecimal"));
         }
 
         if (!isStackEmpty()) {

driver/src/main/com/mongodb/util/JSONSerializers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-2016 MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.CodeWScope;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
@@ -108,6 +109,7 @@ static ClassMapBasedObjectSerializer addCommonSerializers() {
         serializer.addObjectSerializer(Symbol.class, new SymbolSerializer(serializer));
         serializer.addObjectSerializer(UUID.class, new UuidSerializer(serializer));
         serializer.addObjectSerializer(BsonUndefined.class, new UndefinedSerializer(serializer));
+        serializer.addObjectSerializer(Decimal128.class, new Decimal128Serializer(serializer));
         return serializer;
     }
 
@@ -509,4 +511,16 @@ public void serialize(final Object obj, final StringBuilder buf) {
         }
 
     }
+
+    private static class Decimal128Serializer extends CompoundObjectSerializer {
+
+        Decimal128Serializer(final ObjectSerializer serializer) {
+            super(serializer);
+        }
+
+        @Override
+        public void serialize(final Object obj, final StringBuilder buf) {
+            serializer.serialize(new BasicDBObject("$numberDecimal", obj.toString()), buf);
+        }
+    }
 }

driver/src/test/unit/com/mongodb/util/JSONCallbackTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-2016 MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 import org.bson.Transformer;
 import org.bson.types.BSONTimestamp;
 import org.bson.types.Binary;
+import org.bson.types.Decimal128;
 import org.bson.types.ObjectId;
 import org.junit.Test;
 
@@ -133,4 +134,9 @@ public void numberLongParsing() {
 
     }
 
+    @Test
+    public void numberDecimalParsing() {
+        Decimal128 number = (Decimal128) JSON.parse(("{\"$numberDecimal\" : \"314E-2\"}"));
+        assertEquals(number, Decimal128.parse("314E-2"));
+    }
 }

driver/src/test/unit/com/mongodb/util/JSONSerializersTest.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-2016 MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -24,6 +24,7 @@
 import org.bson.types.Binary;
 import org.bson.types.Code;
 import org.bson.types.CodeWScope;
+import org.bson.types.Decimal128;
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
@@ -187,6 +188,12 @@ public void testLegacySerialization() {
         buf = new StringBuilder();
         serializer.serialize(uuid, buf);
         assertEquals("{ \"$uuid\" : \"" + uuid.toString() + "\"}", buf.toString());
+
+        // test Decimal128
+        Decimal128 decimal128 = Decimal128.parse("3.140");
+        buf = new StringBuilder();
+        serializer.serialize(decimal128, buf);
+        assertEquals("{ \"$numberDecimal\" : \"3.140\"}", buf.toString());
     }
 
     @Test