JAVA-1770: Deprecate com.mongodb.util.JSON and related classes

    Applications should replace its use with JsonReader, JsonReader, and the toJson/parse methods on BasicDBObject that wrap them.

Author: jyemin

driver/src/main/com/mongodb/BasicDBList.java

@@ -18,7 +18,6 @@
 
 package com.mongodb;
 
-import com.mongodb.util.JSON;
 import org.bson.types.BasicBSONList;
 
 /**
@@ -34,8 +33,9 @@ public class BasicDBList extends BasicBSONList implements DBObject {
      * @return JSON serialization
      */
     @Override
+    @SuppressWarnings("deprecation")
     public String toString() {
-        return JSON.serialize(this);
+        return com.mongodb.util.JSON.serialize(this);
     }
 
     @Override

driver/src/main/com/mongodb/BasicDBObject.java

@@ -16,7 +16,6 @@
 
 package com.mongodb;
 
-import com.mongodb.util.JSON;
 import org.bson.BasicBSONObject;
 import org.bson.BsonDocument;
 import org.bson.BsonDocumentWrapper;
@@ -192,8 +191,9 @@ public String toJson(final JsonWriterSettings writerSettings, final Encoder<Basi
      *
      * @return JSON serialization
      */
+    @SuppressWarnings("deprecation")
     public String toString() {
-        return JSON.serialize(this);
+        return com.mongodb.util.JSON.serialize(this);
     }
 
     /**

driver/src/main/com/mongodb/gridfs/GridFSFile.java

@@ -19,7 +19,6 @@
 import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 import com.mongodb.MongoException;
-import com.mongodb.util.JSON;
 import org.bson.BSONObject;
 
 import java.util.Collections;
@@ -277,8 +276,9 @@ public void markAsPartialObject() {
     }
 
     @Override
+    @SuppressWarnings("deprecation")
     public String toString() {
-        return JSON.serialize(this);
+        return com.mongodb.util.JSON.serialize(this);
     }
 
     /**

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2014 MongoDB, Inc.
+ * Copyright 2008-2017 MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,15 +14,21 @@
  * limitations under the License.
  */
 
-// JSON.java
-
 package com.mongodb.util;
 
 import org.bson.BSONCallback;
 
 /**
  * Helper methods for JSON serialization and de-serialization
+ *
+ * @see org.bson.json.JsonReader
+ * @see org.bson.json.JsonWriter
+ * @see com.mongodb.BasicDBObject#toJson()
+ * @see com.mongodb.BasicDBObject#parse(String)
+ *
+ * @deprecated This class has been superseded by to toJson and parse methods on BasicDBObject
  */
+@Deprecated
 public class JSON {
 
     /**
@@ -133,6 +139,7 @@ class JSONParser {
         this(s, null);
     }
 
+    @SuppressWarnings("deprecation")
     JSONParser(final String s, final BSONCallback callback) {
         this.s = s;
         _callback = (callback == null) ? new JSONCallback() : callback;

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

@@ -46,7 +46,10 @@
 
 /**
  * Converts JSON to DBObjects and vice versa.
+ *
+ * @deprecated This class has been superseded by to toJson and parse methods on BasicDBObject
  */
+@Deprecated
 public class JSONCallback extends BasicBSONCallback {
 
     @Override

driver/src/main/com/mongodb/util/JSONSerializers.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2008-2016 MongoDB, Inc.
+ * Copyright 2008-2017 MongoDB, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,7 +44,15 @@
 
 /**
  * Defines static methods for getting {@code ObjectSerializer} instances that produce various flavors of JSON.
+ *
+ * @see org.bson.json.JsonReader
+ * @see org.bson.json.JsonWriter
+ * @see com.mongodb.BasicDBObject#toJson()
+ * @see com.mongodb.BasicDBObject#parse(String)
+ *
+ * @deprecated This class has been superseded by to toJson and parse methods on BasicDBObject
  */
+@Deprecated
 public class JSONSerializers {
 
     private JSONSerializers() {

driver/src/main/org/bson/BasicBSONObject.java

@@ -16,7 +16,6 @@
 
 package org.bson;
 
-import com.mongodb.util.JSONSerializers;
 import org.bson.types.BasicBSONList;
 import org.bson.types.ObjectId;
 
@@ -342,8 +341,9 @@ public BasicBSONObject append(final String key, final Object val) {
      * @return JSON serialization
      */
     @Override
+    @SuppressWarnings("deprecation")
     public String toString() {
-        return JSONSerializers.getStrict().serialize(this);
+        return com.mongodb.util.JSONSerializers.getStrict().serialize(this);
     }
 
     /**

driver/src/main/org/bson/LazyBSONObject.java

@@ -433,6 +433,7 @@ public boolean equals(final Object o) {
      *
      * @return JSON serialization
      */
+    @SuppressWarnings("deprecation")
     public String toString() {
         return com.mongodb.util.JSON.serialize(this);
     }

driver/src/test/unit/com/mongodb/BasicDBObjectTest.java

@@ -16,7 +16,6 @@
 
 package com.mongodb;
 
-import com.mongodb.util.JSON;
 import org.bson.BasicBSONObject;
 import org.bson.json.JsonMode;
 import org.bson.json.JsonWriterSettings;
@@ -128,15 +127,17 @@ public void testBuilderIsEmpty() {
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testBuilderNested() {
         BasicDBObjectBuilder b = BasicDBObjectBuilder.start();
         b.add("a", 1);
         b.push("b").append("c", 2).pop();
         DBObject a = b.get();
-        assertEquals(a, JSON.parse("{ 'a' : 1, 'b' : { 'c' : 2 } }"));
+        assertEquals(a, com.mongodb.util.JSON.parse("{ 'a' : 1, 'b' : { 'c' : 2 } }"));
     }
 
     @Test
+    @SuppressWarnings("deprecation")
     public void testDown1() {
         BasicDBObjectBuilder b = BasicDBObjectBuilder.start();
         b.append("x", 1);
@@ -146,7 +147,7 @@ public void testDown1() {
         b.push("z");
         b.append("b", 3);
 
-        assertEquals(b.get(), JSON.parse("{ 'x' : 1 , 'y' : { 'a' : 2 } , 'z' : { 'b' : 3 } }"));
+        assertEquals(b.get(), com.mongodb.util.JSON.parse("{ 'x' : 1 , 'y' : { 'a' : 2 } , 'z' : { 'b' : 3 } }"));
     }
 
     @Test

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

@@ -37,6 +37,7 @@
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
 
+@SuppressWarnings("deprecation")
 public class JSONCallbackTest {
 
     @Test