JAVA-2447: Implement revised extended JSON specification

  Support new canonical and relaxed extended JSON forms

  Change extended JSON parser to throw exceptions for documents
  that have at least one of the reserved $-prefixed keys
  but otherwise do not match the extended JSON form

Author: jyemin

bson/src/main/org/bson/BsonDocument.java

@@ -791,10 +791,14 @@ public int hashCode() {
     }
 
     /**
-     * Gets a JSON representation of this document using the default settings of {@code JsonWriterSettings}.
+     * Gets a JSON representation of this document using the {@link org.bson.json.JsonMode#STRICT} output mode, and otherwise the default
+     * settings of {@link JsonWriterSettings.Builder}.
+     *
      * @return a JSON representation of this document
+     * @see #toJson(JsonWriterSettings)
      * @see JsonWriterSettings
      */
+    @SuppressWarnings("deprecation")
     public String toJson() {
         return toJson(new JsonWriterSettings());
     }

bson/src/main/org/bson/Document.java

@@ -261,13 +261,15 @@ public Date getDate(final Object key) {
     }
 
     /**
-     * Gets a JSON representation of this document
-     *
-     * <p>With the default {@link JsonWriterSettings} and {@link DocumentCodec}.</p>
+     * Gets a JSON representation of this document using the {@link org.bson.json.JsonMode#STRICT} output mode, and otherwise the default
+     * settings of {@link JsonWriterSettings.Builder} and {@link DocumentCodec}.
      *
      * @return a JSON representation of this document
      * @throws org.bson.codecs.configuration.CodecConfigurationException if the document contains types not in the default registry
+     * @see #toJson(JsonWriterSettings)
+     * @see JsonWriterSettings
      */
+    @SuppressWarnings("deprecation")
     public String toJson() {
         return toJson(new JsonWriterSettings());
     }
