JAVA-2144: Optimize DBOBjectCodec via use of BsonTypeCodecMap

Author: jyemin

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

@@ -27,6 +27,7 @@
 import org.bson.BsonValue;
 import org.bson.BsonWriter;
 import org.bson.codecs.BsonTypeClassMap;
+import org.bson.codecs.BsonTypeCodecMap;
 import org.bson.codecs.Codec;
 import org.bson.codecs.CollectibleCodec;
 import org.bson.codecs.DecoderContext;
@@ -65,7 +66,7 @@ public class DBObjectCodec implements CollectibleCodec<DBObject> {
     private static final String ID_FIELD_NAME = "_id";
 
     private final CodecRegistry codecRegistry;
-    private final BsonTypeClassMap bsonTypeClassMap;
+    private final BsonTypeCodecMap bsonTypeCodecMap;
     private final DBObjectFactory objectFactory;
     private final IdGenerator idGenerator = new ObjectIdGenerator();
 
@@ -113,7 +114,7 @@ public DBObjectCodec(final CodecRegistry codecRegistry, final BsonTypeClassMap b
     public DBObjectCodec(final CodecRegistry codecRegistry, final BsonTypeClassMap bsonTypeClassMap, final DBObjectFactory objectFactory) {
         this.objectFactory = notNull("objectFactory", objectFactory);
         this.codecRegistry = notNull("codecRegistry", codecRegistry);
-        this.bsonTypeClassMap = notNull("bsonTypeClassMap", bsonTypeClassMap);
+        this.bsonTypeCodecMap = new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), codecRegistry);
     }
 
     @Override
@@ -305,7 +306,7 @@ private Object readValue(final BsonReader reader, final DecoderContext decoderCo
                 initialRetVal = null;
                 break;
             default:
-                initialRetVal = codecRegistry.get(bsonTypeClassMap.get(bsonType)).decode(reader, decoderContext);
+                initialRetVal = bsonTypeCodecMap.get(bsonType).decode(reader, decoderContext);
         }
 
         if (bsonType.isContainer() && fieldName != null) {

driver/src/test/functional/com/mongodb/DBObjectCodecTest.java

@@ -25,6 +25,7 @@
 import org.bson.BsonObjectId;
 import org.bson.LazyBSONCallback;
 import org.bson.Transformer;
+import org.bson.codecs.BsonValueCodecProvider;
 import org.bson.codecs.EncoderContext;
 import org.bson.codecs.ValueCodecProvider;
 import org.junit.Test;
@@ -86,7 +87,8 @@ public void testDBListEncoding() {
 
     @Test
     public void shouldNotGenerateIdIfPresent() {
-        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider())));
+        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider(),
+                new BsonValueCodecProvider())));
         DBObject document = new BasicDBObject("_id", 1);
         assertTrue(dbObjectCodec.documentHasId(document));
         document = dbObjectCodec.generateIdIfAbsentFromDocument(document);
@@ -96,7 +98,8 @@ public void shouldNotGenerateIdIfPresent() {
 
     @Test
     public void shouldGenerateIdIfAbsent() {
-        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider())));
+        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider(),
+                new BsonValueCodecProvider())));
         DBObject document = new BasicDBObject();
         assertFalse(dbObjectCodec.documentHasId(document));
         document = dbObjectCodec.generateIdIfAbsentFromDocument(document);
@@ -106,7 +109,8 @@ public void shouldGenerateIdIfAbsent() {
 
     @Test
     public void shouldRespectEncodeIdFirstPropertyInEncoderContext() {
-        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider())));
+        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider(),
+                new BsonValueCodecProvider())));
         // given
         DBObject doc = new BasicDBObject("x", 2).append("_id", 2);
 
@@ -131,7 +135,8 @@ public void shouldRespectEncodeIdFirstPropertyInEncoderContext() {
 
     @Test
     public void shouldEncodeNull() {
-        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider())));
+        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider(),
+                new BsonValueCodecProvider())));
 
         DBObject doc = new BasicDBObject("null", null);
 
@@ -153,7 +158,8 @@ public void shouldEncodedNestedMapsListsAndDocuments() {
         zeroOneDBList.putAll(zeroOneMap);
         List<Integer> zeroOneList = asList(0, 1);
 
-        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider())));
+        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider(),
+                new BsonValueCodecProvider())));
 
         DBObject doc = new BasicDBObject()
                        .append("map", zeroOneMap)
@@ -184,7 +190,8 @@ public void shouldEncodeIterableMapAsMap() {
         IterableMap iterableMap = new IterableMap();
         iterableMap.put("first", 1);
 
-        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider())));
+        DBObjectCodec dbObjectCodec = new DBObjectCodec(fromProviders(asList(new ValueCodecProvider(), new DBObjectCodecProvider(),
+                new BsonValueCodecProvider())));
 
         DBObject doc = new BasicDBObject("map", iterableMap);
 

driver/src/test/unit/com/mongodb/DBObjectCodecSpecification.groovy

@@ -24,6 +24,7 @@ import org.bson.BsonDocument
 import org.bson.BsonDocumentReader
 import org.bson.BsonDocumentWriter
 import org.bson.BsonSymbol
+import org.bson.codecs.BsonValueCodecProvider
 import org.bson.codecs.DecoderContext
 import org.bson.codecs.EncoderContext
 import org.bson.codecs.UuidCodec
@@ -42,7 +43,7 @@ import static org.bson.codecs.configuration.CodecRegistries.fromRegistries
 class DBObjectCodecSpecification extends Specification {
 
     def bsonDoc = new BsonDocument()
-    def codecRegistry = fromProviders([new ValueCodecProvider(), new DBObjectCodecProvider()])
+    def codecRegistry = fromProviders([new ValueCodecProvider(), new DBObjectCodecProvider(), new BsonValueCodecProvider()])
     def dbObjectCodec = new DBObjectCodec(codecRegistry)
 
     def 'should encode and decode UUID as Binary'() {