Other improvements

Author: papafe

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 : IBsonReader
+    public abstract class BsonReader : IBsonReaderInternal
     {
         // private fields
         private bool _disposed = false;

src/MongoDB.Bson/InternalExtensions.cs

@@ -20,6 +20,7 @@
 
 namespace MongoDB.Bson
 {
+    //TODO This could be moved somewhere else
     internal static class InternalExtensions
     {
         public static Type GetActualTypeInternal(this IDiscriminatorConvention discriminatorConvention, IBsonReader bsonReader, Type nominalType, IBsonSerializationDomain serializationDomain)

src/MongoDB.Bson/Serialization/BsonClassMapSerializationProvider.cs

@@ -41,7 +41,18 @@ public override IBsonSerializer GetSerializer(Type type, IBsonSerializerRegistry
                 !typeof(Array).GetTypeInfo().IsAssignableFrom(type) &&
                 !typeof(Enum).GetTypeInfo().IsAssignableFrom(type))
             {
-                var classMap = serializerRegistry.SerializationDomain.BsonClassMap.LookupClassMap(type);
+                IBsonSerializationDomain domain;
+
+                if (serializerRegistry is IBsonSerializerRegistryInternal serializerRegistryInternal)
+                {
+                    domain = serializerRegistryInternal.SerializationDomain;
+                }
+                else
+                {
+                    domain = BsonSerializer.DefaultSerializationDomain;
+                }
+                
+                var classMap = domain.BsonClassMap.LookupClassMap(type);
                 var classMapSerializerDefinition = typeof(BsonClassMapSerializer<>);
                 var classMapSerializerType = classMapSerializerDefinition.MakeGenericType(type);
                 return (IBsonSerializer)Activator.CreateInstance(classMapSerializerType, classMap);

src/MongoDB.Bson/Serialization/BsonSerializationProviderBase.cs

@@ -26,7 +26,7 @@ public abstract class BsonSerializationProviderBase : IRegistryAwareBsonSerializ
         /// <inheritdoc/>
         public virtual IBsonSerializer GetSerializer(Type type)
         {
-            return GetSerializer(type, BsonSerializer.SerializerRegistry);   //TODO We can keep this as is? I think in the long run we should remove this overload.
+            return GetSerializer(type, BsonSerializer.DefaultSerializationDomain.SerializerRegistry);   //TODO We can keep this as is? I think in the long run we should remove this overload.
         }
 
         /// <inheritdoc/>
@@ -40,7 +40,7 @@ public virtual IBsonSerializer GetSerializer(Type type)
         /// <returns>A serializer.</returns>
         protected virtual IBsonSerializer CreateGenericSerializer(Type serializerTypeDefinition, params Type[] typeArguments)
         {
-            return CreateGenericSerializer(serializerTypeDefinition, typeArguments, BsonSerializer.SerializerRegistry);   //TODO We can keep this as is? I think in the long run we should remove this overload.
+            return CreateGenericSerializer(serializerTypeDefinition, typeArguments, BsonSerializer.DefaultSerializationDomain.SerializerRegistry);   //TODO We can keep this as is? I think in the long run we should remove this overload.
         }
 
         /// <summary>

src/MongoDB.Bson/Serialization/BsonSerializerRegistry.cs

@@ -22,7 +22,7 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Default, global implementation of an <see cref="IBsonSerializerRegistry"/>.
     /// </summary>
-    public sealed class BsonSerializerRegistry : IBsonSerializerRegistry
+    public sealed class BsonSerializerRegistry : IBsonSerializerRegistryInternal
     {
         // private fields
         private readonly ConcurrentDictionary<Type, IBsonSerializer> _cache;

src/MongoDB.Bson/Serialization/IBsonSerializerRegistry.cs

@@ -22,11 +22,6 @@ namespace MongoDB.Bson.Serialization
     /// </summary>
     public interface IBsonSerializerRegistry
     {
-        /// <summary>
-        /// //TODO
-        /// </summary>
-        public IBsonSerializationDomain SerializationDomain { get; }
-
         /// <summary>
         /// Gets the serializer for the specified <paramref name="type"/>.
         /// </summary>
@@ -41,4 +36,9 @@ public interface IBsonSerializerRegistry
         /// <returns>The serializer.</returns>
         IBsonSerializer<T> GetSerializer<T>();
     }
+
+    internal interface IBsonSerializerRegistryInternal : IBsonSerializerRegistry
+    {
+        IBsonSerializationDomain SerializationDomain { get; }
+    }
 }