incorporate review feedback to add an additional optional argument instead of an overloaded function

Author: kkloberdanz

src/mongocxx/collection.cpp

@@ -1308,23 +1308,15 @@ void collection::_drop(const client_session* session,
     }
 }
 
-void collection::drop(const stdx::optional<mongocxx::write_concern>& wc) {
-    return _drop(nullptr, wc, {});
+void collection::drop(const stdx::optional<mongocxx::write_concern>& wc,
+                      bsoncxx::document::view_or_value collection_options) {
+    return _drop(nullptr, wc, collection_options);
 }
 
 void collection::drop(const client_session& session,
-                      const stdx::optional<mongocxx::write_concern>& wc) {
-    return _drop(&session, wc, {});
-}
-
-// From the spec:
-// https://github.com/mongodb/specifications/blob/master/source/client-side-encryption/client-side-encryption.rst#user-facing-api
-// > Drivers MUST support a BSON document option named encryptedFields for any
-// > drop command helpers (e.g. Database.dropCollection(), Collection.drop()).
-// > This option will only be interpreted by the helper method and MUST NOT be
-// > passed to the drop command.
-void collection::drop(bsoncxx::document::view_or_value collection_options) {
-    return _drop(nullptr, {}, collection_options);
+                      const stdx::optional<mongocxx::write_concern>& wc,
+                      bsoncxx::document::view_or_value collection_options) {
+    return _drop(&session, wc, collection_options);
 }
 
 void collection::read_concern(class read_concern rc) {

src/mongocxx/collection.hpp

@@ -699,7 +699,8 @@ class MONGOCXX_API collection {
     /// @note
     ///   Write concern supported only for MongoDB 3.4+.
     ///
-    void drop(const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
+    void drop(const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {},
+              bsoncxx::document::view_or_value collection_options = {});
 
     ///
     /// Drops this collection and all its contained documents from the database.
@@ -720,25 +721,8 @@ class MONGOCXX_API collection {
     ///   Write concern supported only for MongoDB 3.4+.
     ///
     void drop(const client_session& session,
-              const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {});
-
-    ///
-    /// Drops this collection and all its contained documents from the database.
-    ///
-    /// @param collection_options
-    ///   the options for the dropped collection.
-    ///
-    /// @exception
-    ///   mongocxx::operation_exception if the operation fails.
-    ///
-    /// @see
-    ///   https://docs.mongodb.com/manual/reference/command/drop/
-    ///   https://mongoc.org/libmongoc/current/mongoc_collection_drop_with_opts.html
-    ///
-    /// @note
-    ///   Needed for Queryable Encryption Support.
-    ///
-    void drop(bsoncxx::document::view_or_value collection_options);
+              const bsoncxx::stdx::optional<mongocxx::write_concern>& write_concern = {},
+              bsoncxx::document::view_or_value collection_options = {});
 
     ///
     /// @}

src/mongocxx/test/spec/operation.cpp

@@ -1309,7 +1309,7 @@ document::value operation_runner::_run_drop_collection(document::view operation)
     if (arguments.find("encryptedFields") != arguments.end()) {
         auto encrypted_fields = arguments["encryptedFields"].get_document().value;
         auto encrypted_fields_map = make_document(kvp("encryptedFields", encrypted_fields));
-        _db->collection(collection_name).drop(std::move(encrypted_fields_map));
+        _db->collection(collection_name).drop(stdx::nullopt, std::move(encrypted_fields_map));
     } else {
         _db->collection(collection_name).drop();
     }