Various fixes

Author: papafe

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

@@ -36,7 +36,6 @@ internal sealed class ClientBulkWriteOperation : RetryableWriteCommandOperationB
         private readonly Dictionary<int, BsonValue> _idsMap = new();
         private readonly BsonDocument _let;
         private readonly RenderArgs<BsonDocument> _renderArgs;
-        private readonly IBsonSerializationDomain _serializationDomain;
         private readonly IBatchableSource<BulkWriteModel> _writeModels;
 
         public ClientBulkWriteOperation(
@@ -45,15 +44,14 @@ public ClientBulkWriteOperation(
             MessageEncoderSettings messageEncoderSettings,
             RenderArgs<BsonDocument> renderArgs,
             IBsonSerializationDomain serializationDomain)
-            : base(DatabaseNamespace.Admin, messageEncoderSettings)
+            : base(DatabaseNamespace.Admin, messageEncoderSettings, serializationDomain)
         {
             Ensure.IsNotNullOrEmpty(writeModels, nameof(writeModels));
             _writeModels = new BatchableSource<BulkWriteModel>(writeModels, true);
             _bypassDocumentValidation = options?.BypassDocumentValidation;
             _errorsOnly = !(options?.VerboseResult).GetValueOrDefault(false);
             _let = options?.Let;
             _renderArgs = renderArgs;
-            _serializationDomain = Ensure.IsNotNull(serializationDomain, nameof(serializationDomain));
             Comment = options?.Comment;
             IsOrdered = (options?.IsOrdered).GetValueOrDefault(true);
             WriteConcern = options?.WriteConcern;
@@ -284,7 +282,7 @@ private IAsyncCursor<BsonDocument> GetIndividualResultsCursor(RetryableWriteCont
                 0,
                 BsonDocumentSerializer.Instance,
                 MessageEncoderSettings,
-                _serializationDomain);
+                SerializationDomain);
         }
 
         private void PopulateBulkWriteResponse(BsonDocument bulkWriteResponse, BulkWriteRawResult bulkWriteResult)

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

@@ -37,13 +37,23 @@ internal sealed class RetryableDeleteCommandOperation : RetryableWriteCommandOpe
         public RetryableDeleteCommandOperation(
             CollectionNamespace collectionNamespace,
             BatchableSource<DeleteRequest> deletes,
-            MessageEncoderSettings messageEncoderSettings)
-            : base(Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace)).DatabaseNamespace, messageEncoderSettings)
+            MessageEncoderSettings messageEncoderSettings,
+            IBsonSerializationDomain serializationDomain)
+            : base(Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace)).DatabaseNamespace, messageEncoderSettings, serializationDomain)
         {
             _collectionNamespace = Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace));
             _deletes = Ensure.IsNotNull(deletes, nameof(deletes));
         }
 
+        //EXIT
+        public RetryableDeleteCommandOperation(
+            CollectionNamespace collectionNamespace,
+            BatchableSource<DeleteRequest> deletes,
+            MessageEncoderSettings messageEncoderSettings)
+            : this(collectionNamespace, deletes, messageEncoderSettings, BsonSerializer.DefaultSerializationDomain)
+        {
+        }
+
         public BsonDocument Let
         {
             get { return _let; }

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

@@ -37,14 +37,26 @@ public RetryableInsertCommandOperation(
             CollectionNamespace collectionNamespace,
             BatchableSource<TDocument> documents,
             IBsonSerializer<TDocument> documentSerializer,
-            MessageEncoderSettings messageEncoderSettings)
-            : base(Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace)).DatabaseNamespace, messageEncoderSettings)
+            MessageEncoderSettings messageEncoderSettings,
+            IBsonSerializationDomain serializationDomain)
+            : base(Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace)).DatabaseNamespace, messageEncoderSettings, serializationDomain)
         {
             _collectionNamespace = Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace));
             _documents = Ensure.IsNotNull(documents, nameof(documents));
             _documentSerializer = Ensure.IsNotNull(documentSerializer, nameof(documentSerializer));
         }
 
