Additional fixes

Author: papafe

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

@@ -244,7 +244,7 @@ private CursorBatch<TDocument> CreateCursorBatch(BsonDocument result)
 
             using (batch)
             {
-                var documents = CursorBatchDeserializationHelper.DeserializeBatch(batch, _serializer, _messageEncoderSettings);
+                var documents = CursorBatchDeserializationHelper.DeserializeBatch(batch, _serializer, _messageEncoderSettings, _serializationDomain);
                 return new CursorBatch<TDocument>(cursorId, postBatchResumeToken, documents);
             }
         }

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

@@ -34,9 +34,10 @@ internal static class CursorBatchDeserializationHelper
         /// <param name="batch">The batch.</param>
         /// <param name="documentSerializer">The document serializer.</param>
         /// <param name="messageEncoderSettings">The message encoder settings.</param>
+        /// <param name="serializationDomain">The serialization domain.</param>
         /// <returns>The documents.</returns>
         [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Usage", "CA2202:Do not dispose objects multiple times")]
-        public static List<TDocument> DeserializeBatch<TDocument>(RawBsonArray batch, IBsonSerializer<TDocument> documentSerializer, MessageEncoderSettings messageEncoderSettings)
+        public static List<TDocument> DeserializeBatch<TDocument>(RawBsonArray batch, IBsonSerializer<TDocument> documentSerializer, MessageEncoderSettings messageEncoderSettings, IBsonSerializationDomain serializationDomain)
         {
             var documents = new List<TDocument>();
 
@@ -46,8 +47,6 @@ public static List<TDocument> DeserializeBatch<TDocument>(RawBsonArray batch, IB
                 readerSettings.Encoding = messageEncoderSettings.GetOrDefault(MessageEncoderSettingsName.ReadEncoding, Utf8Encodings.Strict);
             };
 
-            var serializationDomain = messageEncoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null);
-
             using (var stream = new ByteBufferStream(batch.Slice, ownsBuffer: false))
             using (var reader = new BsonBinaryReader(stream, readerSettings))
             {

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

@@ -47,7 +47,6 @@ public EstimatedDocumentCountOperation(CollectionNamespace collectionNamespace,
         {
         }
 
-
         public CollectionNamespace CollectionNamespace => _collectionNamespace;
 
         public BsonValue Comment

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

@@ -176,12 +176,10 @@ private TResult ProcessCommandResult(ConnectionId connectionId, RawBsonDocument
                 Encoding = _messageEncoderSettings.GetOrDefault<UTF8Encoding>(MessageEncoderSettingsName.ReadEncoding, Utf8Encodings.Strict)
             };
 
-            var serializationDomain = _messageEncoderSettings.GetOrDefault<IBsonSerializationDomain>(MessageEncoderSettingsName.SerializationDomain, null);
-
             using (var stream = new ByteBufferStream(rawBsonDocument.Slice, ownsBuffer: false))
             using (var reader = new BsonBinaryReader(stream, binaryReaderSettings))
             {
-                var context = BsonDeserializationContext.CreateRoot(reader, serializationDomain);
+                var context = BsonDeserializationContext.CreateRoot(reader, _serializationDomain);
                 return _resultSerializer.Deserialize(context);
             }
         }

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

@@ -383,7 +383,7 @@ private CursorBatch<TDocument> CreateFirstCursorBatch(BsonDocument cursorDocumen
 
             using (batch)
             {
-                var documents = CursorBatchDeserializationHelper.DeserializeBatch(batch, _resultSerializer, _messageEncoderSettings);
+                var documents = CursorBatchDeserializationHelper.DeserializeBatch(batch, _resultSerializer, _messageEncoderSettings, _serializationDomain);
                 return new CursorBatch<TDocument>(cursorId, documents);
             }
         }

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

@@ -117,7 +117,7 @@ public BsonDocument ExecuteAttempt(OperationContext operationContext, RetryableW
         {
             var args = GetCommandArgs(context, attempt, transactionNumber);
             var serializationDomain = args.MessageEncoderSettings.GetOrDefault<IBsonSerializationDomain>(
-                MessageEncoderSettingsName.SerializationDomain, null);
+                MessageEncoderSettingsName.SerializationDomain, BsonSerializer.DefaultSerializationDomain);
             return context.Channel.Command<BsonDocument>(
                 operationContext,
                 context.ChannelSource.Session,

tests/MongoDB.Driver.Tests/Core/Operations/CursorBatchDeserializationHelperTests.cs

@@ -16,6 +16,7 @@
 using FluentAssertions;
 using MongoDB.Bson;
 using MongoDB.Bson.IO;
+using MongoDB.Bson.Serialization;
 using MongoDB.Bson.Serialization.Serializers;
 using MongoDB.Driver.Core.WireProtocol.Messages.Encoders;
 using Xunit;
@@ -34,7 +35,7 @@ public void DeserializeBatch_should_return_expected_result_when_batch_has_one_do
             var documentSerializer = BsonDocumentSerializer.Instance;
             var messageEncoderSettings = new MessageEncoderSettings();
 
-            var result = CursorBatchDeserializationHelper.DeserializeBatch<BsonDocument>(batch, documentSerializer, messageEncoderSettings);
+            var result = CursorBatchDeserializationHelper.DeserializeBatch<BsonDocument>(batch, documentSerializer, messageEncoderSettings, BsonSerializer.DefaultSerializationDomain);
 
             result.Count.Should().Be(1);
             result[0].Should().BeOfType<BsonDocument>();
@@ -51,7 +52,7 @@ public void DeserializeBatch_should_return_expected_result_when_batch_has_two_do
             var documentSerializer = BsonDocumentSerializer.Instance;
             var messageEncoderSettings = new MessageEncoderSettings();
 
-            var result = CursorBatchDeserializationHelper.DeserializeBatch<BsonDocument>(batch, documentSerializer, messageEncoderSettings);
+            var result = CursorBatchDeserializationHelper.DeserializeBatch<BsonDocument>(batch, documentSerializer, messageEncoderSettings, BsonSerializer.DefaultSerializationDomain);
 
             result.Count.Should().Be(2);
             result[0].Should().BeOfType<BsonDocument>();
@@ -70,7 +71,7 @@ public void DeserializeBatch_should_return_expected_result_when_batch_is_empty()
             var documentSerializer = BsonDocumentSerializer.Instance;
             var messageEncoderSettings = new MessageEncoderSettings();
 
-            var result = CursorBatchDeserializationHelper.DeserializeBatch<BsonDocument>(batch, documentSerializer, messageEncoderSettings);
+            var result = CursorBatchDeserializationHelper.DeserializeBatch<BsonDocument>(batch, documentSerializer, messageEncoderSettings, BsonSerializer.DefaultSerializationDomain);
 
             result.Count.Should().Be(0);
         }
@@ -86,7 +87,7 @@ public void DeserializeBatch_should_return_expected_result_when_GuidRepresentati
             var documentSerializer = BsonDocumentSerializer.Instance;
             var messageEncoderSettings = new MessageEncoderSettings { { "GuidRepresentation", GuidRepresentation.Standard } };
 
-            var result = CursorBatchDeserializationHelper.DeserializeBatch<BsonDocument>(batch, documentSerializer, messageEncoderSettings);
+            var result = CursorBatchDeserializationHelper.DeserializeBatch<BsonDocument>(batch, documentSerializer, messageEncoderSettings, BsonSerializer.DefaultSerializationDomain);
 
             result.Count.Should().Be(1);
             result[0].Should().BeOfType<BsonDocument>();