Fixed BsonClassMap.Freeze and Convention Apply

Author: papafe

src/MongoDB.Bson/ObjectModel/BsonDocumentWrapper.cs

@@ -124,7 +124,7 @@ public static BsonDocumentWrapper Create(Type nominalType, object value) =>
         /// <returns></returns>
         public static BsonDocumentWrapper Create(Type nominalType, object value, IBsonSerializationDomain domain)
         {
-            var serializer = domain.LookupSerializer(nominalType);  //TODO ??
+            var serializer = domain.LookupSerializer(nominalType);
             return new BsonDocumentWrapper(value, serializer);
         }
 

src/MongoDB.Bson/Serialization/BsonClassMap.cs

@@ -420,7 +420,7 @@ internal BsonClassMap Freeze(IBsonSerializationDomainInternal domain)
             return Freeze(freezeContext);
         }
 
-        private BsonClassMap Freeze(FreezeContext context)  //TODO This is not completely correct, because LookupClassMap calls freeze
+        private BsonClassMap Freeze(FreezeContext context)
         {
             var configLock = context.SerializationDomain!.ConfigLock;
             configLock.EnterReadLock();
@@ -451,7 +451,7 @@ private BsonClassMap Freeze(FreezeContext context)  //TODO This is not completel
                             {
                                 _baseClassMap = context.SerializationDomain.BsonClassMap.LookupClassMap(baseType);
                             }
-                            _baseClassMap.Freeze(context);  //TODO This is not necessary, because LookupClassMap will only return a frozen class map
+                            _baseClassMap.Freeze(context);
                             _discriminatorIsRequired |= _baseClassMap._discriminatorIsRequired;
                             _hasRootClass |= (_isRootClass || _baseClassMap.HasRootClass);
                             _allMemberMaps.AddRange(_baseClassMap.AllMemberMaps);
@@ -1229,7 +1229,7 @@ internal IDiscriminatorConvention GetDiscriminatorConvention()
         private void AutoMapClass(IBsonSerializationDomain serializationDomain)
         {
             var conventionPack = serializationDomain.ConventionRegistry.Lookup(_classType);
-            new ConventionRunner(conventionPack).Apply(this);
+            new ConventionRunner(conventionPack).Apply(this, serializationDomain);
 
             foreach (var memberMap in _declaredMemberMaps)
             {

src/MongoDB.Bson/Serialization/Conventions/ConventionRunner.cs

@@ -47,7 +47,9 @@ public ConventionRunner(IConventionPack conventions)
         /// Applies a modification to the class map.
         /// </summary>
         /// <param name="classMap">The class map.</param>
-        public void Apply(BsonClassMap classMap)
+        public void Apply(BsonClassMap classMap) => Apply(classMap, BsonSerializer.DefaultSerializationDomain);
+
+        internal void Apply(BsonClassMap classMap, IBsonSerializationDomain serializationDomain)
         {
             foreach (var convention in _conventions.OfType<IClassMapConvention>())
             {
@@ -58,7 +60,7 @@ public void Apply(BsonClassMap classMap)
             {
                 foreach (var memberMap in classMap.DeclaredMemberMaps)
                 {
-                    convention.Apply(memberMap);
+                    convention.Apply(memberMap, serializationDomain);
                 }
             }
 
@@ -72,7 +74,7 @@ public void Apply(BsonClassMap classMap)
 
             foreach (var convention in _conventions.OfType<IPostProcessingConvention>())
             {
-                convention.PostProcess(classMap);
+                convention.PostProcess(classMap, serializationDomain);
             }
         }
     }

src/MongoDB.Bson/Serialization/Serializers/DiscriminatedInterfaceSerializer.cs

@@ -48,7 +48,7 @@ private static IBsonSerializer<TInterface> CreateInterfaceSerializer(IBsonSerial
             var classMap = (BsonClassMap)Activator.CreateInstance(classMapType);
             classMap.AutoMap();
             classMap.SetDiscriminatorConvention(serializationDomain.LookupDiscriminatorConvention(typeof(TInterface)));
-            classMap.Freeze();
+            classMap.Freeze(serializationDomain as IBsonSerializationDomainInternal);
             return new BsonClassMapSerializer<TInterface>(classMap);
         }
         #endregion

tests/MongoDB.Driver.Tests/MultipleRegistriesTests.cs

@@ -17,16 +17,20 @@
 using MongoDB.Bson;
 using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Attributes;
+using MongoDB.Bson.Serialization.Conventions;
 using MongoDB.Bson.Serialization.Serializers;
+using MongoDB.Driver.Core.TestHelpers.XunitExtensions;
 using Xunit;
 
 namespace MongoDB.Driver.Tests
 {
     public class MultipleRegistriesTests
     {
-        //[Fact]
+        [Fact]
         public void TestSerialization()
         {
+            RequireServer.Check();
+
             {
                 var client = DriverTestConfiguration.CreateMongoClient();
                 var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
@@ -73,9 +77,11 @@ public void TestSerialization()
             }
         }
 
-        //[Fact]
+        [Fact]
         public void TestDeserialization()
         {
+            RequireServer.Check();
+
             {
                 var client = DriverTestConfiguration.CreateMongoClient();
                 var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
@@ -99,9 +105,11 @@ public void TestDeserialization()
             }
         }
 
-        //[Fact]
+        [Fact]
         public void TestLinq()
         {
+            RequireServer.Check();
+
             var customDomain = BsonSerializer.CreateSerializationDomain();
             customDomain.RegisterSerializer(new CustomStringSerializer());
 
@@ -125,6 +133,40 @@ public void TestLinq()
             Assert.NotEmpty(retrievedTyped);
         }
 
+        [Fact]
+        public void TestConventions()
+        {
+            RequireServer.Check();
+
+            var customDomain = BsonSerializer.CreateSerializationDomain();
+
+            // Register an id generator convention that uses a custom ObjectIdGenerator
+            customDomain.RegisterIdGenerator(typeof(ObjectId), new CustomObjectIdGenerator());
+
+            //Register a convention to use lowercase for all fields on the Person class
+            var pack = new ConventionPack();
+            pack.AddMemberMapConvention(
+                "LowerCaseElementName",
+                m => m.SetElementName(m.MemberName.ToLower()));
+            customDomain.ConventionRegistry.Register("myPack", pack, t => t == typeof(Person));
+
+            var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = customDomain);
+            var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
+            db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName);
+            var collection = db.GetCollection<Person>(DriverTestConfiguration.CollectionNamespace.CollectionName);
+            var untypedCollection = db.GetCollection<BsonDocument>(DriverTestConfiguration.CollectionNamespace.CollectionName);
+
+            var person = new Person { Name = "Mario", Age = 24 };  //Id is not set, so the custom ObjectIdGenerator should be used
+            collection.InsertOne(person);
+
+            var retrievedAsBson = untypedCollection.FindSync("{}").ToList().Single();
+            var toString = retrievedAsBson.ToString();
+
+            var expectedVal =
+                """{ "_id" : { "$oid" : "6797b56bf5495bf53aa3078f" }, "name" : "Mario", "age" : 24 }""";
+            Assert.Equal(expectedVal, toString);
+        }
+
         public class Person
         {
             [BsonId] public ObjectId Id { get; set; }
@@ -174,5 +216,18 @@ protected override void SerializeValue(BsonSerializationContext context, BsonSer
                 bsonWriter.WriteString(value + "test");
             }
         }
+
+        public class CustomObjectIdGenerator : IIdGenerator
+        {
+            public object GenerateId(object container, object document)
+            {
+                return ObjectId.Parse("6797b56bf5495bf53aa3078f");
+            }
+
+            public bool IsEmpty(object id)
+            {
+                return true;
+            }
+        }
     }
 }