Various fixes

Author: papafe

src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/MessageEncoderSettings.cs

@@ -41,6 +41,7 @@ internal static class MessageEncoderSettingsName
         public const string ShellVersion = nameof(ShellVersion);
 
         // other encoders (if any) might use additional settings
+        public const string SerializationDomain = nameof(SerializationDomain);
     }
 
     internal sealed class MessageEncoderSettings : IEnumerable<KeyValuePair<string, object>>

src/MongoDB.Driver/IInheritableMongoClientSettings.cs

@@ -16,6 +16,7 @@
 using System;
 using System.Text;
 using MongoDB.Bson;
+using MongoDB.Bson.Serialization;
 
 namespace MongoDB.Driver
 {
@@ -24,6 +25,7 @@ internal interface IInheritableMongoClientSettings
         ReadConcern ReadConcern { get; }
         UTF8Encoding ReadEncoding { get; }
         ReadPreference ReadPreference { get; }
+        IBsonSerializationDomain SerializationDomain { get; }
         WriteConcern WriteConcern { get; }
         UTF8Encoding WriteEncoding { get; }
     }

src/MongoDB.Driver/MongoClientSettings.cs

@@ -48,7 +48,6 @@ public class MongoClientSettings : IEquatable<MongoClientSettings>, IInheritable
         private TimeSpan _connectTimeout;
         private MongoCredential _credential;
         private bool _directConnection;
-        private IBsonSerializationDomain _domain;
         private TimeSpan _heartbeatInterval;
         private TimeSpan _heartbeatTimeout;
         private bool _ipv6;
@@ -68,6 +67,7 @@ public class MongoClientSettings : IEquatable<MongoClientSettings>, IInheritable
         private bool _retryReads;
         private bool _retryWrites;
         private ConnectionStringScheme _scheme;
+        private IBsonSerializationDomain _serializationDomain;
         private ServerApi _serverApi;
         private List<MongoServerAddress> _servers;
         private ServerMonitoringMode _serverMonitoringMode;
@@ -101,7 +101,6 @@ public MongoClientSettings()
             _compressors = new CompressorConfiguration[0];
             _connectTimeout = MongoDefaults.ConnectTimeout;
             _directConnection = false;
-            _domain = null;
             _heartbeatInterval = ServerSettings.DefaultHeartbeatInterval;
             _heartbeatTimeout = ServerSettings.DefaultHeartbeatTimeout;
             _ipv6 = false;
@@ -120,6 +119,7 @@ public MongoClientSettings()
             _retryReads = true;
             _retryWrites = true;
             _scheme = ConnectionStringScheme.MongoDB;
+            _serializationDomain = BsonSerializer.DefaultDomain;
             _serverApi = null;
             _servers = new List<MongoServerAddress> { new MongoServerAddress("localhost") };
             _serverMonitoringMode = ServerMonitoringMode.Auto;
@@ -267,23 +267,6 @@ public bool DirectConnection
             }
         }
 
-        /// <summary>
-        /// //TODO
-        /// </summary>
-        /// <exception cref="InvalidOperationException"></exception>
-        public IBsonSerializationDomain Domain
-        {
-            get
-            {
-                return _domain;
-            }
-            set
-            {
-                if (_isFrozen) { throw new InvalidOperationException("MongoClientSettings is frozen."); }
-                _domain = value;
-            }
-        }
-
         /// <summary>
         /// Gets a value indicating whether the settings have been frozen to prevent further changes.
         /// </summary>
@@ -491,6 +474,21 @@ public ReadPreference ReadPreference
             }
         }
 
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        /// <exception cref="InvalidOperationException"></exception>
+        /// <exception cref="ArgumentNullException"></exception>
+        public IBsonSerializationDomain SerializationDomain
+        {
+            get => _serializationDomain;
+            set
+            {
+                if (_isFrozen) { throw new InvalidOperationException("MongoClientSettings is frozen."); }
+                _serializationDomain = value ?? throw new ArgumentNullException(nameof(value));
+            }
+        }
+
         /// <summary>
         /// Gets or sets the name of the replica set.
         /// </summary>

src/MongoDB.Driver/MongoCollectionImpl.cs

