Fix AbstractWriteSearchIndexOperation executeAsync releasing connections (#1812)

rozza · rozza · commit 97f52f83c844 · 2025-10-01T15:51:35.000+01:00
Update SyncMongoClient to assert connections are released Ensure errors thrown outside of the callback also release the resource in AsyncOperationHelper JAVA-5972
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java b/driver-core/src/main/com/mongodb/internal/operation/AbstractWriteSearchIndexOperation.java
@@ -66,9 +66,9 @@ public void executeAsync(final AsyncWriteBinding binding, final SingleResultCall
                                 writeConcernErrorTransformerAsync(binding.getOperationContext().getTimeoutContext()), (result, commandExecutionError) -> {
                                     try {
                                         swallowOrThrow(commandExecutionError);
-                                        callback.onResult(result, null);
+                                        cb.onResult(result, null);
                                     } catch (Throwable mongoCommandException) {
-                                        callback.onResult(null, mongoCommandException);
+                                        cb.onResult(null, mongoCommandException);
                                     }
                                 }
                         )
diff --git a/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java b/driver-core/src/main/com/mongodb/internal/operation/AsyncOperationHelper.java
@@ -138,6 +138,9 @@ static <R, T extends ReferenceCounted> void withAsyncSuppliedResource(final Asyn
                     AsyncCallbackSupplier<R> curriedFunction = c -> function.apply(resource, c);
                     curriedFunction.whenComplete(resource::release).get(errorHandlingCallback);
                 } catch (Exception e) {
+                    if (resource.getCount() > 0) {
+                        resource.release();
+                    }
                     errorHandlingCallback.onResult(null, e);
                 }
             }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/internal/connection/OidcAuthenticationAsyncProseTests.java b/driver-reactive-streams/src/test/functional/com/mongodb/internal/connection/OidcAuthenticationAsyncProseTests.java
