Various fixes to hide API

Author: papafe

src/MongoDB.Bson/Serialization/Serializers/ClassSerializerBase.cs

@@ -100,7 +100,7 @@ protected virtual TValue DeserializeValue(BsonDeserializationContext context, Bs
         /// <returns>The actual type.</returns>
         protected virtual Type GetActualType(BsonDeserializationContext context)
         {
-            var discriminatorConvention = this.GetDiscriminatorConvention();
+            var discriminatorConvention = this.GetDiscriminatorConvention(context.SerializationDomain);
             return discriminatorConvention.GetActualTypeInternal(context.Reader, typeof(TValue), context.SerializationDomain);
         }
 

src/MongoDB.Driver/IInheritableMongoClientSettings.cs

@@ -25,7 +25,7 @@ internal interface IInheritableMongoClientSettings
         ReadConcern ReadConcern { get; }
         UTF8Encoding ReadEncoding { get; }
         ReadPreference ReadPreference { get; }
-        IBsonSerializationDomain SerializationDomain { get; }
+        IBsonSerializationDomain SerializationDomain { get; set; }
         WriteConcern WriteConcern { get; }
         UTF8Encoding WriteEncoding { get; }
     }

src/MongoDB.Driver/Linq/Linq3Implementation/Translators/ExpressionToAggregationExpressionTranslators/TypeIsExpressionToAggregationExpressionTranslator.cs

@@ -39,7 +39,7 @@ public static TranslatedExpression Translate(TranslationContext context, TypeBin
             }
             else
             {
-                var discriminatorConvention = objectTranslation.Serializer.GetDiscriminatorConvention();
+                var discriminatorConvention = objectTranslation.Serializer.GetDiscriminatorConvention(context.SerializationDomain);
                 var discriminatorField = AstExpression.GetField(objectTranslation.Ast, discriminatorConvention.ElementName);
 
                 ast = discriminatorConvention switch

src/MongoDB.Driver/MongoClientSettings.cs

@@ -479,7 +479,7 @@ public ReadPreference ReadPreference
         /// </summary>
         /// <exception cref="InvalidOperationException"></exception>
         /// <exception cref="ArgumentNullException"></exception>
-        public IBsonSerializationDomain SerializationDomain
+        IBsonSerializationDomain IInheritableMongoClientSettings.SerializationDomain
         {
             get => _serializationDomain;
             set

src/MongoDB.Driver/MongoCollectionSettings.cs

@@ -117,12 +117,12 @@ public ReadPreference ReadPreference
         /// <summary>
         /// Gets the serializer registry.
         /// </summary>
-        public IBsonSerializerRegistry SerializerRegistry => SerializationDomain.SerializerRegistry;  //TODO We should try passing down the domain instead of the registry...
+        public IBsonSerializerRegistry SerializerRegistry => SerializationDomain.SerializerRegistry;
 
         /// <summary>
         /// //TODO
         /// </summary>
-        public IBsonSerializationDomain SerializationDomain
+        internal IBsonSerializationDomain SerializationDomain
         {
             get => _serializationDomain.Value;
             set

src/MongoDB.Driver/MongoDatabaseSettings.cs

@@ -107,7 +107,7 @@ public ReadPreference ReadPreference
         /// <summary>
         /// //TODO
         /// </summary>
-        public IBsonSerializationDomain SerializationDomain
+        internal IBsonSerializationDomain SerializationDomain
         {
             get => _serializationDomain.Value;
             set

tests/MongoDB.Driver.Tests/MultipleRegistriesTests.cs

@@ -56,7 +56,7 @@ public void TestSerialization()
                 var customDomain = BsonSerializer.CreateSerializationDomain();
                 customDomain.RegisterSerializer(new CustomStringSerializer());
 
-                var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = customDomain);
+                var client = DriverTestConfiguration.CreateMongoClient((MongoClientSettings c) => (c as IInheritableMongoClientSettings).SerializationDomain = customDomain);
                 var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
                 db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName);
                 var collection = db.GetCollection<Person>(DriverTestConfiguration.CollectionNamespace.CollectionName);
@@ -97,7 +97,7 @@ public void TestDeserialization()
                 var customDomain = BsonSerializer.CreateSerializationDomain();
                 customDomain.RegisterSerializer(new CustomStringSerializer());
 
-                var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = customDomain);
+                var client = DriverTestConfiguration.CreateMongoClient((MongoClientSettings c) => (c as IInheritableMongoClientSettings).SerializationDomain = customDomain);
                 var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
                 var collection = db.GetCollection<Person>(DriverTestConfiguration.CollectionNamespace.CollectionName);
 
@@ -114,7 +114,7 @@ public void TestLinq()
             var customDomain = BsonSerializer.CreateSerializationDomain();
             customDomain.RegisterSerializer(new CustomStringSerializer());
 
-            var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = customDomain);
+            var client = DriverTestConfiguration.CreateMongoClient((MongoClientSettings c) => (c as IInheritableMongoClientSettings).SerializationDomain = customDomain);
             var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
             db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName);
             var collection = db.GetCollection<Person>(DriverTestConfiguration.CollectionNamespace.CollectionName);
@@ -151,7 +151,7 @@ public void TestConventions()
                 m => m.SetElementName(m.MemberName.ToLower()));
             customDomain.ConventionRegistry.Register("myPack", pack, t => t == typeof(Person));
 
-            var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = customDomain);
+            var client = DriverTestConfiguration.CreateMongoClient((MongoClientSettings c) => (c as IInheritableMongoClientSettings).SerializationDomain = customDomain);
             var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
             db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName);
             var collection = db.GetCollection<Person>(DriverTestConfiguration.CollectionNamespace.CollectionName);
@@ -176,7 +176,7 @@ public void TestAggregate()
             var customDomain = BsonSerializer.CreateSerializationDomain();
             customDomain.RegisterSerializer(new CustomStringSerializer());
 
-            var client = DriverTestConfiguration.CreateMongoClient(c => c.SerializationDomain = customDomain);
+            var client = DriverTestConfiguration.CreateMongoClient((MongoClientSettings c) => (c as IInheritableMongoClientSettings).SerializationDomain = customDomain);
             var db = client.GetDatabase(DriverTestConfiguration.DatabaseNamespace.DatabaseName);
             db.DropCollection(DriverTestConfiguration.CollectionNamespace.CollectionName);
             var collection = db.GetCollection<Person>(DriverTestConfiguration.CollectionNamespace.CollectionName);