@@ -1320,7 +1320,8 @@ private MessageEncoderSettings GetMessageEncoderSettings()
             var messageEncoderSettings = new MessageEncoderSettings
             {
                 { MessageEncoderSettingsName.ReadEncoding, _settings.ReadEncoding ?? Utf8Encodings.Strict },
-                { MessageEncoderSettingsName.WriteEncoding, _settings.WriteEncoding ?? Utf8Encodings.Strict }
+                { MessageEncoderSettingsName.WriteEncoding, _settings.WriteEncoding ?? Utf8Encodings.Strict },
+                { MessageEncoderSettingsName.SerializationDomain, _settings.SerializationDomain }
             };
 
             if (_database.Client is MongoClient mongoClient)

src/MongoDB.Driver/MongoCollectionSettings.cs

@@ -117,10 +117,7 @@ public ReadPreference ReadPreference
         /// <summary>
         /// Gets the serializer registry.
         /// </summary>
-        public IBsonSerializerRegistry SerializerRegistry =>
-            _serializationDomain.HasBeenSet
-                ? SerializationDomain.SerializerRegistry
-                : BsonSerializer.SerializerRegistry;
+        public IBsonSerializerRegistry SerializerRegistry => SerializationDomain.SerializerRegistry;
 
         /// <summary>
         /// //TODO
@@ -316,6 +313,10 @@ internal void ApplyDefaultValues(MongoDatabaseSettings databaseSettings)
             {
                 ReadPreference = databaseSettings.ReadPreference;
             }
+            if (!_serializationDomain.HasBeenSet)
+            {
+                SerializationDomain = databaseSettings.SerializationDomain;
+            }
             if (!_writeConcern.HasBeenSet)
             {
                 WriteConcern = databaseSettings.WriteConcern;

src/MongoDB.Driver/MongoDatabaseSettings.cs

@@ -33,6 +33,7 @@ public class MongoDatabaseSettings
         private Setting<ReadPreference> _readPreference;
         private Setting<WriteConcern> _writeConcern;
         private Setting<UTF8Encoding> _writeEncoding;
+        private Setting<IBsonSerializationDomain> _serializationDomain;
 
         // the following fields are set when Freeze is called
         private bool _isFrozen;
@@ -101,9 +102,23 @@ public ReadPreference ReadPreference
         /// <summary>
         /// Gets the serializer registry.
         /// </summary>
-        public IBsonSerializerRegistry SerializerRegistry
+        public IBsonSerializerRegistry SerializerRegistry => SerializationDomain.SerializerRegistry;
+
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        public IBsonSerializationDomain SerializationDomain
         {
-            get { return BsonSerializer.SerializerRegistry; }
+            get => _serializationDomain.Value;
+            set
+            {
+                if (_isFrozen) { throw new InvalidOperationException("MongoCollectionSettings is frozen."); }
+                if (value == null)
+                {
+                    throw new ArgumentNullException("value");
+                }
+                _serializationDomain.Value = value;
+            }
         }
 
         /// <summary>
@@ -275,6 +290,10 @@ internal void ApplyDefaultValues(IInheritableMongoClientSettings clientSettings)
             {
                 ReadPreference = clientSettings.ReadPreference;
             }
+            if (!_serializationDomain.HasBeenSet)
+            {
+                SerializationDomain = clientSettings.SerializationDomain;
+            }
             if (!_writeConcern.HasBeenSet)
             {
                 WriteConcern = clientSettings.WriteConcern;

tests/MongoDB.Driver.Tests/MultipleRegistriesTests.cs

@@ -28,7 +28,7 @@ public class MultipleRegistriesTests
         public void GeneralTest()
         {
             // {
-            //     var client = DriverTestConfiguration.CreateMongoClient(c => c.Domain = BsonSerializer.DefaultDomain);
+            //     var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = BsonSerializer.DefaultDomain);
             //     var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
             //     db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName);
             //     var collection = db.GetCollection<Person>(DriverTestConfiguration.CollectionNamespace.CollectionName);
@@ -50,7 +50,7 @@ public void GeneralTest()
                 var customDomain = BsonSerializer.CreateDomain();
                 customDomain.RegisterSerializer(new CustomStringSerializer());
 
-                var client = DriverTestConfiguration.CreateMongoClient(c => c.Domain = customDomain);
+                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);