Rename MapCodecV2 to MapCodec

JAVA-5142

Author: jyemin

bson/src/main/org/bson/codecs/MapCodecV2.java renamed to bson/src/main/org/bson/codecs/MapCodec.java

@@ -37,7 +37,7 @@
  * @param <M> the actual type of the Map, e.g. {@code NavigableMap<String, Object>}
  */
 @SuppressWarnings("rawtypes")
-final class MapCodecV2<M extends Map<String, Object>> extends AbstractMapCodec<Object, M>
+final class MapCodec<M extends Map<String, Object>> extends AbstractMapCodec<Object, M>
         implements OverridableUuidRepresentationCodec<M> {
 
     private final BsonTypeCodecMap bsonTypeCodecMap;
@@ -56,13 +56,13 @@ final class MapCodecV2<M extends Map<String, Object>> extends AbstractMapCodec<O
      * @param clazz            the Map subclass
      * @since 4.8
      */
-    MapCodecV2(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap, final Transformer valueTransformer,
+    MapCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap, final Transformer valueTransformer,
                       final Class<M> clazz) {
         this(registry, new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), registry), valueTransformer,
                 UuidRepresentation.UNSPECIFIED, clazz);
     }
 
-    private MapCodecV2(final CodecRegistry registry, final BsonTypeCodecMap bsonTypeCodecMap, final Transformer valueTransformer,
+    private MapCodec(final CodecRegistry registry, final BsonTypeCodecMap bsonTypeCodecMap, final Transformer valueTransformer,
                        final UuidRepresentation uuidRepresentation, final Class<M> clazz) {
         super(clazz);
         this.registry = notNull("registry", registry);
@@ -76,7 +76,7 @@ public Codec<M> withUuidRepresentation(final UuidRepresentation uuidRepresentati
         if (this.uuidRepresentation.equals(uuidRepresentation)) {
             return this;
         }
-        return new MapCodecV2<>(registry, bsonTypeCodecMap, valueTransformer, uuidRepresentation, getEncoderClass());
+        return new MapCodec<>(registry, bsonTypeCodecMap, valueTransformer, uuidRepresentation, getEncoderClass());
     }
 
     @Override

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

@@ -90,7 +90,7 @@ public <T> Codec<T> get(final Class<T> clazz, final List<Type> typeArguments, fi
             switch (typeArgumentsSize) {
                 case 0: {
                     @SuppressWarnings({"unchecked", "rawtypes"})
-                    Codec<T> result = new MapCodecV2(registry, bsonTypeClassMap, valueTransformer, clazz);
+                    Codec<T> result = new MapCodec(registry, bsonTypeClassMap, valueTransformer, clazz);
                     return result;
                 }
                 case 2: {

bson/src/test/unit/org/bson/codecs/MapCodecProviderTest.java

@@ -37,17 +37,17 @@ void shouldReturnMapCodecForMap() {
         MapCodecProvider provider = new MapCodecProvider();
         @SuppressWarnings({"rawtypes", "unchecked"})
         Codec<Map<String, Object>> codec = (Codec<Map<String, Object>>) (Codec) provider.get(Map.class, Bson.DEFAULT_CODEC_REGISTRY);
-        assertTrue(codec instanceof MapCodecV2);
-        MapCodecV2<Map<String, Object>> recordCodec = (MapCodecV2<Map<String, Object>>) codec;
+        assertTrue(codec instanceof MapCodec);
+        MapCodec<Map<String, Object>> recordCodec = (MapCodec<Map<String, Object>>) codec;
         assertEquals(Map.class, recordCodec.getEncoderClass());
     }
 
     @Test
     public void shouldReturnMapCodecForMapUsingDefaultRegistry() {
         @SuppressWarnings({"rawtypes", "unchecked"})
         Codec<Map<String, Object>> codec = (Codec<Map<String, Object>>) (Codec) Bson.DEFAULT_CODEC_REGISTRY.get(Map.class);
-        assertTrue(codec instanceof MapCodecV2);
-        MapCodecV2<Map<String, Object>> recordCodec = (MapCodecV2<Map<String, Object>>) codec;
+        assertTrue(codec instanceof MapCodec);
+        MapCodec<Map<String, Object>> recordCodec = (MapCodec<Map<String, Object>>) codec;
         assertEquals(Map.class, recordCodec.getEncoderClass());
     }
 }

bson/src/test/unit/org/bson/codecs/MapCodecV2Specification.groovy renamed to bson/src/test/unit/org/bson/codecs/MapCodecSpecification.groovy

@@ -64,7 +64,7 @@ import static org.bson.codecs.configuration.CodecRegistries.fromCodecs
 import static org.bson.codecs.configuration.CodecRegistries.fromProviders
 import static org.bson.codecs.configuration.CodecRegistries.fromRegistries
 
-class MapCodecV2Specification extends Specification {
+class MapCodecSpecification extends Specification {
 
     static final REGISTRY = fromRegistries(fromCodecs(new UuidCodec(JAVA_LEGACY)),
             fromProviders(asList(new ValueCodecProvider(), new BsonValueCodecProvider(),
@@ -107,7 +107,7 @@ class MapCodecV2Specification extends Specification {
         }
 
         when:
-        new MapCodecV2(REGISTRY, new BsonTypeClassMap(), null, Map).encode(writer, originalDocument, EncoderContext.builder().build())
+        new MapCodec(REGISTRY, new BsonTypeClassMap(), null, Map).encode(writer, originalDocument, EncoderContext.builder().build())
         BsonReader reader
         if (writer instanceof BsonDocumentWriter) {
             reader = new BsonDocumentReader(bsonDoc)
@@ -118,7 +118,7 @@ class MapCodecV2Specification extends Specification {
         } else {
             reader = new JsonReader(stringWriter.toString())
         }
-        def decodedDoc = new MapCodecV2(REGISTRY, new BsonTypeClassMap(), null, Map).decode(reader, DecoderContext.builder().build())
+        def decodedDoc = new MapCodec(REGISTRY, new BsonTypeClassMap(), null, Map).decode(reader, DecoderContext.builder().build())
 
         then:
         decodedDoc.get('null') == originalDocument.get('null')
@@ -177,7 +177,7 @@ class MapCodecV2Specification extends Specification {
         def reader = new BsonBinaryReader(ByteBuffer.wrap(bytes as byte[]))
 
         when:
-        def map = new MapCodecV2(fromCodecs(new UuidCodec(representation), new BinaryCodec()), new BsonTypeClassMap(), null, Map)
+        def map = new MapCodec(fromCodecs(new UuidCodec(representation), new BinaryCodec()), new BsonTypeClassMap(), null, Map)
                 .withUuidRepresentation(representation)
                 .decode(reader, DecoderContext.builder().build())
 
@@ -200,7 +200,7 @@ class MapCodecV2Specification extends Specification {
         def reader = new BsonBinaryReader(ByteBuffer.wrap(bytes as byte[]))
 
         when:
-        def map = new MapCodecV2(fromCodecs(new UuidCodec(representation), new BinaryCodec()), new BsonTypeClassMap(), null, Map)
+        def map = new MapCodec(fromCodecs(new UuidCodec(representation), new BinaryCodec()), new BsonTypeClassMap(), null, Map)
                 .withUuidRepresentation(representation)
                 .decode(reader, DecoderContext.builder().build())
 
@@ -219,7 +219,7 @@ class MapCodecV2Specification extends Specification {
 
     def 'should apply transformer to decoded values'() {
         given:
-        def codec = new MapCodecV2(fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()]),
+        def codec = new MapCodec(fromProviders([new ValueCodecProvider(), new DocumentCodecProvider(), new BsonValueCodecProvider()]),
                                       new BsonTypeClassMap(),
                                       { Object value -> 5 }, Map)
         when:
@@ -234,7 +234,7 @@ class MapCodecV2Specification extends Specification {
         def doc = new BsonDocument('_id', new BsonInt32(1))
 
         when:
-        def codec = new MapCodecV2(fromProviders([new ValueCodecProvider()]), new BsonTypeClassMap(), null, mapType)
+        def codec = new MapCodec(fromProviders([new ValueCodecProvider()]), new BsonTypeClassMap(), null, mapType)
         def map = codec.decode(new BsonDocumentReader(doc), DecoderContext.builder().build())
 
         then: