v1: find_one_and_delete_options (CXX-3237, CXX-3238) (#1526)

Author: eramongodb

src/mongocxx/include/mongocxx/v1/find_one_and_delete_options.hpp

@@ -182,6 +182,8 @@ class find_one_and_delete_options {
     /// Return the current "comment" field.
     ///
     MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v1::stdx::optional<bsoncxx::v1::types::view> const) comment() const;
+
+    class internal;
 };
 
 } // namespace v1

src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete-fwd.hpp

@@ -14,6 +14,8 @@
 
 #pragma once
 
+#include <mongocxx/v1/find_one_and_delete_options-fwd.hpp> // IWYU pragma: export
+
 #include <mongocxx/config/prelude.hpp>
 
 namespace mongocxx {
@@ -29,7 +31,7 @@ class find_one_and_delete;
 namespace mongocxx {
 namespace options {
 
-using ::mongocxx::v_noabi::options::find_one_and_delete;
+using v_noabi::options::find_one_and_delete;
 
 } // namespace options
 } // namespace mongocxx
@@ -40,3 +42,6 @@ using ::mongocxx::v_noabi::options::find_one_and_delete;
 /// @file
 /// Declares @ref mongocxx::v_noabi::options::find_one_and_delete.
 ///
+/// @par Includes
+/// - @ref mongocxx/v1/find_one_and_delete_options-fwd.hpp
+///

src/mongocxx/include/mongocxx/v_noabi/mongocxx/options/find_one_and_delete.hpp

@@ -14,13 +14,23 @@
 
 #pragma once
 
+#include <mongocxx/options/find_one_and_delete-fwd.hpp> // IWYU pragma: export
+
+//
+
+#include <bsoncxx/v1/document/value.hpp>
+#include <bsoncxx/v1/types/value.hpp>
+
+#include <mongocxx/v1/find_one_and_delete_options.hpp> // IWYU pragma: export
+
 #include <chrono>
 #include <cstdint> // IWYU pragma: keep: backward compatibility, to be removed.
+#include <utility>
 
-#include <mongocxx/options/find_one_and_delete-fwd.hpp> // IWYU pragma: export
-
+#include <bsoncxx/document/view.hpp>
 #include <bsoncxx/document/view_or_value.hpp>
 #include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/types/bson_value/view.hpp>
 #include <bsoncxx/types/bson_value/view_or_value.hpp>
 
 #include <mongocxx/hint.hpp>
@@ -37,6 +47,60 @@ namespace options {
 ///
 class find_one_and_delete {
    public:
+    ///
+    /// Default initialization.
+    ///
+    find_one_and_delete() = default;
+
+    ///
+    /// Construct with the @ref mongocxx::v1 equivalent.
+    ///
+    /* explicit(false) */ MONGOCXX_ABI_EXPORT_CDECL() find_one_and_delete(v1::find_one_and_delete_options opts);
+
+    ///
+    /// Convert to the @ref mongocxx::v1 equivalent.
+    ///
+    explicit operator v1::find_one_and_delete_options() const {
+        using bsoncxx::v_noabi::to_v1;
+        using mongocxx::v_noabi::to_v1;
+
+        v1::find_one_and_delete_options ret;
+
+        if (_collation) {
+            ret.collation(bsoncxx::v1::document::value{to_v1(_collation->view())});
+        }
+
+        if (_max_time) {
+            ret.max_time(*_max_time);
+        }
+
+        if (_projection) {
+            ret.projection(bsoncxx::v1::document::value{to_v1(_projection->view())});
+        }
+
+        if (_ordering) {
+            ret.sort(bsoncxx::v1::document::value{to_v1(_ordering->view())});
+        }
+
+        if (_write_concern) {
+            ret.write_concern(to_v1(*_write_concern));
+        }
+
+        if (_hint) {
+            ret.hint(to_v1(*_hint));
+        }
+
+        if (_let) {
+            ret.let(bsoncxx::v1::document::value{to_v1(_let->view())});
+        }
+
+        if (_comment) {
+            ret.comment(bsoncxx::v1::types::value{to_v1(_comment->view())});
+        }
+
+        return ret;
+    }
+
     /// Sets the collation for this operation.
     ///
     /// @param collation
@@ -49,8 +113,10 @@ class find_one_and_delete {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/findAndModify/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(find_one_and_delete&)
-    collation(bsoncxx::v_noabi::document::view_or_value collation);
+    find_one_and_delete& collation(bsoncxx::v_noabi::document::view_or_value collation) {
+        _collation = std::move(collation);
+        return *this;
+    }
 
     ///
     /// Retrieves the current collation for this operation.
@@ -61,8 +127,9 @@ class find_one_and_delete {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/findAndModify/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> const&)
-    collation() const;
+    bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> const& collation() const {
+        return _collation;
+    }
 
     ///
     /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
@@ -77,7 +144,10 @@ class find_one_and_delete {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/findAndModify/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(find_one_and_delete&) max_time(std::chrono::milliseconds max_time);
+    find_one_and_delete& max_time(std::chrono::milliseconds max_time) {
+        _max_time = max_time;
+        return *this;
+    }
 
     ///
     /// The current max_time setting.
@@ -87,8 +157,9 @@ class find_one_and_delete {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/findAndModify/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<std::chrono::milliseconds> const&)
-    max_time() const;
+    bsoncxx::v_noabi::stdx::optional<std::chrono::milliseconds> const& max_time() const {
+        return _max_time;
+    }
 
     ///
     /// Sets a projection that limits the fields to return.
@@ -103,8 +174,10 @@ class find_one_and_delete {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/findAndModify/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(find_one_and_delete&)
-    projection(bsoncxx::v_noabi::document::view_or_value projection);
+    find_one_and_delete& projection(bsoncxx::v_noabi::document::view_or_value projection) {
+        _projection = std::move(projection);
+        return *this;
+    }
 
     ///
     /// Gets the current projection set on this operation.
@@ -114,8 +187,9 @@ class find_one_and_delete {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/findAndModify/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> const&)
-    projection() const;
+    bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> const& projection() const {
+        return _projection;
+    }
 
     ///
     /// Sets the order to search for a matching document.
@@ -133,8 +207,10 @@ class find_one_and_delete {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/findAndModify/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(find_one_and_delete&)
-    sort(bsoncxx::v_noabi::document::view_or_value ordering);
+    find_one_and_delete& sort(bsoncxx::v_noabi::document::view_or_value ordering) {
+        _ordering = std::move(ordering);
+        return *this;
+    }
 
     ///
     /// Gets the current sort ordering.
@@ -144,8 +220,9 @@ class find_one_and_delete {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/findAndModify/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> const&)
-    sort() const;
+    bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> const& sort() const {
+        return _ordering;
+    }
 
     ///
     /// Sets the write concern for this operation.
@@ -160,8 +237,10 @@ class find_one_and_delete {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/findAndModify/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(find_one_and_delete&)
-    write_concern(mongocxx::v_noabi::write_concern write_concern);
+    find_one_and_delete& write_concern(v_noabi::write_concern write_concern) {
+        _write_concern = std::move(write_concern);
+        return *this;
+    }
 
     ///
     /// Gets the current write concern.
@@ -172,8 +251,9 @@ class find_one_and_delete {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/findAndModify/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<mongocxx::v_noabi::write_concern> const&)
-    write_concern() const;
+    bsoncxx::v_noabi::stdx::optional<v_noabi::write_concern> const& write_concern() const {
+        return _write_concern;
+    }
 
     ///
     /// Sets the index to use for this operation.
@@ -188,15 +268,19 @@ class find_one_and_delete {
     ///   A reference to the object on which this member function is being called.  This facilitates
     ///   method chaining.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(find_one_and_delete&) hint(mongocxx::v_noabi::hint index_hint);
+    find_one_and_delete& hint(v_noabi::hint index_hint) {
+        _hint = std::move(index_hint);
+        return *this;
+    }
 
     ///
     /// Gets the current hint.
     ///
     /// @return The current hint, if one is set.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<mongocxx::v_noabi::hint> const&)
-    hint() const;
+    bsoncxx::v_noabi::stdx::optional<v_noabi::hint> const& hint() const {
+        return _hint;
+    }
 
     ///
     /// Set the value of the let option.
@@ -208,17 +292,20 @@ class find_one_and_delete {
     ///   A reference to the object on which this member function is being called.  This facilitates
     ///   method chaining.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(find_one_and_delete&)
-    let(bsoncxx::v_noabi::document::view_or_value let);
+    find_one_and_delete& let(bsoncxx::v_noabi::document::view_or_value let) {
+        _let = std::move(let);
+        return *this;
+    }
 
     ///
     /// Gets the current value of the let option.
     ///
     /// @return
     ///  The current let option.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> const)
-    let() const;
+    bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> const let() const {
+        return _let;
+    }
 
     ///
     /// Set the value of the comment option.
@@ -230,25 +317,28 @@ class find_one_and_delete {
     ///   A reference to the object on which this member function is being called.  This facilitates
     ///   method chaining.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(find_one_and_delete&)
-    comment(bsoncxx::v_noabi::types::bson_value::view_or_value comment);
+    find_one_and_delete& comment(bsoncxx::v_noabi::types::bson_value::view_or_value comment) {
+        _comment = std::move(comment);
+        return *this;
+    }
 
     ///
     /// Gets the current value of the comment option.
     ///
     /// @return
     ///  The current comment option.
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::types::bson_value::view_or_value> const)
-    comment() const;
+    bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::types::bson_value::view_or_value> const comment() const {
+        return _comment;
+    }
 
    private:
     bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> _collation;
     bsoncxx::v_noabi::stdx::optional<std::chrono::milliseconds> _max_time;
     bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> _projection;
     bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> _ordering;
-    bsoncxx::v_noabi::stdx::optional<mongocxx::v_noabi::write_concern> _write_concern;
-    bsoncxx::v_noabi::stdx::optional<mongocxx::v_noabi::hint> _hint;
+    bsoncxx::v_noabi::stdx::optional<v_noabi::write_concern> _write_concern;
+    bsoncxx::v_noabi::stdx::optional<v_noabi::hint> _hint;
     bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> _let;
     bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::types::bson_value::view_or_value> _comment;
 };
@@ -257,9 +347,32 @@ class find_one_and_delete {
 } // namespace v_noabi
 } // namespace mongocxx
 
+namespace mongocxx {
+namespace v_noabi {
+
+///
+/// Convert to the @ref mongocxx::v_noabi equivalent of `v`.
+///
+inline v_noabi::options::find_one_and_delete from_v1(v1::find_one_and_delete_options v) {
+    return {std::move(v)};
+}
+
+///
+/// Convert to the @ref mongocxx::v1 equivalent of `v`.
+///
+inline v1::find_one_and_delete_options to_v1(v_noabi::options::find_one_and_delete const& v) {
+    return v1::find_one_and_delete_options{v};
+}
+
+} // namespace v_noabi
+} // namespace mongocxx
+
 #include <mongocxx/config/postlude.hpp>
 
 ///
 /// @file
 /// Provides @ref mongocxx::v_noabi::options::find_one_and_delete.
 ///
+/// @par Includes
+/// - @ref mongocxx/v1/find_one_and_delete_options.hpp
+///