v1: count_options (CXX-3237, CXX-3238) (#1520)

Author: eramongodb

src/mongocxx/include/mongocxx/v1/count_options.hpp

@@ -171,6 +171,8 @@ class count_options {
     /// Return the current "readPreference" field.
     ///
     MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v1::stdx::optional<v1::read_preference>) read_preference() const;
+
+    class internal;
 };
 
 } // namespace v1

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

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

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

@@ -14,14 +14,24 @@
 
 #pragma once
 
+#include <mongocxx/options/count-fwd.hpp> // IWYU pragma: export
+
+//
+
+#include <bsoncxx/v1/document/value.hpp>
+#include <bsoncxx/v1/types/value.hpp>
+
+#include <mongocxx/v1/count_options.hpp> // IWYU pragma: export
+
 #include <chrono>
 #include <cstdint>
 #include <string> // IWYU pragma: keep: backward compatibility, to be removed.
+#include <utility>
 
-#include <mongocxx/options/count-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>
@@ -38,6 +48,56 @@ namespace options {
 ///
 class count {
    public:
+    ///
+    /// Default initialization.
+    ///
+    count() = default;
+
+    ///
+    /// Construct with the @ref mongocxx::v1 equivalent.
+    ///
+    /* explicit(false) */ MONGOCXX_ABI_EXPORT_CDECL() count(v1::count_options opts);
+
+    ///
+    /// Convert to the @ref mongocxx::v1 equivalent.
+    ///
+    explicit operator v1::count_options() const {
+        using bsoncxx::v_noabi::to_v1;
+        using mongocxx::v_noabi::to_v1;
+
+        v1::count_options ret;
+
+        if (_collation) {
+            ret.collation(bsoncxx::v1::document::value{to_v1(_collation->view())});
+        }
+
+        if (_hint) {
+            ret.hint(to_v1(*_hint));
+        }
+
+        if (_comment) {
+            ret.comment(bsoncxx::v1::types::value{to_v1(_comment->view())});
+        }
+
+        if (_limit) {
+            ret.limit(*_limit);
+        }
+
+        if (_max_time) {
+            ret.max_time(*_max_time);
+        }
+
+        if (_skip) {
+            ret.skip(*_skip);
+        }
+
+        if (_read_preference) {
+            ret.read_preference(to_v1(*_read_preference));
+        }
+
+        return ret;
+    }
+
     ///
     /// Sets the collation for this operation.
     ///
@@ -51,8 +111,10 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(count&)
-    collation(bsoncxx::v_noabi::document::view_or_value collation);
+    count& collation(bsoncxx::v_noabi::document::view_or_value collation) {
+        _collation = std::move(collation);
+        return *this;
+    }
 
     ///
     /// Retrieves the current collation for this operation.
@@ -63,8 +125,9 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    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 index to use for this operation.
@@ -79,7 +142,10 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(count&) hint(mongocxx::v_noabi::hint index_hint);
+    count& hint(mongocxx::v_noabi::hint index_hint) {
+        _hint = std::move(index_hint);
+        return *this;
+    }
 
     ///
     /// Gets the current hint.
@@ -89,8 +155,9 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<mongocxx::v_noabi::hint> const&)
-    hint() const;
+    bsoncxx::v_noabi::stdx::optional<mongocxx::v_noabi::hint> const& hint() const {
+        return _hint;
+    }
 
     ///
     /// Set the value of the comment option.
@@ -105,8 +172,10 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(count&)
-    comment(bsoncxx::v_noabi::types::bson_value::view_or_value comment);
+    count& 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.
@@ -116,8 +185,9 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    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;
+    }
 
     ///
     /// Sets the maximum number of documents to count.
@@ -132,7 +202,10 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(count&) limit(std::int64_t limit);
+    count& limit(std::int64_t limit) {
+        _limit = limit;
+        return *this;
+    }
 
     ///
     /// Gets the current limit.
@@ -142,7 +215,9 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<std::int64_t> const&) limit() const;
+    bsoncxx::v_noabi::stdx::optional<std::int64_t> const& limit() const {
+        return _limit;
+    }
 
     ///
     /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
@@ -157,7 +232,10 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(count&) max_time(std::chrono::milliseconds max_time);
+    count& max_time(std::chrono::milliseconds max_time) {
+        _max_time = max_time;
+        return *this;
+    }
 
     ///
     /// The current max_time setting.
@@ -167,8 +245,9 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    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 the number of documents to skip before counting documents.
@@ -183,7 +262,10 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(count&) skip(std::int64_t skip);
+    count& skip(std::int64_t skip) {
+        _skip = skip;
+        return *this;
+    }
 
     ///
     /// Gets the current number of documents to skip.
@@ -193,7 +275,9 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<std::int64_t> const&) skip() const;
+    bsoncxx::v_noabi::stdx::optional<std::int64_t> const& skip() const {
+        return _skip;
+    }
 
     ///
     /// Sets the read_preference for this operation.
@@ -208,7 +292,10 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(count&) read_preference(mongocxx::v_noabi::read_preference rp);
+    count& read_preference(mongocxx::v_noabi::read_preference rp) {
+        _read_preference = std::move(rp);
+        return *this;
+    }
 
     ///
     /// The current read_preference for this operation.
@@ -218,8 +305,9 @@ class count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/aggregate/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(bsoncxx::v_noabi::stdx::optional<mongocxx::v_noabi::read_preference> const&)
-    read_preference() const;
+    bsoncxx::v_noabi::stdx::optional<mongocxx::v_noabi::read_preference> const& read_preference() const {
+        return _read_preference;
+    }
 
    private:
     bsoncxx::v_noabi::stdx::optional<bsoncxx::v_noabi::document::view_or_value> _collation;
@@ -235,9 +323,32 @@ class count {
 } // namespace v_noabi
 } // namespace mongocxx
 
+namespace mongocxx {
+namespace v_noabi {
+
+///
+/// Convert to the @ref mongocxx::v_noabi equivalent of `v`.
+///
+inline v_noabi::options::count from_v1(v1::count_options v) {
+    return {std::move(v)};
+}
+
+///
+/// Convert to the @ref mongocxx::v1 equivalent of `v`.
+///
+inline v1::count_options to_v1(v_noabi::options::count const& v) {
+    return v1::count_options{v};
+}
+
+} // namespace v_noabi
+} // namespace mongocxx
+
 #include <mongocxx/config/postlude.hpp>
 
 ///
 /// @file
 /// Provides @ref mongocxx::v_noabi::options::count.
 ///
+/// @par Includes
+/// - @ref mongocxx/v1/count_options.hpp
+///