@@ -294,6 +296,7 @@ public String toJson(final JsonWriterSettings writerSettings) {
      * @return a JSON representation of this document
      * @throws org.bson.codecs.configuration.CodecConfigurationException if the registry does not contain a codec for the document values.
      */
+    @SuppressWarnings("deprecation")
     public String toJson(final Encoder<Document> encoder) {
         return toJson(new JsonWriterSettings(), encoder);
     }

bson/src/main/org/bson/RawBsonDocument.java

@@ -294,6 +294,7 @@ public BsonValue get(final Object key) {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public String toJson() {
         return toJson(new JsonWriterSettings());
     }

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

@@ -20,10 +20,13 @@
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.time.format.DateTimeParseException;
 import java.time.temporal.TemporalAccessor;
 import java.time.temporal.TemporalQuery;
 import java.util.Calendar;
+import java.util.TimeZone;
 
 import static java.time.format.DateTimeFormatter.ISO_OFFSET_DATE_TIME;
 
@@ -61,19 +64,27 @@ static long parse(final String dateTimeString) {
         return FORMATTER_IMPL.parse(dateTimeString);
     }
 
+    static String format(final long dateTime) {
+        return FORMATTER_IMPL.format(dateTime);
+    }
+
     private interface FormatterImpl {
         long parse(String dateTimeString);
+        String format(long dateTime);
     }
 
     // Reflective use of DatatypeConverter avoids a compile-time dependency on the java.xml.bind module in Java 9
     static class JaxbDateTimeFormatter implements FormatterImpl {
 
         private static final Method DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD;
+        private static final Method DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD;
 
         static {
             try {
                 DATATYPE_CONVERTER_PARSE_DATE_TIME_METHOD = Class.forName("javax.xml.bind.DatatypeConverter")
                                                                     .getDeclaredMethod("parseDateTime", String.class);
+                DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD = Class.forName("javax.xml.bind.DatatypeConverter")
+                                                                    .getDeclaredMethod("printDateTime", Calendar.class);
             } catch (NoSuchMethodException e) {
                 throw new ExceptionInInitializerError(e);
             } catch (ClassNotFoundException e) {
@@ -91,6 +102,20 @@ public long parse(final String dateTimeString) {
                 throw (RuntimeException) e.getCause();
             }
         }
+
+        @Override
+        public String format(final long dateTime) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTimeInMillis(dateTime);
+            calendar.setTimeZone(TimeZone.getTimeZone("Z"));
+            try {
+                return (String) DATATYPE_CONVERTER_PRINT_DATE_TIME_METHOD.invoke(null, calendar);
+            } catch (IllegalAccessException e) {
+                throw new IllegalStateException();
+            } catch (InvocationTargetException e) {
+                throw (RuntimeException) e.getCause();
+            }
+        }
     }
 
     static class Java8DateTimeFormatter implements FormatterImpl {
@@ -118,6 +143,11 @@ public Instant queryFrom(final TemporalAccessor temporal) {
                 throw new IllegalArgumentException(e.getMessage());
             }
         }
+
+        @Override
+        public String format(final long dateTime) {
+            return ZonedDateTime.ofInstant(Instant.ofEpochMilli(dateTime), ZoneId.of("Z")).format(ISO_OFFSET_DATE_TIME);
+        }
     }
 
     private DateTimeFormatter() {

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

@@ -25,8 +25,10 @@ class ExtendedJsonBinaryConverter implements Converter<BsonBinary> {
     @Override
     public void convert(final BsonBinary value, final StrictJsonWriter writer) {
         writer.writeStartObject();
-        writer.writeString("$binary", Base64.encode(value.getData()));
-        writer.writeString("$type", String.format("%02X", value.getType()));
+        writer.writeStartObject("$binary");
+        writer.writeString("base64", Base64.encode(value.getData()));
+        writer.writeString("subType", String.format("%02X", value.getType()));
+        writer.writeEndObject();
         writer.writeEndObject();
     }
 }

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

@@ -23,8 +23,10 @@ class ExtendedJsonRegularExpressionConverter implements Converter<BsonRegularExp
     @Override
     public void convert(final BsonRegularExpression value, final StrictJsonWriter writer) {
         writer.writeStartObject();
-        writer.writeString("$regex", value.getPattern());
-        writer.writeString("$options", value.getOptions());
+        writer.writeStartObject("$regularExpression");
+        writer.writeString("pattern", value.getPattern());
+        writer.writeString("options", value.getOptions());
+        writer.writeEndObject();
         writer.writeEndObject();
     }
 }

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

@@ -24,7 +24,15 @@ class ExtendedJsonTimestampConverter implements Converter<BsonTimestamp> {
     @Override
     public void convert(final BsonTimestamp value, final StrictJsonWriter writer) {
         writer.writeStartObject();
-        writer.writeString("$timestamp", UnsignedLongs.toString(value.getValue()));
+        writer.writeStartObject("$timestamp");
+        writer.writeNumber("t", UnsignedLongs.toString(toUnsignedLong(value.getTime())));
+        writer.writeNumber("i", UnsignedLongs.toString(toUnsignedLong(value.getInc())));
         writer.writeEndObject();
+        writer.writeEndObject();
+    }
+
+    // Equivalent to Integer.toUnsignedLong() in Java 8
+    private long toUnsignedLong(final int value) {
+        return ((long) value) & 0xffffffffL;
     }
 }

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

@@ -44,5 +44,13 @@ public enum JsonMode {
      * @since 3.5
      * @see <a href="https://github.com/mongodb/specifications/blob/master/source/extended-json.rst">Extended JSON Specification</a>
      */
-    EXTENDED
+    EXTENDED,
+
+    /**
+     * Standard relaxed extended JSON representation.
+     *
+     * @since 3.5
+     * @see <a href="https://github.com/mongodb/specifications/blob/master/source/extended-json.rst">Extended JSON Specification</a>
+     */
+    RELAXED
 }