Passing domain in serializer registry

Author: papafe

src/MongoDB.Bson/Serialization/BsonClassMapSerializationProvider.cs

@@ -41,7 +41,7 @@ public override IBsonSerializer GetSerializer(Type type, IBsonSerializerRegistry
                 !typeof(Array).GetTypeInfo().IsAssignableFrom(type) &&
                 !typeof(Enum).GetTypeInfo().IsAssignableFrom(type))
             {
-                var classMap = BsonClassMap.LookupClassMap(type);  //TODO We need to find a way to pass the domain here
+                var classMap = serializerRegistry.SerializationDomain.BsonClassMap.LookupClassMap(type);
                 var classMapSerializerDefinition = typeof(BsonClassMapSerializer<>);
                 var classMapSerializerType = classMapSerializerDefinition.MakeGenericType(type);
                 return (IBsonSerializer)Activator.CreateInstance(classMapSerializerType, classMap);

src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs

@@ -798,7 +798,7 @@ public void Dispose()
         // private methods
         private void CreateSerializerRegistry()
         {
-            _serializerRegistry = new BsonSerializerRegistry();
+            _serializerRegistry = new BsonSerializerRegistry(this);
             _typeMappingSerializationProvider = new TypeMappingSerializationProvider();
 
             // order matters. It's in reverse order of how they'll get consumed

src/MongoDB.Bson/Serialization/BsonSerializerRegistry.cs

@@ -28,19 +28,35 @@ public sealed class BsonSerializerRegistry : IBsonSerializerRegistry
         private readonly ConcurrentDictionary<Type, IBsonSerializer> _cache;
         private readonly ConcurrentStack<IBsonSerializationProvider> _serializationProviders;
         private readonly Func<Type, IBsonSerializer> _createSerializer;
+        private readonly IBsonSerializationDomain _serializationDomain;
 
         // constructors
         /// <summary>
         /// Initializes a new instance of the <see cref="BsonSerializerRegistry"/> class.
         /// </summary>
-        public BsonSerializerRegistry()
+        public BsonSerializerRegistry():
+            this(BsonSerializer.DefaultDomain)
+        {
+        }
+
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        /// <param name="serializationDomain"></param>
+        public BsonSerializerRegistry(IBsonSerializationDomain serializationDomain)
         {
             _cache = new ConcurrentDictionary<Type, IBsonSerializer>();
             _serializationProviders = new ConcurrentStack<IBsonSerializationProvider>();
             _createSerializer = CreateSerializer;
+            _serializationDomain = serializationDomain;
         }
 
         // public methods
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        public IBsonSerializationDomain SerializationDomain => _serializationDomain;
+
         /// <summary>
         /// Gets the serializer for the specified <paramref name="type" />.
         /// If none is already registered, the serialization providers will be used to create a serializer and it will be automatically registered.

src/MongoDB.Bson/Serialization/IBsonSerializerRegistry.cs

@@ -22,6 +22,11 @@ namespace MongoDB.Bson.Serialization
     /// </summary>
     public interface IBsonSerializerRegistry
     {
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        public IBsonSerializationDomain SerializationDomain { get; }
+
         /// <summary>
         /// Gets the serializer for the specified <paramref name="type"/>.
         /// </summary>

src/MongoDB.Driver/MongoCollectionSettings.cs

@@ -117,7 +117,7 @@ public ReadPreference ReadPreference
         /// <summary>
         /// Gets the serializer registry.
         /// </summary>
-        public IBsonSerializerRegistry SerializerRegistry => SerializationDomain.SerializerRegistry;
+        public IBsonSerializerRegistry SerializerRegistry => SerializationDomain.SerializerRegistry;  //TODO We should try passing down the domain instead of the registry...
 
         /// <summary>
         /// //TODO

tests/MongoDB.Driver.Tests/MultipleRegistriesTests.cs

@@ -27,25 +27,26 @@ public class MultipleRegistriesTests
         [Fact]
         public void TestSerialization()
         {
-            // At the moment having this uncommented would make the test fail due to the static caching of class maps
-            // {
-            //     var client = DriverTestConfiguration.CreateMongoClient();
-            //     var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
-            //     db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName);
-            //     var collection = db.GetCollection<Person>(DriverTestConfiguration.CollectionNamespace.CollectionName);
-            //     var bsonCollection =
-            //         db.GetCollection<BsonDocument>(DriverTestConfiguration.CollectionNamespace.CollectionName);
-            //
-            //     var person = new Person { Id = ObjectId.Parse("6797b56bf5495bf53aa3078f"), Name = "Mario", Age = 24 };
-            //     collection.InsertOne(person);
-            //
-            //     var retrieved = bsonCollection.FindSync("{}").ToList().Single();
-            //     var toString = retrieved.ToString();
-            //
-            //     var expectedVal =
-            //         """{ "_id" : { "$oid" : "6797b56bf5495bf53aa3078f" }, "Name" : "Mario", "Age" : 24 }""";
-            //     Assert.Equal(expectedVal, toString);
-            // }
+            {
+                var client = DriverTestConfiguration.CreateMongoClient();
+                var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
+                db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName);
+                var collection = db.GetCollection<Person>(DriverTestConfiguration.CollectionNamespace.CollectionName);
+                var bsonCollection =
+                    db.GetCollection<BsonDocument>(DriverTestConfiguration.CollectionNamespace.CollectionName);
+
+                var person = new Person { Id = ObjectId.Parse("6797b56bf5495bf53aa3078f"), Name = "Mario", Age = 24 };
+                collection.InsertOne(person);
+
+                var retrieved = bsonCollection.FindSync("{}").ToList().Single();
+                var toString = retrieved.ToString();
+
+                var expectedVal =
+                    """{ "_id" : { "$oid" : "6797b56bf5495bf53aa3078f" }, "Name" : "Mario", "Age" : 24 }""";
+                Assert.Equal(expectedVal, toString);
+            }
+
+            //The first section demonstrates that the class maps are also separated
 
             {
                 var customDomain = BsonSerializer.CreateDomain();