CSHARP-5456: BsonGuidRepresentation does not work with Nullable (#1591)

Author: papafe

src/MongoDB.Bson/Serialization/Attributes/BsonDateOnlyOptionsAttribute.cs

@@ -61,10 +61,12 @@ public BsonDateOnlyOptionsAttribute(BsonType representation, DateOnlyDocumentFor
         /// <returns>A reconfigured serializer.</returns>
         protected override IBsonSerializer Apply(IBsonSerializer serializer)
         {
-            return SerializerConfigurator.ReconfigureSerializerRecursively(serializer, Reconfigure) ?? base.Apply(serializer);
+            if (serializer is DateOnlySerializer dateOnlySerializer)
+            {
+                return dateOnlySerializer.WithRepresentation(_representation, _documentFormat);
+            }
 
-            IBsonSerializer Reconfigure(IBsonSerializer s)
-                => s is DateOnlySerializer dos ? dos.WithRepresentation(_representation, _documentFormat) : null;
+            return base.Apply(serializer);
         }
     }
 #endif

src/MongoDB.Bson/Serialization/Attributes/BsonGuidRepresentationAttribute.cs

@@ -22,7 +22,7 @@ namespace MongoDB.Bson.Serialization.Attributes
     /// Specifies the Guid representation to use with the GuidSerializer for this member.
     /// </summary>
     [AttributeUsage(AttributeTargets.Property | AttributeTargets.Field)]
-    public class BsonGuidRepresentationAttribute : Attribute, IBsonMemberMapAttribute
+    public class BsonGuidRepresentationAttribute : BsonSerializationOptionsAttribute
     {
         // private fields
         private readonly GuidRepresentation _guidRepresentation;
@@ -46,17 +46,16 @@ public GuidRepresentation GuidRepresentation
             get { return _guidRepresentation; }
         }
 
-        // public methods
+        // protected methods
         /// <inheritdoc/>
-        public void Apply(BsonMemberMap memberMap)
+        protected override IBsonSerializer Apply(IBsonSerializer serializer)
         {
-            var guidSerializer = memberMap.GetSerializer() as GuidSerializer;
-            if (guidSerializer == null)
+            if (serializer is GuidSerializer guidSerializer)
             {
-                throw new InvalidOperationException("[BsonGuidRepresentationAttribute] can only be used when the serializer is a GuidSerializer.");
+                return guidSerializer.WithGuidRepresentation(_guidRepresentation);
             }
-            var reconfiguredGuidSerializer = guidSerializer.WithGuidRepresentation(_guidRepresentation);
-            memberMap.SetSerializer(reconfiguredGuidSerializer);
+
+            return base.Apply(serializer);
         }
     }
 }

src/MongoDB.Bson/Serialization/Attributes/BsonSerializationOptionsAttribute.cs

@@ -52,18 +52,16 @@ public virtual void Apply(BsonMemberMap memberMap)
         protected virtual IBsonSerializer Apply(IBsonSerializer serializer)
         {
             // if none of the overrides applied the attribute to the serializer see if it can be applied to a child serializer
-            var childSerializerConfigurable = serializer as IChildSerializerConfigurable;
-            if (childSerializerConfigurable != null)
+            if (serializer is IChildSerializerConfigurable childSerializerConfigurable)
             {
                 var childSerializer = childSerializerConfigurable.ChildSerializer;
                 var reconfiguredChildSerializer = Apply(childSerializer);
                 return childSerializerConfigurable.WithChildSerializer(reconfiguredChildSerializer);
             }
 
-            var message = string.Format(
-                "A serializer of type '{0}' is not configurable using an attribute of type '{1}'.",
-                BsonUtils.GetFriendlyTypeName(serializer.GetType()),
-                BsonUtils.GetFriendlyTypeName(this.GetType()));
+            var message =
+                $"A serializer of type '{BsonUtils.GetFriendlyTypeName(serializer.GetType())}' is not configurable" +
+                $" using an attribute of type '{BsonUtils.GetFriendlyTypeName(GetType())}'.";
             throw new NotSupportedException(message);
         }
     }

tests/MongoDB.Driver.Tests/Specifications/uuid/prose-tests/ImplicitEncodingTests.cs

@@ -18,7 +18,6 @@
 using FluentAssertions;
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization.Attributes;
-using MongoDB.Bson.TestHelpers;
 using Xunit;
 
 namespace MongoDB.Driver.Tests.Specifications.uuid.prose_tests
@@ -114,6 +113,31 @@ public void Implicit_encoding_with_unspecified_representation_should_work_as_exp
             exception.Should().BeOfType<BsonSerializationException>();
         }
 
+        [Fact]
+        public void Implicit_encoding_with_nullable_or_array_guid_should_work_as_expected()
+        {
+            var collection = GetCollection<ClassWithNullableAndArrayGuid>();
+            var guid = Guid.Parse("00112233445566778899aabbccddeeff");
+            var document = new ClassWithNullableAndArrayGuid { Id = guid, GuidArray = [guid] };
+
+            DropCollection(collection);
+            collection.InsertOne(document);
+
+            var insertedDocument = FindSingleDocument(collection);
+            insertedDocument.Id.Should().Be(guid);
+            insertedDocument.GuidArray[0].Should().Be(guid);
+
+            var insertedDocumentAsBsonDocument = FindSingleDocumentAsBsonDocument(collection);
+            var binaryData = (BsonBinaryData)insertedDocumentAsBsonDocument["_id"];
+            binaryData.SubType.Should().Be(BsonBinarySubType.UuidStandard);
+            binaryData.Bytes.Should().Equal(0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb,
+                0xcc, 0xdd, 0xee, 0xff);
+            var binaryData2 = (BsonBinaryData)((BsonArray)insertedDocumentAsBsonDocument["GuidArray"])[0];
+            binaryData2.SubType.Should().Be(BsonBinarySubType.UuidStandard);
+            binaryData2.Bytes.Should().Equal(0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb,
+                0xcc, 0xdd, 0xee, 0xff);
+        }
+
         // private methods
         private void DropCollection<TDocument>(IMongoCollection<TDocument> collection)
         {
@@ -171,5 +195,14 @@ private class ClassWithGuidIdUsingUnspecifiedRepresentation
             [BsonGuidRepresentation(GuidRepresentation.Unspecified)]
             public Guid Id { get; set; }
         }
+
+        private class ClassWithNullableAndArrayGuid
+        {
+            [BsonGuidRepresentation(GuidRepresentation.Standard)]
+            public Guid? Id { get; set; }
+
+            [BsonGuidRepresentation(GuidRepresentation.Standard)]
+            public Guid[] GuidArray { get; set; }
+        }
     }
 }