Small improvements

Author: papafe

src/MongoDB.Bson/Serialization/BsonMemberMap.cs

@@ -56,7 +56,7 @@ public BsonMemberMap(BsonClassMap classMap, MemberInfo memberInfo)
         {
             _classMap = classMap;
             _memberInfo = memberInfo;
-            _memberType = BsonClassMap.GetMemberInfoType(memberInfo); //FP This is more of a utility method, it can stay like this
+            _memberType = BsonClassMap.GetMemberInfoType(memberInfo);
             _memberTypeIsBsonValue = typeof(BsonValue).GetTypeInfo().IsAssignableFrom(_memberType);
 
             Reset();

src/MongoDB.Bson/Serialization/IBsonSerializationProvider.cs

@@ -55,7 +55,6 @@ internal interface IDomainAwareBsonSerializationProvider : IRegistryAwareBsonSer
     {
         IBsonSerializationDomain SerializationDomain { get; }
 
-        //FP Can't use just GetSerializer name because it's already used by the base interface.
         IBsonSerializer GetSerializerWithDomain(Type type);
     }
 }

src/MongoDB.Driver/Core/Operations/CreateSearchIndexesOperation.cs

@@ -37,7 +37,6 @@ internal sealed class CreateSearchIndexesOperation : IWriteOperation<BsonDocumen
         private readonly IEnumerable<CreateSearchIndexRequest> _requests;
         private readonly IBsonSerializationDomain _serializationDomain;
 
-        //FP We should remove all the docs in those internal classes, at least for constructors.
         // constructors
         /// <summary>
         /// Initializes a new instance of the <see cref="CreateIndexesOperation"/> class.

src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/BinaryEncoders/MessageBinaryEncoderBase.cs

@@ -84,7 +84,6 @@ protected int? MaxWireDocumentSize
 
         protected IBsonSerializationDomain SerializationDomain
             => _encoderSettings?.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null)  ?? BsonSerializer.DefaultSerializationDomain;
-        //QUESTION Is this correct? If we don't have a domain in the encoder settings, just use the default one?
 
         // methods
         public BsonBinaryReader CreateBinaryReader()

src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/BinaryEncoders/QueryMessageBinaryEncoder.cs

