Removed multiple interfaces plus more fixes

Author: papafe

src/MongoDB.Bson/Serialization/BsonSerializationDomain.cs

@@ -85,15 +85,6 @@ public ReaderWriterLockSlim ConfigLock
             get { return __configLock; }
         }
 
-        public IBsonCoreSerializerConfiguration SerializationConfiguration => this;
-
-        // public methods
-
-        public IBsonCoreSerializer BuildCoreSerializer()
-        {
-            return this;
-        }
-
         /// <summary>
         /// Deserializes an object from a BsonDocument.
         /// </summary>

src/MongoDB.Bson/Serialization/Conventions/HierarchicalDiscriminatorConvention.cs

@@ -41,7 +41,11 @@ public HierarchicalDiscriminatorConvention(string elementName)
         /// <param name="nominalType">The nominal type.</param>
         /// <param name="actualType">The actual type.</param>
         /// <returns>The discriminator value.</returns>
-        public override BsonValue GetDiscriminator(Type nominalType, Type actualType)
+        public override BsonValue GetDiscriminator(Type nominalType, Type actualType) =>
+            GetDiscriminator(nominalType, actualType, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public override BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain)
         {
             // TODO: this isn't quite right, not all classes are serialized using  a class map serializer
             var classMap = BsonClassMap.LookupClassMap(actualType);

src/MongoDB.Bson/Serialization/Conventions/IDiscriminatorConvention.cs

@@ -36,12 +36,31 @@ public interface IDiscriminatorConvention
         /// <returns>The actual type.</returns>
         Type GetActualType(IBsonReader bsonReader, Type nominalType);
 
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        /// <param name="bsonReader"></param>
+        /// <param name="nominalType"></param>
+        /// <param name="domain"></param>
+        /// <returns></returns>
+        Type GetActualType(IBsonReader bsonReader, Type nominalType, IBsonSerializationDomain domain);
+
         /// <summary>
         /// Gets the discriminator value for an actual type.
         /// </summary>
         /// <param name="nominalType">The nominal type.</param>
         /// <param name="actualType">The actual type.</param>
         /// <returns>The discriminator value.</returns>
         BsonValue GetDiscriminator(Type nominalType, Type actualType);
+
+        /// <summary>
+        /// //TODO
+        /// </summary>
+        /// <param name="nominalType"></param>
+        /// <param name="actualType"></param>
+        /// <param name="domain"></param>
+        /// <returns></returns>
+        BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain);
+
     }
 }

src/MongoDB.Bson/Serialization/Conventions/ObjectDiscriminatorConvention.cs

@@ -144,6 +144,12 @@ public Type GetActualType(IBsonReader bsonReader, Type nominalType)
             return nominalType;
         }
 
+        /// <inheritdoc />
+        public Type GetActualType(IBsonReader bsonReader, Type nominalType, IBsonSerializationDomain domain)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <summary>
         /// Gets the discriminator value for an actual type.
         /// </summary>
@@ -155,6 +161,12 @@ public BsonValue GetDiscriminator(Type nominalType, Type actualType)
             return TypeNameDiscriminator.GetDiscriminator(actualType);
         }
 
+        /// <inheritdoc />
+        public BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain)
+        {
+            throw new NotImplementedException();
+        }
+
         /// <inheritdoc/>
         public override int GetHashCode() => 0;
     }

src/MongoDB.Bson/Serialization/Conventions/ScalarDiscriminatorConvention.cs

@@ -39,7 +39,11 @@ public ScalarDiscriminatorConvention(string elementName)
         /// <param name="nominalType">The nominal type.</param>
         /// <param name="actualType">The actual type.</param>
         /// <returns>The discriminator value.</returns>
-        public override BsonValue GetDiscriminator(Type nominalType, Type actualType)
+        public override BsonValue GetDiscriminator(Type nominalType, Type actualType) =>
+            GetDiscriminator(nominalType, actualType, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public override BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain)
         {
             // TODO: this isn't quite right, not all classes are serialized using a class map serializer
             var classMap = BsonClassMap.LookupClassMap(actualType);

src/MongoDB.Bson/Serialization/Conventions/StandardDiscriminatorConvention.cs

@@ -94,17 +94,21 @@ obj is StandardDiscriminatorConvention other &&
         /// <param name="bsonReader">The reader.</param>
         /// <param name="nominalType">The nominal type.</param>
         /// <returns>The actual type.</returns>
-        public Type GetActualType(IBsonReader bsonReader, Type nominalType)
+        public Type GetActualType(IBsonReader bsonReader, Type nominalType) =>
+            GetActualType(bsonReader, nominalType, BsonSerializer.DefaultDomain);
+
+        /// <inheritdoc />
+        public Type GetActualType(IBsonReader bsonReader, Type nominalType, IBsonSerializationDomain domain)
         {
             // the BsonReader is sitting at the value whose actual type needs to be found
             var bsonType = bsonReader.GetCurrentBsonType();
             if (bsonType == BsonType.Document)
             {
                 // ensure KnownTypes of nominalType are registered (so IsTypeDiscriminated returns correct answer)
-                BsonSerializer.EnsureKnownTypesAreRegistered(nominalType); //TODO ??
+                domain.EnsureKnownTypesAreRegistered(nominalType); //TODO ??
 
                 // we can skip looking for a discriminator if nominalType has no discriminated sub types
-                if (BsonSerializer.IsTypeDiscriminated(nominalType)) //TODO ??
+                if (domain.IsTypeDiscriminated(nominalType)) //TODO ??
                 {
                     var bookmark = bsonReader.GetBookmark();
                     bsonReader.ReadStartDocument();
@@ -135,6 +139,9 @@ public Type GetActualType(IBsonReader bsonReader, Type nominalType)
         /// <returns>The discriminator value.</returns>
         public abstract BsonValue GetDiscriminator(Type nominalType, Type actualType);
 
+        /// <inheritdoc/>
+        public abstract BsonValue GetDiscriminator(Type nominalType, Type actualType, IBsonSerializationDomain domain);
+
         /// <inheritdoc/>
         public override int GetHashCode() => 0;
     }