First test passing

Author: papafe

src/MongoDB.Bson/IO/BsonBinaryWriterSettings.cs

@@ -15,6 +15,7 @@
 
 using System;
 using System.Text;
+using MongoDB.Bson.Serialization;
 
 namespace MongoDB.Bson.IO
 {
@@ -122,7 +123,8 @@ protected override BsonWriterSettings CloneImplementation()
                 Encoding = _encoding,
                 FixOldBinarySubTypeOnOutput = _fixOldBinarySubTypeOnOutput,
                 MaxDocumentSize = _maxDocumentSize,
-                MaxSerializationDepth = MaxSerializationDepth
+                MaxSerializationDepth = MaxSerializationDepth,
+                SerializationDomain = SerializationDomain,
             };
             return clone;
         }

src/MongoDB.Bson/IO/BsonWriterSettings.cs

@@ -14,6 +14,7 @@
 */
 
 using System;
+using MongoDB.Bson.Serialization;
 
 namespace MongoDB.Bson.IO
 {
@@ -25,6 +26,7 @@ public abstract class BsonWriterSettings
         // private fields
         private bool _isFrozen;
         private int _maxSerializationDepth = BsonDefaults.MaxSerializationDepth;
+        private IBsonSerializationDomain _serializationDomain;
 
         // constructors
         /// <summary>
@@ -92,6 +94,19 @@ public BsonWriterSettings FrozenCopy()
             }
         }
 
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        public IBsonSerializationDomain SerializationDomain
+        {
+            get => _serializationDomain;
+            set
+            {
+                if (_isFrozen) { ThrowFrozenException(); }
+                _serializationDomain = value;
+            }
+        }
+
         // protected methods
         /// <summary>
         /// Creates a clone of the settings.

src/MongoDB.Bson/Serialization/BsonDeserializationContext.cs

@@ -44,7 +44,8 @@ private BsonDeserializationContext(
             _allowDuplicateElementNames = allowDuplicateElementNames;
             _dynamicArraySerializer = dynamicArraySerializer;
             _dynamicDocumentSerializer = dynamicDocumentSerializer;
-            _domain = domain ?? BsonSerializer.DefaultDomain;
+            _domain = domain;
+            //_domain = domain ?? BsonSerializer.DefaultDomain;  //TODO This is to simplify finding errors
         }
 
         // public properties

src/MongoDB.Bson/Serialization/BsonMemberMap.cs

@@ -336,7 +336,7 @@ public IBsonSerializer GetSerializer(IBsonSerializationDomain domain)
                 }
                 else
                 {
-                    _serializer = BsonSerializer.LookupSerializer(_memberType); //TODO ??
+                    _serializer = domain.LookupSerializer(_memberType);
                 }
             }
             return _serializer;

src/MongoDB.Bson/Serialization/BsonSerializationContext.cs

@@ -36,7 +36,7 @@ private BsonSerializationContext(
         {
             _writer = writer;
             _isDynamicType = isDynamicType;
-            _domain = domain ?? BsonSerializer.DefaultDomain;
+            _domain = writer.Settings.SerializationDomain ?? BsonSerializer.DefaultDomain;  //TODO This is to simplify finding errors
         }
 
         // public properties
@@ -114,7 +114,7 @@ public class Builder
             // private fields
             private Func<Type, bool> _isDynamicType;
             private IBsonWriter _writer;
-            private IBsonSerializationDomain _domain;
+            private IBsonSerializationDomain _domain;  //TODO Maybe we can remove this...
 
             // constructors
             internal Builder(BsonSerializationContext other, IBsonWriter writer)

src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs

@@ -42,12 +42,15 @@ internal class BsonSerializationDomain : IBsonSerializationDomainInternal, IDisp
         private bool __useZeroIdChecker = false;
 
         // constructor
-        public BsonSerializationDomain()
+        public BsonSerializationDomain(string name = null) //TODO for testing
         {
             CreateSerializerRegistry();
             RegisterIdGenerators();
+            Name = name ?? "CUSTOM";
         }
 
+        public string Name { get; private set; }
+
         // public properties
         /// <summary>
         /// Gets the serializer registry.

src/MongoDB.Bson/Serialization/BsonSerializer.cs

@@ -31,7 +31,7 @@ public static class BsonSerializer
         // static constructor
         static BsonSerializer()
         {
-            _domain = new BsonSerializationDomain();
+            _domain = new BsonSerializationDomain("MAIN");
         }
 
         /// <summary>

src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/BinaryEncoders/MessageBinaryEncoderBase.cs

@@ -17,6 +17,7 @@
 using System.Text;
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
+using MongoDB.Bson.Serialization;
 using MongoDB.Driver.Core.Misc;
 
 namespace MongoDB.Driver.Core.WireProtocol.Messages.Encoders.BinaryEncoders
@@ -82,6 +83,10 @@ protected int? MaxWireDocumentSize
             }
         }
 
+        protected IBsonSerializationDomain SerializationDomain =>
+            _encoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain,
+                null);
+
         // methods
         public BsonBinaryReader CreateBinaryReader()
         {
@@ -102,6 +107,8 @@ public BsonBinaryWriter CreateBinaryWriter()
                 writerSettings.Encoding = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.WriteEncoding, writerSettings.Encoding);
                 writerSettings.MaxDocumentSize = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.MaxDocumentSize, writerSettings.MaxDocumentSize);
                 writerSettings.MaxSerializationDepth = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.MaxSerializationDepth, writerSettings.MaxSerializationDepth);
+                writerSettings.SerializationDomain =
+                    _encoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null); //TODO Using null here to find issues faster
             }
             return new BsonBinaryWriter(_stream, writerSettings);
         }

src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/JsonEncoders/MessageJsonEncoderBase.cs

@@ -17,6 +17,7 @@
 using System.IO;
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
+using MongoDB.Bson.Serialization;
 using MongoDB.Driver.Core.Misc;
 
 namespace MongoDB.Driver.Core.WireProtocol.Messages.Encoders.JsonEncoders
@@ -37,6 +38,10 @@ protected MessageJsonEncoderBase(TextReader textReader, TextWriter textWriter, M
             _encoderSettings = encoderSettings;
         }
 
+        protected IBsonSerializationDomain SerializationDomain =>
+            _encoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain,
+                null);
+
         // methods
         public JsonReader CreateJsonReader()
         {

src/MongoDB.Driver/MongoClientSettings.cs

@@ -945,6 +945,7 @@ public MongoClientSettings Clone()
             clone._retryReads = _retryReads;
             clone._retryWrites = _retryWrites;
             clone._scheme = _scheme;
+            clone._serializationDomain = _serializationDomain;
             clone._serverApi = _serverApi;
             clone._servers = new List<MongoServerAddress>(_servers);
             clone._serverMonitoringMode = _serverMonitoringMode;