@@ -33,7 +33,7 @@ public class OidcAuthenticationAsyncProseTests extends OidcAuthenticationProseTe
 
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 
     @Test
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/AbstractClientMetadataProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/AbstractClientMetadataProseTest.java
@@ -29,6 +29,6 @@
 class ClientMetadataProseTest extends AbstractClientMetadataProseTest {
 
     protected MongoClient createMongoClient(@Nullable final MongoDriverInformation mongoDriverInformation, final MongoClientSettings mongoClientSettings) {
-        return new SyncMongoClient(MongoClients.create(mongoClientSettings, mongoDriverInformation));
+        return new SyncMongoClient(mongoClientSettings, mongoDriverInformation);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/AsyncTransportSettingsTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/AsyncTransportSettingsTest.java
@@ -48,7 +48,7 @@ void testAsyncTransportSettings() {
                 .transportSettings(asyncTransportSettings)
                 .build();
 
-        try (MongoClient client = new SyncMongoClient(MongoClients.create(mongoClientSettings))) {
+        try (MongoClient client = new SyncMongoClient(mongoClientSettings)) {
             client.listDatabases().first();
         }
         verify(executorService, atLeastOnce()).execute(any());
@@ -67,7 +67,7 @@ void testExternalExecutorWasShutDown(final boolean tlsEnabled) throws Interrupte
                 .transportSettings(asyncTransportSettings)
                 .build();
 
-        try (MongoClient ignored = new SyncMongoClient(MongoClients.create(mongoClientSettings))) {
+        try (MongoClient ignored = new SyncMongoClient(mongoClientSettings)) {
             // ignored
         }
 
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/AtlasSearchIndexManagementProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/AtlasSearchIndexManagementProseTest.java
@@ -27,6 +27,6 @@
  */
 public class AtlasSearchIndexManagementProseTest extends AbstractAtlasSearchIndexManagementProseTest {
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientEncryptionDataKeyAndDoubleEncryptionTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientEncryptionDataKeyAndDoubleEncryptionTest.java
@@ -73,7 +73,7 @@ public void setUp() {
 
         // Step 1: create unencrypted client
         commandListener = new TestCommandListener();
-        client = new SyncMongoClient(MongoClients.create(getMongoClientSettingsBuilder().addCommandListener(commandListener).build()));
+        client = new SyncMongoClient(getMongoClientSettingsBuilder().addCommandListener(commandListener));
         client.getDatabase("keyvault").getCollection("datakeys").drop();
         client.getDatabase("db").getCollection("coll").drop();
 
@@ -114,12 +114,11 @@ public void setUp() {
         }};
 
         String keyVaultNamespace = "keyvault.datakeys";
-        clientEncrypted = new SyncMongoClient(MongoClients.create(getMongoClientSettingsBuilder()
+        clientEncrypted = new SyncMongoClient(getMongoClientSettingsBuilder()
                 .autoEncryptionSettings(AutoEncryptionSettings.builder()
                         .keyVaultNamespace(keyVaultNamespace)
                         .kmsProviders(kmsProviders)
                         .schemaMap(schemaMap)
-                .build())
                 .build()));
 
         clientEncryption = ClientEncryptions.create(
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientEncryptionRewrapManyDataKeyProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientEncryptionRewrapManyDataKeyProseTest.java
@@ -28,7 +28,7 @@ public class ClientEncryptionRewrapManyDataKeyProseTest extends AbstractClientEn
 
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 
     @Override
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientEncryptionTextExplicitEncryptionTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientEncryptionTextExplicitEncryptionTest.java
@@ -28,7 +28,7 @@
 public class ClientEncryptionTextExplicitEncryptionTest extends AbstractClientEncryptionTextExplicitEncryptionTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 
     @Override
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryption25LookupProseTests.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryption25LookupProseTests.java
@@ -28,7 +28,7 @@ public class ClientSideEncryption25LookupProseTests extends com.mongodb.client.C
 
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 
     @Override
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionAutoDataKeysTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionAutoDataKeysTest.java
@@ -28,7 +28,7 @@
 final class ClientSideEncryptionAutoDataKeysTest extends AbstractClientSideEncryptionAutoDataKeysTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 
     @Override
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionAwsCredentialFromEnvironmentTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionAwsCredentialFromEnvironmentTest.java
@@ -33,6 +33,6 @@ protected ClientEncryption createClientEncryption(final ClientEncryptionSettings
 
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionDeadlockTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionDeadlockTest.java
@@ -26,6 +26,6 @@
 public class ClientSideEncryptionDeadlockTest extends AbstractClientSideEncryptionDeadlockTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionDecryptionEventsTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionDecryptionEventsTest.java
@@ -28,7 +28,7 @@
 public class ClientSideEncryptionDecryptionEventsTest extends AbstractClientSideEncryptionDecryptionEventsTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 
     @Override
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionNotCreateMongocryptdClientTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionNotCreateMongocryptdClientTest.java
@@ -24,6 +24,6 @@
 final class ClientSideEncryptionNotCreateMongocryptdClientTest extends AbstractClientSideEncryptionNotCreateMongocryptdClientTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionNotSpawnMongocryptdTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionNotSpawnMongocryptdTest.java
@@ -24,6 +24,6 @@
 final class ClientSideEncryptionNotSpawnMongocryptdTest extends AbstractClientSideEncryptionNotSpawnMongocryptdTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionRangeExplicitEncryptionTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionRangeExplicitEncryptionTest.java
@@ -29,7 +29,7 @@
 public class ClientSideEncryptionRangeExplicitEncryptionTest extends AbstractClientSideEncryptionRangeExplicitEncryptionTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 
     @Override
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionUniqueIndexKeyAltNamesTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideEncryptionUniqueIndexKeyAltNamesTest.java
@@ -28,7 +28,7 @@
 public class ClientSideEncryptionUniqueIndexKeyAltNamesTest extends AbstractClientSideEncryptionUniqueIndexKeyAltNamesTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 
     @Override
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideExplicitEncryptionTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideExplicitEncryptionTest.java
@@ -29,7 +29,7 @@ public class ClientSideExplicitEncryptionTest extends AbstractClientSideEncrypti
 
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 
     @Override
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideOperationTimeoutProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ClientSideOperationTimeoutProseTest.java
@@ -75,18 +75,15 @@ public final class ClientSideOperationTimeoutProseTest extends AbstractClientSid
 
     @Override
     protected com.mongodb.client.MongoClient createMongoClient(final MongoClientSettings mongoClientSettings) {
-        wrapped = createReactiveClient(mongoClientSettings);
-        return new SyncMongoClient(wrapped);
+        SyncMongoClient client = new SyncMongoClient(mongoClientSettings);
+        wrapped = client.getWrapped();
+        return client;
     }
 
     private static MongoClient createReactiveClient(final MongoClientSettings.Builder builder) {
         return MongoClients.create(builder.build());
     }
 
-    private static MongoClient createReactiveClient(final MongoClientSettings mongoClientSettings) {
-        return MongoClients.create(mongoClientSettings);
-    }
-
     @Override
     protected com.mongodb.client.gridfs.GridFSBucket createGridFsBucket(final com.mongodb.client.MongoDatabase mongoDatabase,
                                                                         final String bucketName) {
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/CrudProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/CrudProseTest.java
@@ -26,6 +26,6 @@
 final class CrudProseTest extends com.mongodb.client.CrudProseTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings.Builder mongoClientSettingsBuilder) {
-        return new SyncMongoClient(MongoClients.create(mongoClientSettingsBuilder.build()));
+        return new SyncMongoClient(mongoClientSettingsBuilder);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/DnsConfigurationTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/DnsConfigurationTest.java
@@ -24,6 +24,6 @@
 public class DnsConfigurationTest extends AbstractDnsConfigurationTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ExplainTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ExplainTest.java
@@ -28,9 +28,7 @@
 public class ExplainTest extends AbstractExplainTest {
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(
-                MongoClientSettings.builder(settings).contextProvider(CONTEXT_PROVIDER).build()
-        ));
+        return new SyncMongoClient(MongoClientSettings.builder(settings).contextProvider(CONTEXT_PROVIDER));
     }
 
     @Test
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/MongoCollectionTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/MongoCollectionTest.java
@@ -34,7 +34,7 @@ protected MongoDatabase getDatabase(final String databaseName) {
 
     private com.mongodb.client.MongoClient createMongoClient() {
         if (mongoClient == null) {
-            mongoClient = new SyncMongoClient(MongoClients.create(getMongoClientSettingsBuilder().build()));
+            mongoClient = new SyncMongoClient(getMongoClientSettingsBuilder());
         }
         return mongoClient;
     }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/MongoWriteConcernWithResponseExceptionTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/MongoWriteConcernWithResponseExceptionTest.java
@@ -25,7 +25,6 @@
 public class MongoWriteConcernWithResponseExceptionTest {
     @Test
     public void doesNotLeak() throws InterruptedException {
-        com.mongodb.client.MongoWriteConcernWithResponseExceptionTest.doesNotLeak(
-                mongoClientSettings -> new SyncMongoClient(MongoClients.create(mongoClientSettings)));
+        com.mongodb.client.MongoWriteConcernWithResponseExceptionTest.doesNotLeak(SyncMongoClient::new);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ReactiveContextProviderTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ReactiveContextProviderTest.java
@@ -109,10 +109,8 @@ List<DynamicTest> testMongoIterableFirstPassesTheContext() {
 
     private MongoClient getMongoClient() {
         if (mongoClient == null) {
-            mongoClient = new SyncMongoClient(
-                    MongoClients.create(getMongoClientSettingsBuilder()
-                            .contextProvider(CONTEXT_PROVIDER)
-                            .build()));
+            mongoClient = new SyncMongoClient(getMongoClientSettingsBuilder()
+                            .contextProvider(CONTEXT_PROVIDER));
         }
         return mongoClient;
     }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ReactiveInitialDnsSeedlistDiscoveryTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ReactiveInitialDnsSeedlistDiscoveryTest.java
@@ -39,6 +39,6 @@ public ReactiveInitialDnsSeedlistDiscoveryTest(final String filename, final Stri
 
     @Override
     public MongoClient createMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/RetryableReadsProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/RetryableReadsProseTest.java
@@ -40,7 +40,7 @@ final class RetryableReadsProseTest {
     @Test
     void poolClearedExceptionMustBeRetryable() throws InterruptedException, ExecutionException, TimeoutException {
         RetryableWritesProseTest.poolClearedExceptionMustBeRetryable(
-                mongoClientSettings -> new SyncMongoClient(MongoClients.create(mongoClientSettings)),
+                SyncMongoClient::new,
                 mongoCollection -> mongoCollection.find(eq(0)).iterator().hasNext(), "find", false);
     }
 
@@ -52,7 +52,7 @@ void poolClearedExceptionMustBeRetryable() throws InterruptedException, Executio
     @Test
     void retriesOnDifferentMongosWhenAvailable() {
         RetryableWritesProseTest.retriesOnDifferentMongosWhenAvailable(
-                mongoClientSettings -> new SyncMongoClient(MongoClients.create(mongoClientSettings)),
+                SyncMongoClient::new,
                 mongoCollection -> {
                     try (MongoCursor<Document> cursor = mongoCollection.find().iterator()) {
                         return cursor.hasNext();
@@ -68,7 +68,7 @@ void retriesOnDifferentMongosWhenAvailable() {
     @Test
     void retriesOnSameMongosWhenAnotherNotAvailable() {
         RetryableWritesProseTest.retriesOnSameMongosWhenAnotherNotAvailable(
-                mongoClientSettings -> new SyncMongoClient(MongoClients.create(mongoClientSettings)),
+                SyncMongoClient::new,
                 mongoCollection -> {
                     try (MongoCursor<Document> cursor = mongoCollection.find().iterator()) {
                         return cursor.hasNext();
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/RetryableWritesProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/RetryableWritesProseTest.java
@@ -48,7 +48,7 @@ public void setUp() {
     @Test
     public void poolClearedExceptionMustBeRetryable() throws InterruptedException, ExecutionException, TimeoutException {
         com.mongodb.client.RetryableWritesProseTest.poolClearedExceptionMustBeRetryable(
-                mongoClientSettings -> new SyncMongoClient(MongoClients.create(mongoClientSettings)),
+                SyncMongoClient::new,
                 mongoCollection -> mongoCollection.insertOne(new Document()), "insert", true);
     }
 
@@ -58,7 +58,7 @@ public void poolClearedExceptionMustBeRetryable() throws InterruptedException, E
     @Test
     public void originalErrorMustBePropagatedIfNoWritesPerformed() throws InterruptedException {
         com.mongodb.client.RetryableWritesProseTest.originalErrorMustBePropagatedIfNoWritesPerformed(
-                mongoClientSettings -> new SyncMongoClient(MongoClients.create(mongoClientSettings)));
+                SyncMongoClient::new);
     }
 
     /**
@@ -67,7 +67,7 @@ public void originalErrorMustBePropagatedIfNoWritesPerformed() throws Interrupte
     @Test
     public void retriesOnDifferentMongosWhenAvailable() {
         com.mongodb.client.RetryableWritesProseTest.retriesOnDifferentMongosWhenAvailable(
-                mongoClientSettings -> new SyncMongoClient(MongoClients.create(mongoClientSettings)),
+                SyncMongoClient::new,
                 mongoCollection -> mongoCollection.insertOne(new Document()), "insert", true);
     }
 
@@ -77,7 +77,7 @@ public void retriesOnDifferentMongosWhenAvailable() {
     @Test
     public void retriesOnSameMongosWhenAnotherNotAvailable() {
         com.mongodb.client.RetryableWritesProseTest.retriesOnSameMongosWhenAnotherNotAvailable(
-                mongoClientSettings -> new SyncMongoClient(MongoClients.create(mongoClientSettings)),
+                SyncMongoClient::new,
                 mongoCollection -> mongoCollection.insertOne(new Document()), "insert", true);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ServerSelectionProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/ServerSelectionProseTest.java
@@ -22,6 +22,6 @@
 
 final class ServerSelectionProseTest extends AbstractServerSelectionProseTest {
     protected MongoClient createClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/SessionsProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/SessionsProseTest.java
@@ -24,6 +24,6 @@
 public class SessionsProseTest extends AbstractSessionsProseTest {
     @Override
     protected MongoClient getMongoClient(final MongoClientSettings settings) {
-        return new SyncMongoClient(MongoClients.create(settings));
+        return new SyncMongoClient(settings);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/X509AuthenticationTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/X509AuthenticationTest.java
@@ -23,6 +23,6 @@
 public class X509AuthenticationTest extends AbstractX509AuthenticationTest {
     @Override
     protected com.mongodb.client.MongoClient createMongoClient(final MongoClientSettings mongoClientSettings) {
-        return new SyncMongoClient(MongoClients.create(mongoClientSettings));
+        return new SyncMongoClient(mongoClientSettings);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/csot/ClientSideOperationsEncryptionTimeoutProseTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/csot/ClientSideOperationsEncryptionTimeoutProseTest.java
@@ -33,6 +33,6 @@ public ClientEncryption createClientEncryption(final ClientEncryptionSettings.Bu
 
     @Override
     protected MongoClient createMongoClient(final MongoClientSettings.Builder builder) {
-        return new SyncMongoClient(com.mongodb.reactivestreams.client.MongoClients.create(builder.build()));
+        return new SyncMongoClient(builder);
     }
 }
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/syncadapter/SyncMongoClient.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/syncadapter/SyncMongoClient.java
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/UnifiedReactiveStreamsTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/unified/UnifiedReactiveStreamsTest.java
diff --git a/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/vector/BinaryVectorFunctionalTest.java b/driver-reactive-streams/src/test/functional/com/mongodb/reactivestreams/client/vector/BinaryVectorFunctionalTest.java

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,9 @@ public void executeAsync(final AsyncWriteBinding binding, final SingleResultCall`
`66`	`66`	`writeConcernErrorTransformerAsync(binding.getOperationContext().getTimeoutContext()), (result, commandExecutionError) -> {`
`67`	`67`	`try {`
`68`	`68`	`swallowOrThrow(commandExecutionError);`
`69`		`- callback.onResult(result, null);`
	`69`	`+ cb.onResult(result, null);`
`70`	`70`	`} catch (Throwable mongoCommandException) {`
`71`		`- callback.onResult(null, mongoCommandException);`
	`71`	`+ cb.onResult(null, mongoCommandException);`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`	`)`
Original file line number	Diff line number	Diff line change
`@@ -138,6 +138,9 @@ static <R, T extends ReferenceCounted> void withAsyncSuppliedResource(final Asyn`
`138`	`138`	`AsyncCallbackSupplier<R> curriedFunction = c -> function.apply(resource, c);`
`139`	`139`	`curriedFunction.whenComplete(resource::release).get(errorHandlingCallback);`
`140`	`140`	`} catch (Exception e) {`
	`141`	`+ if (resource.getCount() > 0) {`
	`142`	`+ resource.release();`
	`143`	`+ }`
`141`	`144`	`errorHandlingCallback.onResult(null, e);`
`142`	`145`	`}`
`143`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public class OidcAuthenticationAsyncProseTests extends OidcAuthenticationProseTe`
`33`	`33`
`34`	`34`	`@Override`
`35`	`35`	`protected MongoClient createMongoClient(final MongoClientSettings settings) {`
`36`		`- return new SyncMongoClient(MongoClients.create(settings));`
	`36`	`+ return new SyncMongoClient(settings);`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`@Test`
Original file line number	Diff line number	Diff line change
`@@ -29,6 +29,6 @@`
`29`	`29`	`class ClientMetadataProseTest extends AbstractClientMetadataProseTest {`
`30`	`30`
`31`	`31`	`protected MongoClient createMongoClient(@Nullable final MongoDriverInformation mongoDriverInformation, final MongoClientSettings mongoClientSettings) {`
`32`		`- return new SyncMongoClient(MongoClients.create(mongoClientSettings, mongoDriverInformation));`
	`32`	`+ return new SyncMongoClient(mongoClientSettings, mongoDriverInformation);`
`33`	`33`	`}`
`34`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ void testAsyncTransportSettings() {`
`48`	`48`	`.transportSettings(asyncTransportSettings)`
`49`	`49`	`.build();`
`50`	`50`
`51`		`- try (MongoClient client = new SyncMongoClient(MongoClients.create(mongoClientSettings))) {`
	`51`	`+ try (MongoClient client = new SyncMongoClient(mongoClientSettings)) {`
`52`	`52`	`client.listDatabases().first();`
`53`	`53`	`}`
`54`	`54`	`verify(executorService, atLeastOnce()).execute(any());`
`@@ -67,7 +67,7 @@ void testExternalExecutorWasShutDown(final boolean tlsEnabled) throws Interrupte`
`67`	`67`	`.transportSettings(asyncTransportSettings)`
`68`	`68`	`.build();`
`69`	`69`
`70`		`- try (MongoClient ignored = new SyncMongoClient(MongoClients.create(mongoClientSettings))) {`
	`70`	`+ try (MongoClient ignored = new SyncMongoClient(mongoClientSettings)) {`
`71`	`71`	`// ignored`
`72`	`72`	`}`
`73`	`73`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,6 @@`
`27`	`27`	`*/`
`28`	`28`	`public class AtlasSearchIndexManagementProseTest extends AbstractAtlasSearchIndexManagementProseTest {`
`29`	`29`	`protected MongoClient createMongoClient(final MongoClientSettings settings) {`
`30`		`- return new SyncMongoClient(MongoClients.create(settings));`
	`30`	`+ return new SyncMongoClient(settings);`
`31`	`31`	`}`
`32`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class ClientEncryptionRewrapManyDataKeyProseTest extends AbstractClientEn`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`protected MongoClient createMongoClient(final MongoClientSettings settings) {`
`31`		`- return new SyncMongoClient(MongoClients.create(settings));`
	`31`	`+ return new SyncMongoClient(settings);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`public class ClientEncryptionTextExplicitEncryptionTest extends AbstractClientEncryptionTextExplicitEncryptionTest {`
`29`	`29`	`@Override`
`30`	`30`	`protected MongoClient createMongoClient(final MongoClientSettings settings) {`
`31`		`- return new SyncMongoClient(MongoClients.create(settings));`
	`31`	`+ return new SyncMongoClient(settings);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public class ClientSideEncryption25LookupProseTests extends com.mongodb.client.C`
`28`	`28`
`29`	`29`	`@Override`
`30`	`30`	`protected MongoClient createMongoClient(final MongoClientSettings settings) {`
`31`		`- return new SyncMongoClient(MongoClients.create(settings));`
	`31`	`+ return new SyncMongoClient(settings);`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`@Override`