Add Json support for new ISODate()

JAVA-2022

Author: rozza

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

@@ -728,16 +728,20 @@ private long visitNumberLongConstructor() {
 
     private long visitISODateTimeConstructor() {
         verifyToken("(");
-        JsonToken valueToken = popToken();
-        if (valueToken.getType() != JsonTokenType.STRING) {
-            throw new JsonParseException("JSON reader expected a string but found '%s'.", valueToken.getValue());
+
+        JsonToken token = popToken();
+        if (token.getType() == JsonTokenType.RIGHT_PAREN) {
+            return new Date().getTime();
+        } else if (token.getType() != JsonTokenType.STRING) {
+            throw new JsonParseException("JSON reader expected a string but found '%s'.", token.getValue());
         }
+
         verifyToken(")");
         String[] patterns = {"yyyy-MM-dd", "yyyy-MM-dd'T'HH:mm:ssz", "yyyy-MM-dd'T'HH:mm:ss.SSSz"};
 
         SimpleDateFormat format = new SimpleDateFormat(patterns[0], Locale.ENGLISH);
         ParsePosition pos = new ParsePosition(0);
-        String s = valueToken.getValue(String.class);
+        String s = token.getValue(String.class);
 
         if (s.endsWith("Z")) {
             s = s.substring(0, s.length() - 1) + "GMT-00:00";

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

@@ -26,8 +26,11 @@
 import org.bson.types.ObjectId;
 import org.junit.Test;
 
+import java.util.Date;
+
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
 
 
 public class JsonReaderTest {
@@ -704,22 +707,43 @@ public void testDateTimeConstructorWithNew() {
 
     @Test
     public void testEmptyDateTimeConstructorWithNew() {
+        long currentTime = new Date().getTime();
         String json = "new Date()";
         bsonReader = new JsonReader(json);
         assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        bsonReader.readDateTime();
+        assertTrue(bsonReader.readDateTime() >= currentTime);
         assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
     }
 
     @Test
     public void testEmptyDateTimeConstructor() {
+        long currentTime = new Date().getTime();
         String json = "Date()";
         bsonReader = new JsonReader(json);
         assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
-        bsonReader.readDateTime();
+        assertTrue(bsonReader.readDateTime() >= currentTime);
+        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+    }
+
+    @Test
+    public void testEmptyISODateTimeConstructorWithNew() {
+        long currentTime = new Date().getTime();
+        String json = "new ISODate()";
+        bsonReader = new JsonReader(json);
+        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+        assertTrue(bsonReader.readDateTime() >= currentTime);
         assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
     }
 
+    @Test
+    public void testEmptyISODateTimeConstructor() {
+        long currentTime = new Date().getTime();
+        String json = "ISODate()";
+        bsonReader = new JsonReader(json);
+        assertEquals(BsonType.DATE_TIME, bsonReader.readBsonType());
+        assertTrue(bsonReader.readDateTime() >= currentTime);
+        assertEquals(AbstractBsonReader.State.DONE, bsonReader.getState());
+    }
 
     @Test
     public void testRegExp() {