Removed serialization domain from reader and added to deserializationContext

Author: papafe

src/MongoDB.Bson/IO/BsonBinaryReaderSettings.cs

@@ -137,7 +137,6 @@ protected override BsonReaderSettings CloneImplementation()
                 FixOldBinarySubTypeOnInput = _fixOldBinarySubTypeOnInput,
                 FixOldDateTimeMaxValueOnInput = _fixOldDateTimeMaxValueOnInput,
                 MaxDocumentSize = _maxDocumentSize,
-                SerializationDomain = SerializationDomain
             };
 
             return clone;

src/MongoDB.Bson/IO/BsonDocumentReaderSettings.cs

@@ -67,7 +67,7 @@ public static BsonDocumentReaderSettings Defaults
         /// <returns>A clone of the settings.</returns>
         protected override BsonReaderSettings CloneImplementation()
         {
-            var clone = new BsonDocumentReaderSettings { SerializationDomain = SerializationDomain }; //TODO This can be improved
+            var clone = new BsonDocumentReaderSettings();
             return clone;
         }
     }

src/MongoDB.Bson/IO/BsonReader.cs

@@ -25,7 +25,7 @@ namespace MongoDB.Bson.IO
     /// <summary>
     /// Represents a BSON reader for some external format (see subclasses).
     /// </summary>
-    public abstract class BsonReader : IBsonReaderInternal
+    public abstract class BsonReader : IBsonReader
     {
         // private fields
         private bool _disposed = false;

src/MongoDB.Bson/IO/BsonReaderSettings.cs

@@ -25,7 +25,6 @@ public abstract class BsonReaderSettings
     {
         // private fields
         private bool _isFrozen;
-        private IBsonSerializationDomain _serializationDomain;
 
         // constructors
         /// <summary>
@@ -79,16 +78,6 @@ public BsonReaderSettings FrozenCopy()
             }
         }
 
-        internal IBsonSerializationDomain SerializationDomain
-        {
-            get => _serializationDomain;
-            set
-            {
-                if (_isFrozen) { ThrowFrozenException(); }
-                _serializationDomain = value;
-            }
-        }
-
         // protected methods
         /// <summary>
         /// Creates a clone of the settings.

src/MongoDB.Bson/IO/IBsonReader.cs

@@ -17,6 +17,7 @@
 
 namespace MongoDB.Bson.IO
 {
+    //FP This interface should have the settingg property as well, same way it's done for thr writer
     /// <summary>
     /// Represents a BSON reader.
     /// </summary>
@@ -256,13 +257,4 @@ public interface IBsonReader : IDisposable
         /// </summary>
         void SkipValue();
     }
-
-    internal interface IBsonReaderInternal : IBsonReader
-    {
-        //TODO I'm not sure why this was not already present, there is already an equivalent in IBsonWriter.
-        /// <summary>
-        /// Gets the settings of the reader.
-        /// </summary>
-        BsonReaderSettings Settings { get; }
-    }
 }

src/MongoDB.Bson/IO/JsonReaderSettings.cs

@@ -68,7 +68,7 @@ public static JsonReaderSettings Defaults
         /// <returns>A clone of the settings.</returns>
         protected override BsonReaderSettings CloneImplementation()
         {
-            var clone = new JsonReaderSettings { SerializationDomain = SerializationDomain }; //TODO This can be improved
+            var clone = new JsonReaderSettings();
             return clone;
         }
     }

src/MongoDB.Bson/Serialization/BsonDeserializationContext.cs

@@ -14,6 +14,7 @@
 */
 
 using System;
+using System.Net;
 using MongoDB.Bson.IO;
 
 namespace MongoDB.Bson.Serialization
@@ -33,6 +34,7 @@ public class BsonDeserializationContext
         // constructors
         private BsonDeserializationContext(
             IBsonReader reader,
+            IBsonSerializationDomain serializationDomain,
             bool allowDuplicateElementNames,
             IBsonSerializer dynamicArraySerializer,
             IBsonSerializer dynamicDocumentSerializer)
