Add Symbol support to JSONSerializers

JAVA-1933

Author: rozza

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

@@ -28,6 +28,7 @@
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
+import org.bson.types.Symbol;
 
 import javax.xml.bind.DatatypeConverter;
 import java.lang.reflect.Array;
@@ -104,6 +105,7 @@ static ClassMapBasedObjectSerializer addCommonSerializers() {
         serializer.addObjectSerializer(ObjectId.class, new ObjectIdSerializer(serializer));
         serializer.addObjectSerializer(Pattern.class, new PatternSerializer(serializer));
         serializer.addObjectSerializer(String.class, new StringSerializer());
+        serializer.addObjectSerializer(Symbol.class, new SymbolSerializer(serializer));
         serializer.addObjectSerializer(UUID.class, new UuidSerializer(serializer));
         serializer.addObjectSerializer(BsonUndefined.class, new UndefinedSerializer(serializer));
         return serializer;
@@ -389,6 +391,21 @@ public void serialize(final Object obj, final StringBuilder buf) {
         }
     }
 
+    private static class SymbolSerializer extends CompoundObjectSerializer {
+
+        SymbolSerializer(final ObjectSerializer serializer) {
+            super(serializer);
+        }
+
+        @Override
+        public void serialize(final Object obj, final StringBuilder buf) {
+            Symbol symbol = (Symbol) obj;
+            BasicDBObject temp = new BasicDBObject();
+            temp.put("$symbol", symbol.toString());
+            serializer.serialize(temp, buf);
+        }
+    }
+
     private static class UuidSerializer extends CompoundObjectSerializer {
 
         UuidSerializer(final ObjectSerializer serializer) {

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

@@ -27,6 +27,7 @@
 import org.bson.types.MaxKey;
 import org.bson.types.MinKey;
 import org.bson.types.ObjectId;
+import org.bson.types.Symbol;
 import org.junit.Test;
 
 import javax.xml.bind.DatatypeConverter;
@@ -209,6 +210,11 @@ public void testStrictSerialization() {
         buf = new StringBuilder();
         serializer.serialize(d, buf);
         assertEquals("{ \"$date\" : " + (d.getTime()) + "}", buf.toString());
+
+        // test  SYMBOL
+        buf = new StringBuilder();
+        serializer.serialize(new Symbol("test"), buf);
+        assertEquals("{ \"$symbol\" : \"test\"}", buf.toString());
     }
 
     @Test