Merge 5.0 breaking changes into the main line of development

bson-record-codec/src/main/org/bson/codecs/record/RecordCodec.java

@@ -26,9 +26,13 @@
 import org.bson.codecs.RepresentationConfigurable;
 import org.bson.codecs.configuration.CodecConfigurationException;
 import org.bson.codecs.configuration.CodecRegistry;
-import org.bson.codecs.record.annotations.BsonId;
-import org.bson.codecs.record.annotations.BsonProperty;
-import org.bson.codecs.record.annotations.BsonRepresentation;
+import org.bson.codecs.pojo.annotations.BsonCreator;
+import org.bson.codecs.pojo.annotations.BsonDiscriminator;
+import org.bson.codecs.pojo.annotations.BsonExtraElements;
+import org.bson.codecs.pojo.annotations.BsonId;
+import org.bson.codecs.pojo.annotations.BsonIgnore;
+import org.bson.codecs.pojo.annotations.BsonProperty;
+import org.bson.codecs.pojo.annotations.BsonRepresentation;
 import org.bson.diagnostics.Logger;
 import org.bson.diagnostics.Loggers;
 
@@ -87,7 +91,6 @@ Object getValue(final Record record) throws InvocationTargetException, IllegalAc
             return component.getAccessor().invoke(record);
         }
 
