Fixed registry

Author: papafe

src/MongoDB.Bson/Serialization/AttributedSerializationProvider.cs

@@ -20,6 +20,7 @@
 
 namespace MongoDB.Bson.Serialization
 {
+    //DOMAIN-API We should consider making all our serialization provider classes sealed or internal.
     /// <summary>
     /// Provides serializers based on an attribute.
     /// </summary>

src/MongoDB.Bson/Serialization/BsonClassMapSerializationProvider.cs

@@ -21,10 +21,21 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Represents the class map serialization provider.
     /// </summary>
-    internal class BsonClassMapSerializationProvider : BsonSerializationProviderBase
+    internal class BsonClassMapSerializationProvider : BsonSerializationProviderBase, IDomainAwareBsonSerializationProvider
     {
+        public IBsonSerializationDomain SerializationDomain { get; }
+
+        public BsonClassMapSerializationProvider(IBsonSerializationDomain serializationDomain)
+        {
+            SerializationDomain = serializationDomain;
+        }
+
+        //DOMAIN-API This method should be removed.
         /// <inheritdoc/>
         public override IBsonSerializer GetSerializer(Type type, IBsonSerializerRegistry serializerRegistry)
+            => GetSerializerWithDomain(type);
+
+        public IBsonSerializer GetSerializerWithDomain(Type type)
         {
             if (type == null)
             {
@@ -41,18 +52,7 @@ public override IBsonSerializer GetSerializer(Type type, IBsonSerializerRegistry
                 !typeof(Array).GetTypeInfo().IsAssignableFrom(type) &&
                 !typeof(Enum).GetTypeInfo().IsAssignableFrom(type))
             {
-                IBsonSerializationDomain domain;
-
-                if (serializerRegistry is IBsonSerializerRegistryInternal serializerRegistryInternal)
-                {
-                    domain = serializerRegistryInternal.SerializationDomain;
-                }
-                else
-                {
-                    domain = BsonSerializer.DefaultSerializationDomain;
-                }
-                
-                var classMap = domain.BsonClassMap.LookupClassMap(type);
+                var classMap = SerializationDomain.BsonClassMap.LookupClassMap(type);
                 var classMapSerializerDefinition = typeof(BsonClassMapSerializer<>);
                 var classMapSerializerType = classMapSerializerDefinition.MakeGenericType(type);
                 return (IBsonSerializer)Activator.CreateInstance(classMapSerializerType, classMap);

src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs

@@ -852,7 +852,7 @@ private void CreateSerializerRegistry()
             _typeMappingSerializationProvider = new TypeMappingSerializationProvider();
 
             // order matters. It's in reverse order of how they'll get consumed
-            _serializerRegistry.RegisterSerializationProvider(new BsonClassMapSerializationProvider());
+            _serializerRegistry.RegisterSerializationProvider(new BsonClassMapSerializationProvider(this));
             _serializerRegistry.RegisterSerializationProvider(new DiscriminatedInterfaceSerializationProvider());
             _serializerRegistry.RegisterSerializationProvider(new CollectionsSerializationProvider());
             _serializerRegistry.RegisterSerializationProvider(new PrimitiveSerializationProvider());

src/MongoDB.Bson/Serialization/BsonSerializerRegistry.cs

@@ -22,13 +22,12 @@ namespace MongoDB.Bson.Serialization
     /// <summary>
     /// Default, global implementation of an <see cref="IBsonSerializerRegistry"/>.
     /// </summary>
-    public sealed class BsonSerializerRegistry : IBsonSerializerRegistryInternal
+    public sealed class BsonSerializerRegistry : IBsonSerializerRegistry
     {
         // private fields
         private readonly ConcurrentDictionary<Type, IBsonSerializer> _cache;
         private readonly ConcurrentStack<IBsonSerializationProvider> _serializationProviders;
         private readonly Func<Type, IBsonSerializer> _createSerializer;
-        private readonly IBsonSerializationDomain _serializationDomain;  //FP Need to investigate if we can remove this from here.
 
         // constructors
         /// <summary>
@@ -48,15 +47,8 @@ internal BsonSerializerRegistry(IBsonSerializationDomain serializationDomain)
             _cache = new ConcurrentDictionary<Type, IBsonSerializer>();
             _serializationProviders = new ConcurrentStack<IBsonSerializationProvider>();
             _createSerializer = CreateSerializer;
-            _serializationDomain = serializationDomain;
         }
 
-        // public methods
-        /// <summary>
-        /// //TODO
-        /// </summary>
-        IBsonSerializationDomain IBsonSerializerRegistryInternal.SerializationDomain => _serializationDomain;
-
         /// <summary>
         /// Gets the serializer for the specified <paramref name="type" />.
         /// If none is already registered, the serialization providers will be used to create a serializer and it will be automatically registered.
@@ -172,17 +164,14 @@ private IBsonSerializer CreateSerializer(Type type)
         {
             foreach (var serializationProvider in _serializationProviders)
             {
-                IBsonSerializer serializer;
-
-                var registryAwareSerializationProvider = serializationProvider as IRegistryAwareBsonSerializationProvider;
-                if (registryAwareSerializationProvider != null)
-                {
-                    serializer = registryAwareSerializationProvider.GetSerializer(type, this);
-                }
-                else
+                var serializer = serializationProvider switch
                 {
-                    serializer = serializationProvider.GetSerializer(type);
-                }
+                    IDomainAwareBsonSerializationProvider domainAwareBsonSerializationProvider =>
+                        domainAwareBsonSerializationProvider.GetSerializerWithDomain(type),
+                    IRegistryAwareBsonSerializationProvider registryAwareSerializationProvider =>
+                        registryAwareSerializationProvider.GetSerializer(type, this),
+                    _ => serializationProvider.GetSerializer(type)
+                };
 
                 if (serializer != null)
                 {

src/MongoDB.Bson/Serialization/IBsonSerializationProvider.cs

@@ -49,4 +49,13 @@ public interface IRegistryAwareBsonSerializationProvider : IBsonSerializationPro
         /// </returns>
         IBsonSerializer GetSerializer(Type type, IBsonSerializerRegistry serializerRegistry);
     }
+
+    //DOMAIN-API We should use this interface the default one, and remove the previous two.
+    internal interface IDomainAwareBsonSerializationProvider : IRegistryAwareBsonSerializationProvider
+    {
+        IBsonSerializationDomain SerializationDomain { get; }
+
+        //FP Can't use just GetSerializer because it's already used by the base interface.
+        IBsonSerializer GetSerializerWithDomain(Type type);
+    }
 }

src/MongoDB.Bson/Serialization/IBsonSerializerRegistry.cs

@@ -36,9 +36,4 @@ public interface IBsonSerializerRegistry
         /// <returns>The serializer.</returns>
         IBsonSerializer<T> GetSerializer<T>();
     }
-
-    internal interface IBsonSerializerRegistryInternal : IBsonSerializerRegistry
-    {
-        IBsonSerializationDomain SerializationDomain { get; }
-    }
 }