@@ -42,12 +44,8 @@ private BsonDeserializationContext(
             _dynamicArraySerializer = dynamicArraySerializer;
             _dynamicDocumentSerializer = dynamicDocumentSerializer;
 
-            if (reader is IBsonReaderInternal readerInternal)
-            {
-                _serializationDomain = readerInternal.Settings?.SerializationDomain;
-            }
-
-            _serializationDomain ??= BsonSerializer.DefaultSerializationDomain;
+            _serializationDomain = serializationDomain; //FP Using this version to find error in an easier way for now
+            //_serializationDomain = serializationDomain ?? BsonSerializer.DefaultSerializationDomain;
 
             _dynamicArraySerializer ??= _serializationDomain.BsonDefaults.DynamicArraySerializer;
             _dynamicDocumentSerializer ??= _serializationDomain.BsonDefaults.DynamicDocumentSerializer;
@@ -103,20 +101,34 @@ public IBsonReader Reader
             get { return _reader; }
         }
 
-        // public static methods
-        /// <summary>
-        /// Creates a root context.
-        /// </summary>
-        /// <param name="reader">The reader.</param>
-        /// <param name="configurator">The configurator.</param>
-        /// <returns>
-        /// A root context.
-        /// </returns>
-        public static BsonDeserializationContext CreateRoot(
+        // //DOMAIN-API We should remove this version of the CreateRoot method, and use the one that takes a serialization domain.
+        // // public static methods
+        // /// <summary>
+        // /// Creates a root context.
+        // /// </summary>
+        // /// <param name="reader">The reader.</param>
+        // /// <param name="configurator">The configurator.</param>
+        // /// <returns>
+        // /// A root context.
+        // /// </returns>
+        // public static BsonDeserializationContext CreateRoot(
+        //     IBsonReader reader,
+        //     Action<Builder> configurator = null)
+        // {
+        //     var builder = new Builder(null, reader, BsonSerializer.DefaultSerializationDomain);
+        //     if (configurator != null)
+        //     {
+        //         configurator(builder);
+        //     }
+        //     return builder.Build();
+        // }
+
+        internal static BsonDeserializationContext CreateRoot(
             IBsonReader reader,
+            IBsonSerializationDomain serializationDomain,
             Action<Builder> configurator = null)
         {
-            var builder = new Builder(null, reader);
+            var builder = new Builder(null, reader, serializationDomain);
             if (configurator != null)
             {
                 configurator(builder);
@@ -135,7 +147,7 @@ public static BsonDeserializationContext CreateRoot(
         public BsonDeserializationContext With(
             Action<Builder> configurator = null)
         {
-            var builder = new Builder(this, _reader);
+            var builder = new Builder(this, _reader, _serializationDomain);
             if (configurator != null)
             {
                 configurator(builder);
@@ -154,16 +166,18 @@ public class Builder
             private IBsonSerializer _dynamicArraySerializer;
             private IBsonSerializer _dynamicDocumentSerializer;
             private IBsonReader _reader;
+            internal IBsonSerializationDomain _serializationDomain;
 
             // constructors
-            internal Builder(BsonDeserializationContext other, IBsonReader reader)
+            internal Builder(BsonDeserializationContext other, IBsonReader reader, IBsonSerializationDomain serializationDomain)
             {
                 if (reader == null)
                 {
                     throw new ArgumentNullException("reader");
                 }
 
                 _reader = reader;
+                _serializationDomain = serializationDomain;
                 if (other != null)
                 {
                     _allowDuplicateElementNames = other.AllowDuplicateElementNames;
@@ -224,14 +238,16 @@ public IBsonReader Reader
                 get { return _reader; }
             }
 
+            internal IBsonSerializationDomain SerializationDomain => _serializationDomain;
+
             // public methods
             /// <summary>
             /// Builds the BsonDeserializationContext instance.
             /// </summary>
             /// <returns>A BsonDeserializationContext.</returns>
             internal BsonDeserializationContext Build()
             {
-                return new BsonDeserializationContext(_reader, _allowDuplicateElementNames, _dynamicArraySerializer, _dynamicDocumentSerializer);
+                return new BsonDeserializationContext(_reader, _serializationDomain, _allowDuplicateElementNames, _dynamicArraySerializer, _dynamicDocumentSerializer);
             }
         }
     }