-        @SuppressWarnings("deprecation")
         private static Codec<?> computeCodec(final List<Type> typeParameters, final RecordComponent component,
                 final CodecRegistry codecRegistry) {
             var rawType = toWrapper(resolveComponentType(typeParameters, component));
@@ -97,11 +100,9 @@ private static Codec<?> computeCodec(final List<Type> typeParameters, final Reco
                     : codecRegistry.get(rawType);
             BsonType bsonRepresentationType = null;
 
-            if (component.isAnnotationPresent(BsonRepresentation.class)) {
-                bsonRepresentationType = component.getAnnotation(BsonRepresentation.class).value();
-            } else if (isAnnotationPresentOnField(component, org.bson.codecs.pojo.annotations.BsonRepresentation.class)) {
+            if (isAnnotationPresentOnField(component, BsonRepresentation.class)) {
                 bsonRepresentationType = getAnnotationOnField(component,
-                        org.bson.codecs.pojo.annotations.BsonRepresentation.class).value();
+                        BsonRepresentation.class).value();
             }
             if (bsonRepresentationType != null) {
                 if (codec instanceof RepresentationConfigurable<?> representationConfigurable) {
@@ -145,16 +146,11 @@ private static int getIndexOfTypeParameter(final String typeParameterName, final
                     recordClass.getName(), typeParameterName));
         }
 
-        @SuppressWarnings("deprecation")
         private static String computeFieldName(final RecordComponent component) {
-            if (component.isAnnotationPresent(BsonId.class)) {
+            if (isAnnotationPresentOnField(component, BsonId.class)) {
                 return "_id";
-            } else if (isAnnotationPresentOnField(component, org.bson.codecs.pojo.annotations.BsonId.class)) {
-                return "_id";
-            } else if (component.isAnnotationPresent(BsonProperty.class)) {
-                return component.getAnnotation(BsonProperty.class).value();
-            } else if (isAnnotationPresentOnField(component, org.bson.codecs.pojo.annotations.BsonProperty.class)) {
-                return getAnnotationOnField(component, org.bson.codecs.pojo.annotations.BsonProperty.class).value();
+            } else if (isAnnotationPresentOnField(component, BsonProperty.class)) {
+                return getAnnotationOnField(component, BsonProperty.class).value();
             }
             return component.getName();
         }
@@ -182,14 +178,14 @@ private static <T extends Annotation> T getAnnotationOnField(final RecordCompone
         }
 
         private static void validateAnnotations(final RecordComponent component, final int index) {
-            validateAnnotationNotPresentOnType(component.getDeclaringRecord(), org.bson.codecs.pojo.annotations.BsonDiscriminator.class);
-            validateAnnotationNotPresentOnConstructor(component.getDeclaringRecord(), org.bson.codecs.pojo.annotations.BsonCreator.class);
-            validateAnnotationNotPresentOnMethod(component.getDeclaringRecord(), org.bson.codecs.pojo.annotations.BsonCreator.class);
-            validateAnnotationNotPresentOnFieldOrAccessor(component, org.bson.codecs.pojo.annotations.BsonIgnore.class);
-            validateAnnotationNotPresentOnFieldOrAccessor(component, org.bson.codecs.pojo.annotations.BsonExtraElements.class);
-            validateAnnotationOnlyOnField(component, index, org.bson.codecs.pojo.annotations.BsonId.class);
-            validateAnnotationOnlyOnField(component, index, org.bson.codecs.pojo.annotations.BsonProperty.class);
-            validateAnnotationOnlyOnField(component, index, org.bson.codecs.pojo.annotations.BsonRepresentation.class);
+            validateAnnotationNotPresentOnType(component.getDeclaringRecord(), BsonDiscriminator.class);
+            validateAnnotationNotPresentOnConstructor(component.getDeclaringRecord(), BsonCreator.class);
+            validateAnnotationNotPresentOnMethod(component.getDeclaringRecord(), BsonCreator.class);
+            validateAnnotationNotPresentOnFieldOrAccessor(component, BsonIgnore.class);
+            validateAnnotationNotPresentOnFieldOrAccessor(component, BsonExtraElements.class);
+            validateAnnotationOnlyOnField(component, index, BsonId.class);
+            validateAnnotationOnlyOnField(component, index, BsonProperty.class);
+            validateAnnotationOnlyOnField(component, index, BsonRepresentation.class);
         }
 
         private static <T extends Annotation> void validateAnnotationNotPresentOnType(final Class<?> clazz,

bson-record-codec/src/test/unit/org/bson/codecs/record/RecordCodecTest.java

@@ -32,7 +32,6 @@
 import org.bson.codecs.configuration.CodecRegistry;
 import org.bson.codecs.record.samples.TestRecordEmbedded;
 import org.bson.codecs.record.samples.TestRecordParameterized;
-import org.bson.codecs.record.samples.TestRecordWithDeprecatedAnnotations;
 import org.bson.codecs.record.samples.TestRecordWithIllegalBsonCreatorOnConstructor;
 import org.bson.codecs.record.samples.TestRecordWithIllegalBsonCreatorOnMethod;
 import org.bson.codecs.record.samples.TestRecordWithIllegalBsonDiscriminatorOnRecord;
@@ -69,34 +68,6 @@
 
 public class RecordCodecTest {
 
-    @Test
-    public void testRecordWithDeprecatedAnnotations() {
-        var codec = createRecordCodec(TestRecordWithDeprecatedAnnotations.class, Bson.DEFAULT_CODEC_REGISTRY);
-        var identifier = new ObjectId();
-        var testRecord = new TestRecordWithDeprecatedAnnotations("Lucas", 14, List.of("soccer", "basketball"), identifier.toHexString());
-
-        var document = new BsonDocument();
-        var writer = new BsonDocumentWriter(document);
-
-        // when
-        codec.encode(writer, testRecord, EncoderContext.builder().build());
-
-        // then
-        assertEquals(
-                new BsonDocument("_id", new BsonObjectId(identifier))
-                        .append("name", new BsonString("Lucas"))
-                        .append("hobbies", new BsonArray(List.of(new BsonString("soccer"), new BsonString("basketball"))))
-                        .append("a", new BsonInt32(14)),
-                document);
-        assertEquals("_id", document.getFirstKey());
-
-        // when
-        var decoded = codec.decode(new BsonDocumentReader(document), DecoderContext.builder().build());
-
-        // then
-        assertEquals(testRecord, decoded);
-    }
-
     @Test
     public void testRecordWithPojoAnnotations() {
         var codec = createRecordCodec(TestRecordWithPojoAnnotations.class, Bson.DEFAULT_CODEC_REGISTRY);
@@ -305,9 +276,9 @@ public void testRecordWithNestedParameterizedRecordWithDifferentlyOrderedTypePar
 
     @Test
     public void testRecordWithNulls() {
-        var codec = createRecordCodec(TestRecordWithDeprecatedAnnotations.class, Bson.DEFAULT_CODEC_REGISTRY);
+        var codec = createRecordCodec(TestRecordWithPojoAnnotations.class, Bson.DEFAULT_CODEC_REGISTRY);
         var identifier = new ObjectId();
-        var testRecord = new TestRecordWithDeprecatedAnnotations(null, 14, null, identifier.toHexString());
+        var testRecord = new TestRecordWithPojoAnnotations(null, 14, null, identifier.toHexString());
 
         var document = new BsonDocument();
         var writer = new BsonDocumentWriter(document);
@@ -359,9 +330,9 @@ public void testExceptionsWithStoredNullsOnPrimitiveField() {
 
     @Test
     public void testRecordWithExtraData() {
-        var codec = createRecordCodec(TestRecordWithDeprecatedAnnotations.class, Bson.DEFAULT_CODEC_REGISTRY);
+        var codec = createRecordCodec(TestRecordWithPojoAnnotations.class, Bson.DEFAULT_CODEC_REGISTRY);
         var identifier = new ObjectId();
-        var testRecord = new TestRecordWithDeprecatedAnnotations("Felix", 13, List.of("rugby", "badminton"), identifier.toHexString());
+        var testRecord = new TestRecordWithPojoAnnotations("Felix", 13, List.of("rugby", "badminton"), identifier.toHexString());
 
         var document = new BsonDocument("_id", new BsonObjectId(identifier))
                 .append("nationality", new BsonString("British"))

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

@@ -31,37 +31,16 @@
 
 /**
  * Encodes and decodes {@code Iterable} objects.
- *
- * @since 3.3
- * @deprecated Prefer {@link CollectionCodecProvider}
  */
-@Deprecated
 @SuppressWarnings("rawtypes")
-public class IterableCodec implements Codec<Iterable>, OverridableUuidRepresentationCodec<Iterable> {
+class IterableCodec implements Codec<Iterable>, OverridableUuidRepresentationCodec<Iterable> {
 
     private final CodecRegistry registry;
     private final BsonTypeCodecMap bsonTypeCodecMap;
     private final Transformer valueTransformer;
     private final UuidRepresentation uuidRepresentation;
 
-    /**
-     * Construct a new instance with the given {@code CodecRegistry} and {@code BsonTypeClassMap}.
-     *
-     * @param registry the non-null codec registry
-     * @param bsonTypeClassMap the non-null BsonTypeClassMap
-     */
-    public IterableCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap) {
-        this(registry, bsonTypeClassMap, null);
-    }
-
-    /**
-     * Construct a new instance with the given {@code CodecRegistry} and {@code BsonTypeClassMap}.
-     *
-     * @param registry the non-null codec registry
-     * @param bsonTypeClassMap the non-null BsonTypeClassMap
-     * @param valueTransformer the value Transformer
-     */
-    public IterableCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap, final Transformer valueTransformer) {
+    IterableCodec(final CodecRegistry registry, final BsonTypeClassMap bsonTypeClassMap, final Transformer valueTransformer) {
         this(registry, new BsonTypeCodecMap(notNull("bsonTypeClassMap", bsonTypeClassMap), registry), valueTransformer,
                 UuidRepresentation.UNSPECIFIED);
     }