Small fixes

Author: papafe

src/MongoDB.Bson/IO/BsonBinaryWriterSettings.cs

@@ -15,7 +15,6 @@
 
 using System;
 using System.Text;
-using MongoDB.Bson.Serialization;
 
 namespace MongoDB.Bson.IO
 {

src/MongoDB.Bson/ObjectModel/BsonDocumentWrapper.cs

@@ -188,8 +188,6 @@ public static IEnumerable<BsonDocumentWrapper> CreateMultiple(Type nominalType,
             return values.Cast<object>().Select(v => new BsonDocumentWrapper(v, serializer));
         }
 
-
-
         // public methods
         /// <summary>
         /// Creates a shallow clone of the document (see also DeepClone).

src/MongoDB.Bson/Serialization/BsonDeserializationContext.cs

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

src/MongoDB.Bson/Serialization/BsonSerializationContext.cs

@@ -31,12 +31,11 @@ public class BsonSerializationContext
         // constructors
         private BsonSerializationContext(
             IBsonWriter writer,
-            Func<Type, bool> isDynamicType,
-            IBsonSerializationDomain domain)
+            Func<Type, bool> isDynamicType)
         {
             _writer = writer;
             _isDynamicType = isDynamicType;
-            _domain = writer.Settings.SerializationDomain ?? BsonSerializer.DefaultDomain;  //TODO This is to simplify finding errors
+            _domain = writer.Settings.SerializationDomain ?? BsonSerializer.DefaultDomain;
         }
 
         // public properties
@@ -114,7 +113,6 @@ public class Builder
             // private fields
             private Func<Type, bool> _isDynamicType;
             private IBsonWriter _writer;
-            private IBsonSerializationDomain _domain;  //TODO Maybe we can remove this...
 
             // constructors
             internal Builder(BsonSerializationContext other, IBsonWriter writer)
@@ -137,15 +135,6 @@ internal Builder(BsonSerializationContext other, IBsonWriter writer)
                 }
             }
 
-            /// <summary>
-            /// //TODO
-            /// </summary>
-            public IBsonSerializationDomain Domain
-            {
-                get => _domain;
-                set => _domain = value;
-            }
-
             // properties
             /// <summary>
             /// Gets or sets the function used to determine if a type is a dynamic type.
@@ -174,7 +163,7 @@ public IBsonWriter Writer
             /// <returns>A BsonSerializationContext.</returns>
             internal BsonSerializationContext Build()
             {
-                return new BsonSerializationContext(_writer, _isDynamicType, _domain);
+                return new BsonSerializationContext(_writer, _isDynamicType);
             }
         }
     }

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

@@ -83,10 +83,6 @@ protected int? MaxWireDocumentSize
             }
         }
 
-        protected IBsonSerializationDomain SerializationDomain =>
-            _encoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain,
-                null);
-
         // methods
         public BsonBinaryReader CreateBinaryReader()
         {

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

@@ -38,10 +38,6 @@ protected MessageJsonEncoderBase(TextReader textReader, TextWriter textWriter, M
             _encoderSettings = encoderSettings;
         }
 
-        protected IBsonSerializationDomain SerializationDomain =>
-            _encoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain,
-                null);
-
         // methods
         public JsonReader CreateJsonReader()
         {
@@ -70,6 +66,8 @@ public JsonWriter CreateJsonWriter()
                 writerSettings.NewLineChars = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.NewLineChars, "");
                 writerSettings.OutputMode = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.OutputMode, JsonOutputMode.Shell);
                 writerSettings.ShellVersion = _encoderSettings.GetOrDefault(MessageEncoderSettingsName.ShellVersion, new Version(2, 6, 0));
+                writerSettings.SerializationDomain =
+                    _encoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null); //TODO Using null here to find issues faster
             }
             return new JsonWriter(_textWriter, writerSettings);
         }

tests/MongoDB.Driver.Tests/MultipleRegistriesTests.cs

@@ -27,8 +27,9 @@ public class MultipleRegistriesTests
         [Fact]
         public void GeneralTest()
         {
+            // At the moment having this uncommented would make the test fail due to the static caching of class maps
             // {
-            //     var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = BsonSerializer.DefaultDomain);
+            //     var client = DriverTestConfiguration.CreateMongoClient();
             //     var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
             //     db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName);
             //     var collection = db.GetCollection<Person>(DriverTestConfiguration.CollectionNamespace.CollectionName);
@@ -49,7 +50,6 @@ public void GeneralTest()
             {
                 var customDomain = BsonSerializer.CreateDomain();
                 customDomain.RegisterSerializer(new CustomStringSerializer());
-                var registered = customDomain.LookupSerializer<string>();
 
                 var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = customDomain);
                 var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
@@ -77,7 +77,7 @@ public class Person
             public int Age { get; set; }
         }
 
-        public class CustomStringSerializer : SealedClassSerializerBase<string>
+        public class CustomStringSerializer : SealedClassSerializerBase<string> //This serializer just adds "test" to any serialised string
         {
             /// <inheritdoc/>
             public override int GetHashCode() => 0;