PR

Author: Oleksandr Poliakov

src/MongoDB.Driver/AggregateHelper.cs

@@ -27,7 +27,7 @@ public static RenderedPipelineDefinition<TResult> RenderAggregatePipeline<TDocum
 
             var lastStage = renderedPipeline.Documents.LastOrDefault();
             var lastStageName = lastStage?.GetElement(0).Name;
-            isAggregateToCollection = lastStage != null && (lastStageName == "$out" || lastStageName == "$merge");
+            isAggregateToCollection = lastStageName == "$out" || lastStageName == "$merge";
 
             return renderedPipeline;
         }

src/MongoDB.Driver/MongoClient.cs

@@ -67,8 +67,8 @@ public MongoClient(MongoClientSettings settings)
 
             _cluster = _settings.ClusterSource.Get(_settings.ToClusterKey());
             _operationExecutor = new OperationExecutor(this);
-            _readOperationOptions = new ReadOperationOptions(DefaultReadPreference: _settings.ReadPreference);
-            _writeOperationOptions = new WriteOperationOptions();
+            _readOperationOptions = new(DefaultReadPreference: _settings.ReadPreference);
+            _writeOperationOptions = new();
 
             if (settings.AutoEncryptionOptions != null)
             {
@@ -121,6 +121,7 @@ internal MongoClient(IOperationExecutor operationExecutor, MongoClientSettings s
         // internal methods
         internal void ConfigureAutoEncryptionMessageEncoderSettings(MessageEncoderSettings messageEncoderSettings)
         {
+            ThrowIfDisposed();
             var autoEncryptionOptions = _settings.AutoEncryptionOptions;
             if (autoEncryptionOptions != null)
             {

src/MongoDB.Driver/MongoDatabase.cs

@@ -325,9 +325,11 @@ public IMongoCollection<TDocument> GetCollection<TDocument>(string name, MongoCo
 
         public IAsyncCursor<string> ListCollectionNames(ListCollectionNamesOptions options = null, CancellationToken cancellationToken = default)
         {
-            var cursor = OperationExecutor.ExecuteReadOperation(CreateListCollectionNamesOperation(options),
+            var cursor = OperationExecutor.ExecuteReadOperation(
+                CreateListCollectionNamesOperation(options),
                 _readOperationOptions with { DefaultReadPreference = ReadPreference.Primary },
-                null, cancellationToken);
+                null,
+                cancellationToken);
             return new BatchTransformingAsyncCursor<BsonDocument, string>(cursor, ExtractCollectionNames);
         }
 

src/MongoDB.Driver/OperationExecutor.cs

@@ -37,7 +37,7 @@ public TResult ExecuteReadOperation<TResult>(
             IClientSessionHandle session,
             CancellationToken cancellationToken)
         {
-            bool isOwnSession = session == null;
+            var isOwnSession = session == null;
             session ??= StartImplicitSession(cancellationToken);
 
             try
@@ -61,7 +61,7 @@ public async Task<TResult> ExecuteReadOperationAsync<TResult>(
             IClientSessionHandle session,
             CancellationToken cancellationToken)
         {
-            bool isOwnSession = session == null;
+            var isOwnSession = session == null;
             session ??= await StartImplicitSessionAsync(cancellationToken).ConfigureAwait(false);
 
             try
@@ -85,7 +85,7 @@ public TResult ExecuteWriteOperation<TResult>(
             IClientSessionHandle session,
             CancellationToken cancellationToken)
         {
-            bool isOwnSession = session == null;
+            var isOwnSession = session == null;
             session ??= StartImplicitSession(cancellationToken);
 
             try
@@ -108,7 +108,7 @@ public async Task<TResult> ExecuteWriteOperationAsync<TResult>(
             IClientSessionHandle session,
             CancellationToken cancellationToken)
         {
-            bool isOwnSession = session == null;
+            var isOwnSession = session == null;
             session ??= await StartImplicitSessionAsync(cancellationToken).ConfigureAwait(false);
 
             try
@@ -151,7 +151,7 @@ private IReadWriteBindingHandle CreateReadWriteBinding(IClientSessionHandle sess
         private IClientSessionHandle StartImplicitSession()
         {
             var options = new ClientSessionOptions { CausalConsistency = false, Snapshot = false };
-            ICoreSessionHandle coreSession = _client.GetClusterInternal().StartSession(options.ToCore(isImplicit: true));
+            var coreSession = _client.GetClusterInternal().StartSession(options.ToCore(isImplicit: true));
             return new ClientSessionHandle(_client, options, coreSession);
         }
     }

tests/MongoDB.Driver.Tests/OperationExecutorTests.cs

@@ -29,7 +29,7 @@ public class OperationExecutorTests
     {
         [Theory]
         [ParameterAttributeData]
-        public async Task StartImplicitSessionTests([Values(true, false)]bool isAsync)
+        public async Task StartImplicitSession_should_call_cluster([Values(true, false)]bool isAsync)
         {
             var subject = CreateSubject(out var clusterMock, out _);
             if (isAsync)
@@ -46,7 +46,7 @@ public async Task StartImplicitSessionTests([Values(true, false)]bool isAsync)
 
         [Theory]
         [MemberData(nameof(ImplicitSessionTestCases))]
-        public async Task ExecuteReadOperationShouldStartAndDisposeImplicitSessionIfNeeded(bool shouldCreateSession, bool isAsync, IClientSessionHandle session)
+        public async Task ExecuteReadOperation_should_start_and_dispose_implicit_session_if_needed(bool shouldCreateSession, bool isAsync, IClientSessionHandle session)
         {
             var subject = CreateSubject(out var clusterMock, out var implicitSessionMock);
             var readOperation = Mock.Of<IReadOperation<object>>();
@@ -63,7 +63,7 @@ await subject.ExecuteReadOperationAsync(readOperation, readOperationOptions, ses
 
         [Theory]
         [MemberData(nameof(ImplicitSessionTestCases))]
-        public async Task ExecuteWriteOperationShouldStartAndDisposeImplicitSessionIfNeeded(bool shouldCreateSession, bool isAsync, IClientSessionHandle session)
+        public async Task ExecuteWriteOperation_should_start_and_dispose_implicit_session_if_needed(bool shouldCreateSession, bool isAsync, IClientSessionHandle session)
         {
             var subject = CreateSubject(out var clusterMock, out var implicitSessionMock);
             var writeOperation = Mock.Of<IWriteOperation<object>>();