+        //EXIT
+        public RetryableInsertCommandOperation(
+            CollectionNamespace collectionNamespace,
+            BatchableSource<TDocument> documents,
+            IBsonSerializer<TDocument> documentSerializer,
+            MessageEncoderSettings messageEncoderSettings)
+            : this(collectionNamespace, documents, documentSerializer, messageEncoderSettings,
+                BsonSerializer.DefaultSerializationDomain)
+        {
+        }
+
         public bool? BypassDocumentValidation
         {
             get { return _bypassDocumentValidation; }

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

@@ -38,13 +38,23 @@ internal sealed class RetryableUpdateCommandOperation : RetryableWriteCommandOpe
         public RetryableUpdateCommandOperation(
             CollectionNamespace collectionNamespace,
             BatchableSource<UpdateRequest> updates,
-            MessageEncoderSettings messageEncoderSettings)
-            : base(Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace)).DatabaseNamespace, messageEncoderSettings)
+            MessageEncoderSettings messageEncoderSettings,
+            IBsonSerializationDomain serializationDomain)
+            : base(Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace)).DatabaseNamespace, messageEncoderSettings, serializationDomain)
         {
             _collectionNamespace = Ensure.IsNotNull(collectionNamespace, nameof(collectionNamespace));
             _updates = Ensure.IsNotNull(updates, nameof(updates));
         }
 
+        //EXIT
+        public RetryableUpdateCommandOperation(
+            CollectionNamespace collectionNamespace,
+            BatchableSource<UpdateRequest> updates,
+            MessageEncoderSettings messageEncoderSettings)
+            : this(collectionNamespace, updates, messageEncoderSettings, BsonSerializer.DefaultSerializationDomain)
+        {
+        }
+
         public bool? BypassDocumentValidation
         {
             get { return _bypassDocumentValidation; }

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

@@ -37,14 +37,17 @@ internal abstract class RetryableWriteCommandOperationBase : IWriteOperation<Bso
         private int? _maxBatchCount;
         private readonly MessageEncoderSettings _messageEncoderSettings;
         private bool _retryRequested;
+        private IBsonSerializationDomain _serializationDomain;
         private WriteConcern _writeConcern = WriteConcern.Acknowledged;
 
         public RetryableWriteCommandOperationBase(
             DatabaseNamespace databaseNamespace,
-            MessageEncoderSettings messageEncoderSettings)
+            MessageEncoderSettings messageEncoderSettings,
+            IBsonSerializationDomain serializationDomain)
         {
             _databaseNamespace = Ensure.IsNotNull(databaseNamespace, nameof(databaseNamespace));
             _messageEncoderSettings = Ensure.IsNotNull(messageEncoderSettings, nameof(messageEncoderSettings));
+            _serializationDomain = Ensure.IsNotNull(serializationDomain, nameof(serializationDomain));
         }
 
         public BsonValue Comment
@@ -81,6 +84,8 @@ public bool RetryRequested
             set { _retryRequested = value; }
         }
 
+        public IBsonSerializationDomain SerializationDomain => _serializationDomain;
+
         public WriteConcern WriteConcern
         {
             get { return _writeConcern; }
@@ -116,8 +121,6 @@ public virtual Task<BsonDocument> ExecuteAsync(OperationContext operationContext
         public BsonDocument ExecuteAttempt(OperationContext operationContext, RetryableWriteContext context, int attempt, long? transactionNumber)
         {
             var args = GetCommandArgs(context, attempt, transactionNumber);
-            var serializationDomain = args.MessageEncoderSettings.GetOrDefault<IBsonSerializationDomain>(
-                MessageEncoderSettingsName.SerializationDomain, BsonSerializer.DefaultSerializationDomain);
             return context.Channel.Command<BsonDocument>(
                 operationContext,
                 context.ChannelSource.Session,
@@ -131,14 +134,14 @@ public BsonDocument ExecuteAttempt(OperationContext operationContext, RetryableW
                 args.ResponseHandling,
                 BsonDocumentSerializer.Instance,
                 args.MessageEncoderSettings,
-                serializationDomain);
+                _serializationDomain);
         }
 
         public Task<BsonDocument> ExecuteAttemptAsync(OperationContext operationContext, RetryableWriteContext context, int attempt, long? transactionNumber)
         {
             var args = GetCommandArgs(context, attempt, transactionNumber);
             var serializationDomain = args.MessageEncoderSettings.GetOrDefault<IBsonSerializationDomain>(
-                MessageEncoderSettingsName.SerializationDomain, null);
+                MessageEncoderSettingsName.SerializationDomain, BsonSerializer.DefaultSerializationDomain);
             return context.Channel.CommandAsync<BsonDocument>(
                 operationContext,
                 context.ChannelSource.Session,