implement "$date": "2015-04-14T14:55:57.626Z" and "$date": "2015-04-14T14:55:57+02:00" extended json parsing in JsonReader

Author: fbuecklers

bson/src/main/org/bson/json/JsonReader.java

@@ -784,7 +784,7 @@ private BsonBinary visitHexDataConstructor() {
     }
 
     private long visitDateTimeConstructor() {
-        DateFormat df = new SimpleDateFormat("EEE MMM dd yyyy HH:mm:ss z");
+        DateFormat format = new SimpleDateFormat("EEE MMM dd yyyy HH:mm:ss z", Locale.ENGLISH);
 
         verifyToken("(");
 
@@ -795,7 +795,7 @@ private long visitDateTimeConstructor() {
             verifyToken(")");
             String s = token.getValue(String.class);
             ParsePosition pos = new ParsePosition(0);
-            Date dateTime = df.parse(s, pos);
+            Date dateTime = format.parse(s, pos);
             if (dateTime != null && pos.getIndex() == s.length()) {
                 return dateTime.getTime();
             } else {
@@ -870,11 +870,26 @@ private BsonBinary visitBinDataExtendedJson() {
     private long visitDateTimeExtendedJson() {
         verifyToken(":");
         JsonToken valueToken = popToken();
-        if (valueToken.getType() != JsonTokenType.INT32 && valueToken.getType() != JsonTokenType.INT64) {
-            throw new JsonParseException("JSON reader expected an integer but found '%s'.", valueToken.getValue());
-        }
         verifyToken("}");
-        return valueToken.getValue(Long.class);
+
+        if (valueToken.getType() == JsonTokenType.INT32 || valueToken.getType() == JsonTokenType.INT64) {
+            return valueToken.getValue(Long.class);
+        } else if (valueToken.getType() == JsonTokenType.STRING) {
+            String dateString = valueToken.getValue(String.class);
+            SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSSXXX", Locale.ENGLISH);
+            ParsePosition pos = new ParsePosition(0);
+            format.setLenient(true);
+
+            Date date = format.parse(dateString, pos);
+
+            if (date != null && pos.getIndex() == dateString.length()) {
+                return date.getTime();
+            }
+
+            throw new JsonParseException("JSON reader expected an ISO-8601 date string but found.", dateString);
+        } else {
+            throw new JsonParseException("JSON reader expected an integer or string but found '%s'.", valueToken.getValue());
+        }
     }
 
     private MaxKey visitMaxKeyExtendedJson() {

bson/src/test/unit/org/bson/json/JsonReaderTest.java

@@ -127,6 +127,45 @@ public void testDateTimeStrict() {
         assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
     }
 
+    @Test
+    public void testDateTimeISOString() {
+        String json = "{ \"$date\" : \"2015-04-16T14:55:57.626Z\" }";
+        bsonReader = new JsonReader(json);
+        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+        assertEquals(1429196157626L, bsonReader.readDateTime());
+        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+    }
+
+    @Test
+    public void testDateTimeISOStringWithTimeOffset() {
+        String json = "{ \"$date\" : \"2015-04-16T16:55:57.626+02:00\" }";
+        bsonReader = new JsonReader(json);
+        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+        assertEquals(1429196157626L, bsonReader.readDateTime());
+        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+    }
+
+    @Test(expected = JsonParseException.class)
+    public void testInvalidDateTimeISOString1() {
+        String json = "{ \"$date\" : \"2015-04-16T16:55:57.626+02:000\" }";
+        bsonReader = new JsonReader(json);
+        bsonReader.readBsonType();
+    }
+
+    @Test(expected = JsonParseException.class)
+    public void testInvalidDateTimeISOString2() {
+        String json = "{ \"$date\" : \"2015-04-16T16:55:57.626Z invalid string\" }";
+        bsonReader = new JsonReader(json);
+        bsonReader.readBsonType();
+    }
+
+    @Test(expected = JsonParseException.class)
+    public void testInvalidDateTimeValue() {
+        String json = "{ \"$date\" : {} }";
+        bsonReader = new JsonReader(json);
+        bsonReader.readBsonType();
+    }
+
     @Test
     public void testDateTimeTengen() {
         String json = "new Date(0)";