@@ -25,10 +25,13 @@ namespace MongoDB.Driver.Core.WireProtocol.Messages.Encoders.BinaryEncoders
 {
     internal sealed class QueryMessageBinaryEncoder : MessageBinaryEncoderBase, IMessageEncoder
     {
+        private readonly IBsonSerializationDomain _serializationDomain;
+
         // constructors
         public QueryMessageBinaryEncoder(Stream stream, MessageEncoderSettings encoderSettings)
             : base(stream, encoderSettings)
         {
+            _serializationDomain = encoderSettings?.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null) ?? BsonSerializer.DefaultSerializationDomain;
         }
 
         // methods
@@ -169,8 +172,7 @@ private void WriteQuery(BsonBinaryWriter binaryWriter, BsonDocument query, IElem
             binaryWriter.PushElementNameValidator(queryValidator);
             try
             {
-                //QUESTION Is it correct we only need a default domain here?
-                var context = BsonSerializationContext.CreateRoot(binaryWriter, BsonSerializer.DefaultSerializationDomain);
+                var context = BsonSerializationContext.CreateRoot(binaryWriter, _serializationDomain);
                 BsonDocumentSerializer.Instance.Serialize(context, query ?? new BsonDocument());
             }
             finally

src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/BinaryEncoders/ReplyMessageBinaryEncoder.cs

@@ -28,12 +28,14 @@ internal class ReplyMessageBinaryEncoder<TDocument> : MessageBinaryEncoderBase,
     {
         // fields
         private readonly IBsonSerializer<TDocument> _serializer;
+        private readonly IBsonSerializationDomain _serializationDomain;
 
         // constructors
         public ReplyMessageBinaryEncoder(Stream stream, MessageEncoderSettings encoderSettings, IBsonSerializer<TDocument> serializer)
             : base(stream, encoderSettings)
         {
             _serializer = Ensure.IsNotNull(serializer, nameof(serializer));
+            _serializationDomain = encoderSettings?.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null) ?? BsonSerializer.DefaultSerializationDomain;
         }
 
         // methods
@@ -124,16 +126,14 @@ public void WriteMessage(ReplyMessage<TDocument> message)
             stream.WriteInt32(message.NumberReturned);
             if (message.QueryFailure)
             {
-                //QUESTION Is it correct we only need a default domain here?
-                var context = BsonSerializationContext.CreateRoot(binaryWriter, BsonSerializer.DefaultSerializationDomain);
+                var context = BsonSerializationContext.CreateRoot(binaryWriter, _serializationDomain);
                 _serializer.Serialize(context, message.QueryFailureDocument);
             }
             else
             {
                 foreach (var doc in message.Documents)
                 {
-                    //QUESTION Is it correct we only need a default domain here?
-                    var context = BsonSerializationContext.CreateRoot(binaryWriter, BsonSerializer.DefaultSerializationDomain);
+                    var context = BsonSerializationContext.CreateRoot(binaryWriter, _serializationDomain);
                     _serializer.Serialize(context, doc);
                 }
             }

src/MongoDB.Driver/Core/WireProtocol/Messages/Encoders/MessageEncoderSettings.cs

@@ -41,7 +41,8 @@ internal static class MessageEncoderSettingsName
         public const string ShellVersion = nameof(ShellVersion);
 
         // other encoders (if any) might use additional settings
-        public const string SerializationDomain = nameof(SerializationDomain); //FP I think I should try to remove it from here..
+        public const string SerializationDomain = nameof(SerializationDomain);
+        //QUESTION Should this be removed from here? If so, what do we do with all the Encoders that use it?
     }
 
     internal sealed class MessageEncoderSettings : IEnumerable<KeyValuePair<string, object>>

src/MongoDB.Driver/PipelineStageDefinitionBuilder.cs

@@ -568,7 +568,7 @@ public static PipelineStageDefinition<TInput, TOutput> Facet<TInput, TOutput>(
                     {
                         outputSerializer = (IBsonSerializer<TOutput>)new AggregateFacetResultsSerializer(
                             materializedFacets.Select(f => f.Name),
-                            materializedFacets.Select(f => f.OutputSerializer ?? args.SerializerRegistry.GetSerializer(f.OutputType)));  //QUESTION What do we do? Do we delay the setting of the serializer..?
+                            materializedFacets.Select(f => f.OutputSerializer ?? args.SerializerRegistry.GetSerializer(f.OutputType)));
                     }
                     else
                     {

src/MongoDB.Driver/RenderArgs.cs

@@ -55,7 +55,7 @@ public RenderArgs(
             IBsonSerializer<TDocument> documentSerializer,
             IBsonSerializerRegistry serializerRegistry,
             PathRenderArgs pathRenderArgs = default,
-            bool renderDollarForm = default,
+            bool renderDollarForm = false,
             bool renderForFind = false,
             bool renderForElemMatch = false,
             ExpressionTranslationOptions translationOptions = null)
@@ -84,7 +84,7 @@ internal RenderArgs(
             IBsonSerializer<TDocument> documentSerializer,
             IBsonSerializationDomain serializationDomain,
             PathRenderArgs pathRenderArgs = default,
-            bool renderDollarForm = default,
+            bool renderDollarForm = false,
             bool renderForFind = false,
             bool renderForElemMatch = false,
             ExpressionTranslationOptions translationOptions = null)
@@ -131,7 +131,7 @@ public readonly IBsonSerializer<TDocument> DocumentSerializer
         /// <summary>
         /// Gets the serializer registry.
         /// </summary>
-        public readonly IBsonSerializerRegistry SerializerRegistry  //TODO: we should probably remove this property
+        public readonly IBsonSerializerRegistry SerializerRegistry  //DOMAIN-API: we should probably remove this property and use the domain directly
         {
             get => _serializerRegistry;
             init => _serializerRegistry = Ensure.IsNotNull(value, nameof(value));