Create DEFAULT_BSON_TYPE_CODEC_MAP for DocumentCodec and BsonDocumentCodec

JAVA-3770

Author: rozza

bson/src/main/org/bson/codecs/BsonDocumentCodec.java

@@ -30,6 +30,7 @@
 import java.util.List;
 import java.util.Map;
 
+import static org.bson.assertions.Assertions.notNull;
 import static org.bson.codecs.BsonValueCodecProvider.getBsonTypeClassMap;
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
 
@@ -41,6 +42,7 @@
 public class BsonDocumentCodec implements CollectibleCodec<BsonDocument> {
     private static final String ID_FIELD_NAME = "_id";
     private static final CodecRegistry DEFAULT_REGISTRY = fromProviders(new BsonValueCodecProvider());
+    private static final BsonTypeCodecMap DEFAULT_BSON_TYPE_CODEC_MAP = new BsonTypeCodecMap(getBsonTypeClassMap(), DEFAULT_REGISTRY);
 
     private final CodecRegistry codecRegistry;
     private final BsonTypeCodecMap bsonTypeCodecMap;
@@ -49,7 +51,7 @@ public class BsonDocumentCodec implements CollectibleCodec<BsonDocument> {
      * Creates a new instance with a default codec registry that uses the {@link BsonValueCodecProvider}.
      */
     public BsonDocumentCodec() {
-        this(DEFAULT_REGISTRY);
+        this(DEFAULT_REGISTRY, DEFAULT_BSON_TYPE_CODEC_MAP);
     }
 
     /**
@@ -58,11 +60,12 @@ public BsonDocumentCodec() {
      * @param codecRegistry the {@code CodecRegistry} to use to look up the codecs for encoding and decoding to/from BSON
      */
     public BsonDocumentCodec(final CodecRegistry codecRegistry) {
-        if (codecRegistry == null) {
-            throw new IllegalArgumentException("Codec registry can not be null");
-        }
-        this.codecRegistry = codecRegistry;
-        this.bsonTypeCodecMap = new BsonTypeCodecMap(getBsonTypeClassMap(), codecRegistry);
+        this(codecRegistry, new BsonTypeCodecMap(getBsonTypeClassMap(), codecRegistry));
+    }
+
+    private BsonDocumentCodec(final CodecRegistry codecRegistry, final BsonTypeCodecMap bsonTypeCodecMap) {
+        this.codecRegistry = notNull("Codec registry", codecRegistry);
+        this.bsonTypeCodecMap = notNull("bsonTypeCodecMap", bsonTypeCodecMap);
     }
 
     /**

bson/src/main/org/bson/codecs/BsonTypeClassMap.java

@@ -70,6 +70,7 @@
  * @since 3.0
  */
 public class BsonTypeClassMap {
+    static final BsonTypeClassMap DEFAULT_BSON_TYPE_CLASS_MAP = new BsonTypeClassMap();
     private final Map<BsonType, Class<?>> map = new HashMap<BsonType, Class<?>>();
 
     /**

bson/src/main/org/bson/codecs/DocumentCodec.java

@@ -34,6 +34,7 @@
 
 import static java.util.Arrays.asList;
 import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.BsonTypeClassMap.DEFAULT_BSON_TYPE_CLASS_MAP;
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders;
 
 /**
@@ -48,7 +49,8 @@ public class DocumentCodec implements CollectibleCodec<Document>, OverridableUui
     private static final CodecRegistry DEFAULT_REGISTRY = fromProviders(asList(new ValueCodecProvider(),
             new BsonValueCodecProvider(),
             new DocumentCodecProvider()));
-    private static final BsonTypeClassMap DEFAULT_BSON_TYPE_CLASS_MAP = new BsonTypeClassMap();
+    private static final BsonTypeCodecMap DEFAULT_BSON_TYPE_CODEC_MAP = new BsonTypeCodecMap(DEFAULT_BSON_TYPE_CLASS_MAP, DEFAULT_REGISTRY);
+    private static final IdGenerator DEFAULT_ID_GENERATOR = new ObjectIdGenerator();
 
     private final BsonTypeCodecMap bsonTypeCodecMap;
     private final CodecRegistry registry;
@@ -60,7 +62,7 @@ public class DocumentCodec implements CollectibleCodec<Document>, OverridableUui
      * Construct a new instance with a default {@code CodecRegistry}.
      */
     public DocumentCodec() {
-        this(DEFAULT_REGISTRY);
+        this(DEFAULT_REGISTRY, DEFAULT_BSON_TYPE_CODEC_MAP, null);
     }
 
     /**
@@ -93,8 +95,11 @@ public DocumentCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTy
      * @param valueTransformer the value transformer to use as a final step when decoding the value of any field in the document
      */
     public DocumentCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap, final Transformer valueTransformer) {
-        this(registry, new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), registry),
-                new ObjectIdGenerator(), valueTransformer, UuidRepresentation.UNSPECIFIED);
+        this(registry, new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), registry), valueTransformer);
+    }
+
+    private DocumentCodec(final CodecRegistry registry, final BsonTypeCodecMap bsonTypeCodecMap, final Transformer valueTransformer) {
+        this(registry, bsonTypeCodecMap, DEFAULT_ID_GENERATOR, valueTransformer, UuidRepresentation.UNSPECIFIED);
     }
 
     private DocumentCodec(final CodecRegistry registry, final BsonTypeCodecMap bsonTypeCodecMap, final IdGenerator idGenerator,

bson/src/main/org/bson/codecs/DocumentCodecProvider.java

@@ -23,6 +23,7 @@
 import org.bson.types.CodeWithScope;
 
 import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.BsonTypeClassMap.DEFAULT_BSON_TYPE_CLASS_MAP;
 
 /**
  * A {@code CodecProvider} for the Document class and all the default Codec implementations on which it depends.
@@ -37,7 +38,7 @@ public class DocumentCodecProvider implements CodecProvider {
      * Construct a new instance with a default {@code BsonTypeClassMap}.
      */
     public DocumentCodecProvider() {
-        this(new BsonTypeClassMap());
+        this(DEFAULT_BSON_TYPE_CLASS_MAP);
     }
 
     /**
@@ -48,7 +49,7 @@ public DocumentCodecProvider() {
      * @see org.bson.codecs.DocumentCodec#DocumentCodec(org.bson.codecs.configuration.CodecRegistry, BsonTypeClassMap, org.bson.Transformer)
      */
     public DocumentCodecProvider(final Transformer valueTransformer) {
-        this(new BsonTypeClassMap(), valueTransformer);
+        this(DEFAULT_BSON_TYPE_CLASS_MAP, valueTransformer);
     }
 
     /**

bson/src/main/org/bson/codecs/IterableCodecProvider.java

@@ -21,6 +21,7 @@
 import org.bson.codecs.configuration.CodecRegistry;
 
 import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.BsonTypeClassMap.DEFAULT_BSON_TYPE_CLASS_MAP;
 
 /**
  * A {@code CodecProvider} for classes than implement the {@code Iterable} interface.
@@ -35,7 +36,7 @@ public class IterableCodecProvider implements CodecProvider {
      * Construct a new instance with a default {@code BsonTypeClassMap} and no {@code Transformer}.
      */
     public IterableCodecProvider() {
-        this(new BsonTypeClassMap());
+        this(DEFAULT_BSON_TYPE_CLASS_MAP);
     }
 
     /**
@@ -45,7 +46,7 @@ public IterableCodecProvider() {
      * @param valueTransformer the value transformer for decoded values
      */
     public IterableCodecProvider(final Transformer valueTransformer) {
-        this(new BsonTypeClassMap(), valueTransformer);
+        this(DEFAULT_BSON_TYPE_CLASS_MAP, valueTransformer);
     }
 
     /**

bson/src/main/org/bson/codecs/MapCodecProvider.java

@@ -23,6 +23,7 @@
 import java.util.Map;
 
 import static org.bson.assertions.Assertions.notNull;
+import static org.bson.codecs.BsonTypeClassMap.DEFAULT_BSON_TYPE_CLASS_MAP;
 
 /**
  * A {@code CodecProvider} for the Map class and all the default Codec implementations on which it depends.
@@ -37,7 +38,7 @@ public class MapCodecProvider implements CodecProvider {
      * Construct a new instance with a default {@code BsonTypeClassMap}.
      */
     public MapCodecProvider() {
-        this(new BsonTypeClassMap());
+        this(DEFAULT_BSON_TYPE_CLASS_MAP);
     }
 
     /**
@@ -57,7 +58,7 @@ public MapCodecProvider(final BsonTypeClassMap bsonTypeClassMap) {
      * @param valueTransformer the value transformer for decoded values
      */
     public MapCodecProvider(final Transformer valueTransformer) {
-        this(new BsonTypeClassMap(), valueTransformer);
+        this(DEFAULT_BSON_TYPE_CLASS_MAP, valueTransformer);
     }
 
     /**