- JAVA-395: Date Time values do not preserve milliseconds when serialized to or deserialized from JSON

Author: agirbal

src/main/com/mongodb/MongoOptions.java

@@ -160,6 +160,12 @@ else if (safe)
      */
     public boolean fsync;
 
+    /**
+     * The "j" value of the global WriteConcern.
+     * Default is false.
+     */
+    public boolean j;
+
     public String toString(){
         StringBuilder buf = new StringBuilder();
         buf.append( "description=" ).append( description ).append( ", " );
@@ -174,7 +180,8 @@ public String toString(){
         buf.append( "safe=" ).append( safe ).append( ", " );
         buf.append( "w=" ).append( w ).append( ", " );
         buf.append( "wtimeout=" ).append( wtimeout ).append( ", " );
-        buf.append( "fsync=" ).append( fsync );
+        buf.append( "fsync=" ).append( fsync ).append( ", " );
+        buf.append( "j=" ).append( j );
 
         return buf.toString();
     }

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

@@ -139,7 +139,7 @@ public static void serialize( Object o , StringBuilder buf ){
         if (o instanceof Date) {
             Date d = (Date) o;
             SimpleDateFormat format = 
-		new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+		new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
             format.setCalendar(new GregorianCalendar(new SimpleTimeZone(0, "GMT")));
 	    serialize(new BasicDBObject("$date", format.format(d)), buf);
             return;

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

@@ -2,9 +2,12 @@
 
 package com.mongodb.util;
 
+import java.text.ParseException;
 import java.text.ParsePosition;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.logging.Level;
+import java.util.logging.Logger;
 import java.util.regex.Pattern;
 
 import org.bson.*;
@@ -45,9 +48,17 @@ public Object objectDone(){
 		}
 	    } else if ( b.containsField( "$date" ) ) {
 		SimpleDateFormat format = 
-		    new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
-		format.setCalendar(new GregorianCalendar(new SimpleTimeZone(0, "GMT")));
-		o = format.parse((String)b.get("$date"), new ParsePosition(0));
+		    new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+                GregorianCalendar calendar = new GregorianCalendar(new SimpleTimeZone(0, "GMT"));
+                format.setCalendar(calendar);
+                String txtdate = (String) b.get("$date");
+                o = format.parse(txtdate, new ParsePosition(0));
+                if (o == null) {
+                    // try older format with no ms
+                    format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+                    format.setCalendar(calendar);
+                    o = format.parse(txtdate, new ParsePosition(0));
+                }
 		if (!isStackEmpty()) {
 		    cur().put( name, o );
 		} else {

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

@@ -288,7 +288,7 @@ public void testObjectId() {
    @org.testng.annotations.Test
    public void testDate() {
        Date d = new Date();
-       SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'");
+       SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
        format.setCalendar(new GregorianCalendar(new SimpleTimeZone(0, "GMT")));
        String formattedDate = format.format(d);
 
@@ -297,6 +297,7 @@ public void testDate() {
 
        Date d2 = (Date)JSON.parse(serialized);
        assertEquals(d.toString(), d2.toString());
+       assertTrue(d.equals(d2));
    }
 
     @org.testng.annotations.Test