Async: Ensure renameCollection options are passed to the operation.

JAVA-2779

Author: rozza

driver-async/src/main/com/mongodb/async/client/MongoCollectionImpl.java

@@ -1087,7 +1087,7 @@ public void renameCollection(final MongoNamespace newCollectionNamespace, final
     @Override
     public void renameCollection(final MongoNamespace newCollectionNamespace, final RenameCollectionOptions options,
                                  final SingleResultCallback<Void> callback) {
-        executeRenameCollection(null, newCollectionNamespace, new RenameCollectionOptions(), callback);
+        executeRenameCollection(null, newCollectionNamespace, options, callback);
     }
 
     @Override
@@ -1100,7 +1100,7 @@ public void renameCollection(final ClientSession clientSession, final MongoNames
     public void renameCollection(final ClientSession clientSession, final MongoNamespace newCollectionNamespace,
                                  final RenameCollectionOptions options, final SingleResultCallback<Void> callback) {
         notNull("clientSession", clientSession);
-        executeRenameCollection(clientSession, newCollectionNamespace, new RenameCollectionOptions(), callback);
+        executeRenameCollection(clientSession, newCollectionNamespace, options, callback);
     }
 
     private void executeRenameCollection(final ClientSession clientSession, final MongoNamespace newCollectionNamespace,

driver-async/src/test/unit/com/mongodb/async/client/MongoCollectionSpecification.groovy

@@ -54,6 +54,7 @@ import com.mongodb.client.model.IndexOptions
 import com.mongodb.client.model.InsertManyOptions
 import com.mongodb.client.model.InsertOneModel
 import com.mongodb.client.model.InsertOneOptions
+import com.mongodb.client.model.RenameCollectionOptions
 import com.mongodb.client.model.ReplaceOneModel
 import com.mongodb.client.model.UpdateManyModel
 import com.mongodb.client.model.UpdateOneModel
@@ -1298,10 +1299,11 @@ class MongoCollectionSpecification extends Specification {
 
     def 'should use RenameCollectionOperation correctly'() {
         given:
-        def executor = new TestOperationExecutor([null])
+        def executor = new TestOperationExecutor([null, null])
         def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
                 true, readConcern, executor)
         def newNamespace = new MongoNamespace(namespace.getDatabaseName(), 'newName')
+        def renameCollectionOptions = new RenameCollectionOptions().dropTarget(dropTarget)
         def expectedOperation = new RenameCollectionOperation(namespace, newNamespace, ACKNOWLEDGED)
         def renameCollection = collection.&renameCollection
 
@@ -1313,8 +1315,16 @@ class MongoCollectionSpecification extends Specification {
         expect operation, isTheSameAs(expectedOperation)
         executor.getClientSession() == session
 
+        when:
+        execute(renameCollection, session, newNamespace, renameCollectionOptions)
+        operation = executor.getWriteOperation() as RenameCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation.dropTarget(dropTarget))
+        executor.getClientSession() == session
+
         where:
-        session << [null, Stub(ClientSession)]
+        [session, dropTarget] << [[null, Stub(ClientSession)], [true, false]].combinations()
     }
 
     def 'should not expect to mutate the document when inserting'() {

driver/src/test/unit/com/mongodb/MongoCollectionSpecification.groovy

@@ -39,6 +39,7 @@ import com.mongodb.client.model.IndexOptions
 import com.mongodb.client.model.InsertManyOptions
 import com.mongodb.client.model.InsertOneModel
 import com.mongodb.client.model.InsertOneOptions
+import com.mongodb.client.model.RenameCollectionOptions
 import com.mongodb.client.model.ReplaceOneModel
 import com.mongodb.client.model.UpdateManyModel
 import com.mongodb.client.model.UpdateOneModel
@@ -1285,10 +1286,11 @@ class MongoCollectionSpecification extends Specification {
 
     def 'should use RenameCollectionOperation correctly'() {
         given:
-        def executor = new TestOperationExecutor([null])
+        def executor = new TestOperationExecutor([null, null])
         def collection = new MongoCollectionImpl(namespace, Document, codecRegistry, readPreference, ACKNOWLEDGED,
                 true, readConcern, executor)
         def newNamespace = new MongoNamespace(namespace.getDatabaseName(), 'newName')
+        def renameCollectionOptions = new RenameCollectionOptions().dropTarget(dropTarget)
         def expectedOperation = new RenameCollectionOperation(namespace, newNamespace, ACKNOWLEDGED)
         def renameCollection = collection.&renameCollection
 
@@ -1300,8 +1302,16 @@ class MongoCollectionSpecification extends Specification {
         expect operation, isTheSameAs(expectedOperation)
         executor.getClientSession() == session
 
+        when:
+        execute(renameCollection, session, newNamespace, renameCollectionOptions)
+        operation = executor.getWriteOperation() as RenameCollectionOperation
+
+        then:
+        expect operation, isTheSameAs(expectedOperation.dropTarget(dropTarget))
+        executor.getClientSession() == session
+
         where:
-        session << [null, Stub(ClientSession)]
+        [session, dropTarget] << [[null, Stub(ClientSession)], [true, false]].combinations()
     }
 
     def 'should not expect to mutate the document when inserting'() {