Improvements

Author: papafe

src/MongoDB.Bson/BsonDefaults.cs

@@ -34,7 +34,7 @@ public static class BsonDefaults
 
         // public static properties
         /// <summary>
-        /// Gets or sets the dynamic array serializer.
+        /// Gets or sets the dynamic array serializer.  //TODO What to we do with this?
         /// </summary>
         public static IBsonSerializer DynamicArraySerializer
         {

src/MongoDB.Bson/Serialization/BsonDeserializationContext.cs

@@ -15,6 +15,8 @@
 
 using System;
 using MongoDB.Bson.IO;
+using MongoDB.Bson.Serialization.Options;
+using MongoDB.Bson.Serialization.Serializers;
 
 namespace MongoDB.Bson.Serialization
 {
@@ -28,18 +30,21 @@ public class BsonDeserializationContext
         private readonly IBsonSerializer _dynamicArraySerializer;
         private readonly IBsonSerializer _dynamicDocumentSerializer;
         private readonly IBsonReader _reader;
+        private readonly IBsonSerializationDomain _domain;
 
         // constructors
         private BsonDeserializationContext(
             IBsonReader reader,
             bool allowDuplicateElementNames,
             IBsonSerializer dynamicArraySerializer,
-            IBsonSerializer dynamicDocumentSerializer)
+            IBsonSerializer dynamicDocumentSerializer,
+            IBsonSerializationDomain domain)
         {
             _reader = reader;
             _allowDuplicateElementNames = allowDuplicateElementNames;
             _dynamicArraySerializer = dynamicArraySerializer;
             _dynamicDocumentSerializer = dynamicDocumentSerializer;
+            _domain = domain;
         }
 
         // public properties
@@ -54,6 +59,11 @@ public bool AllowDuplicateElementNames
             get { return _allowDuplicateElementNames; }
         }
 
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        public IBsonSerializationDomain Domain => _domain;
+
         /// <summary>
         /// Gets the dynamic array serializer.
         /// </summary>
@@ -138,6 +148,7 @@ public class Builder
             private IBsonSerializer _dynamicArraySerializer;
             private IBsonSerializer _dynamicDocumentSerializer;
             private IBsonReader _reader;
+            private IBsonSerializationDomain _domain;
 
             // constructors
             internal Builder(BsonDeserializationContext other, IBsonReader reader)
@@ -153,6 +164,7 @@ internal Builder(BsonDeserializationContext other, IBsonReader reader)
                     _allowDuplicateElementNames = other.AllowDuplicateElementNames;
                     _dynamicArraySerializer = other.DynamicArraySerializer;
                     _dynamicDocumentSerializer = other.DynamicDocumentSerializer;
+                    _domain = other.Domain;
                 }
                 else
                 {
@@ -209,14 +221,23 @@ public IBsonReader Reader
                 get { return _reader; }
             }
 
+            /// <summary>
+            /// //TODO
+            /// </summary>
+            public IBsonSerializationDomain Domain
+            {
+                get => _domain;
+                set => _domain = value;
+            }
+
             // 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, _allowDuplicateElementNames, _dynamicArraySerializer, _dynamicDocumentSerializer, _domain);
             }
         }
     }

src/MongoDB.Bson/Serialization/BsonSerializer.cs

@@ -34,8 +34,10 @@ static BsonSerializer()
             _domain = new BsonSerializationDomain();
         }
 
-        //TODO This will need to be public
-        internal static IBsonSerializationDomain Domain => _domain;
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        public static IBsonSerializationDomain DefaultDomain => _domain;
 
         // public static properties
         /// <summary>