JAVA-743: JSONCallback now applies decoding hooks for all types

Author: jyemin

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

@@ -63,12 +63,6 @@ public Object objectDone() {
         // override the object if it's a special type
         if (b.containsField("$oid")) {
             o = new ObjectId((String) b.get("$oid"));
-            if (!isStackEmpty()) {
-                gotObjectId(name, (ObjectId) o);
-            } else {
-                setRoot(o);
-            }
-            return o;
         } else if (b.containsField("$date")) {
             if (b.get("$date") instanceof Number) {
                 o = new Date(((Number) b.get("$date")).longValue());
@@ -117,8 +111,9 @@ public Object objectDone() {
         }
 
         if (!isStackEmpty()) {
-            cur().put(name, o);
+            _put(name, o);
         } else {
+            o = !BSON.hasDecodeHooks() ? o : BSON.applyDecodingHooks( o );
             setRoot(o);
         }
         return o;

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

@@ -1,6 +1,9 @@
 package com.mongodb.util;
 
+import com.mongodb.DBObject;
 import com.mongodb.DBRef;
+import org.bson.BSON;
+import org.bson.Transformer;
 import org.bson.types.BSONTimestamp;
 import org.bson.types.Binary;
 import org.bson.types.ObjectId;
@@ -41,6 +44,28 @@ public void dateParsing() {
 
     }
 
+    @org.testng.annotations.Test(groups = {"basic"})
+    public void encodingHooks() {
+        BSON.addDecodingHook(Date.class, new Transformer() {
+            @Override
+            public Object transform(final Object o) {
+                return ((Date) o).getTime();
+            }
+        });
+
+        try {
+            Date now = new Date();
+
+            Object parsedDate = JSON.parse("{ \"$date\" : " + now.getTime() + "}");
+            assertEquals(Long.class, parsedDate.getClass());
+
+            DBObject doc = (DBObject) JSON.parse("{ date : { \"$date\" : " + now.getTime() + "} }");
+            assertEquals(Long.class, doc.get("date").getClass());
+        } finally {
+            BSON.removeDecodingHooks(Date.class);
+        }
+    }
+
     @org.testng.annotations.Test(groups = {"basic"})
     public void binaryParsing() {
         Binary parsedBinary = (Binary) JSON.parse(("{ \"$binary\" : \"YWJjZA==\", \"$type\" : 0 }"));