v1: estimated_document_count_options (CXX-3237, CXX-3238) (#1521)

Author: eramongodb

src/mongocxx/include/mongocxx/v1/estimated_document_count_options.hpp

@@ -124,6 +124,8 @@ class estimated_document_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/estimated_document_count-fwd.hpp

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

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

@@ -14,12 +14,20 @@
 
 #pragma once
 
-#include <chrono>
-
 #include <mongocxx/options/estimated_document_count-fwd.hpp> // IWYU pragma: export
 
+//
+
+#include <bsoncxx/v1/types/value.hpp>
+
+#include <mongocxx/v1/estimated_document_count_options.hpp> // IWYU pragma: export
+
+#include <chrono>
+#include <utility>
+
 #include <bsoncxx/stdx/optional.hpp>
 #include <bsoncxx/types/bson_value/view_or_value.hpp>
+#include <bsoncxx/types/view.hpp>
 
 #include <mongocxx/read_preference.hpp>
 
@@ -34,6 +42,40 @@ namespace options {
 ///
 class estimated_document_count {
    public:
+    ///
+    /// Default initialization.
+    ///
+    estimated_document_count() = default;
+
+    ///
+    /// Construct with the @ref mongocxx::v1 equivalent.
+    ///
+    /* explicit(false) */ MONGOCXX_ABI_EXPORT_CDECL() estimated_document_count(
+        v1::estimated_document_count_options opts);
+
+    ///
+    /// Convert to the @ref mongocxx::v1 equivalent.
+    ///
+    explicit operator v1::estimated_document_count_options() const {
+        using bsoncxx::v_noabi::to_v1;
+
+        v1::estimated_document_count_options ret;
+
+        if (_max_time) {
+            ret.max_time(*_max_time);
+        }
+
+        if (_comment) {
+            ret.comment(bsoncxx::v1::types::value{to_v1(_comment->view())});
+        }
+
+        if (_read_preference) {
+            ret.read_preference(to_v1(*_read_preference));
+        }
+
+        return ret;
+    }
+
     ///
     /// Sets the maximum amount of time for this operation to run (server-side) in milliseconds.
     ///
@@ -47,8 +89,10 @@ class estimated_document_count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/count/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(estimated_document_count&)
-    max_time(std::chrono::milliseconds max_time);
+    estimated_document_count& max_time(std::chrono::milliseconds max_time) {
+        _max_time = max_time;
+        return *this;
+    }
 
     ///
     /// The current max_time setting.
@@ -58,8 +102,9 @@ class estimated_document_count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/count/
     ///
-    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 comment for this operation.
@@ -74,8 +119,10 @@ class estimated_document_count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/count/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(estimated_document_count&)
-    comment(bsoncxx::v_noabi::types::bson_value::view_or_value comment);
+    estimated_document_count& comment(bsoncxx::v_noabi::types::bson_value::view_or_value comment) {
+        _comment = std::move(comment);
+        return *this;
+    }
 
     ///
     /// The current comment for this operation.
@@ -85,8 +132,9 @@ class estimated_document_count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/count/
     ///
-    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 read_preference for this operation.
@@ -101,8 +149,10 @@ class estimated_document_count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/count/
     ///
-    MONGOCXX_ABI_EXPORT_CDECL(estimated_document_count&)
-    read_preference(mongocxx::v_noabi::read_preference rp);
+    estimated_document_count& read_preference(mongocxx::v_noabi::read_preference rp) {
+        _read_preference = std::move(rp);
+        return *this;
+    }
 
     ///
     /// The current read_preference for this operation.
@@ -112,8 +162,9 @@ class estimated_document_count {
     /// @see
     /// - https://www.mongodb.com/docs/manual/reference/command/count/
     ///
-    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<std::chrono::milliseconds> _max_time;
@@ -125,9 +176,32 @@ class estimated_document_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::estimated_document_count from_v1(v1::estimated_document_count_options v) {
+    return {std::move(v)};
+}
+
+///
+/// Convert to the @ref mongocxx::v1 equivalent of `v`.
+///
+inline v1::estimated_document_count_options to_v1(v_noabi::options::estimated_document_count const& v) {
+    return v1::estimated_document_count_options{v};
+}
+
+} // namespace v_noabi
+} // namespace mongocxx
+
 #include <mongocxx/config/postlude.hpp>
 
 ///
 /// @file
 /// Provides @ref mongocxx::v_noabi::options::estimated_document_count.
 ///
+/// @par Includes
+/// - @ref mongocxx/v1/estimated_document_count_options.hpp
+///

src/mongocxx/lib/mongocxx/v1/estimated_document_count_options.cpp

@@ -12,4 +12,115 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include <mongocxx/v1/estimated_document_count_options.hpp>
+#include <mongocxx/v1/estimated_document_count_options.hh>
+
+//
+
+#include <bsoncxx/v1/stdx/optional.hpp>
+#include <bsoncxx/v1/types/value.hpp>
+
+#include <mongocxx/v1/read_preference.hpp>
+
+#include <chrono>
+
+#include <mongocxx/private/utility.hh>
+
+namespace mongocxx {
+namespace v1 {
+
+class estimated_document_count_options::impl {
+   public:
+    bsoncxx::v1::stdx::optional<std::chrono::milliseconds> _max_time;
+    bsoncxx::v1::stdx::optional<bsoncxx::v1::types::value> _comment;
+    bsoncxx::v1::stdx::optional<mongocxx::v1::read_preference> _read_preference;
+
+    static impl const& with(estimated_document_count_options const& self) {
+        return *static_cast<impl const*>(self._impl);
+    }
+
+    static impl const* with(estimated_document_count_options const* self) {
+        return static_cast<impl const*>(self->_impl);
+    }
+
+    static impl& with(estimated_document_count_options& self) {
+        return *static_cast<impl*>(self._impl);
+    }
+
+    static impl* with(estimated_document_count_options* self) {
+        return static_cast<impl*>(self->_impl);
+    }
+
+    static impl* with(void* ptr) {
+        return static_cast<impl*>(ptr);
+    }
+};
+
+estimated_document_count_options::~estimated_document_count_options() {
+    delete impl::with(this);
+}
+
+estimated_document_count_options::estimated_document_count_options(estimated_document_count_options&& other) noexcept
+    : _impl{exchange(other._impl, nullptr)} {}
+
+estimated_document_count_options& estimated_document_count_options::operator=(
+    estimated_document_count_options&& other) noexcept {
+    if (this != &other) {
+        delete impl::with(exchange(_impl, exchange(other._impl, nullptr)));
+    }
+
+    return *this;
+}
+
+estimated_document_count_options::estimated_document_count_options(estimated_document_count_options const& other)
+    : _impl{new impl{impl::with(other)}} {}
+
+estimated_document_count_options& estimated_document_count_options::operator=(
+    estimated_document_count_options const& other) {
+    if (this != &other) {
+        delete impl::with(exchange(_impl, new impl{impl::with(other)}));
+    }
+
+    return *this;
+}
+
+estimated_document_count_options::estimated_document_count_options() : _impl{new impl{}} {}
+
+estimated_document_count_options& estimated_document_count_options::max_time(std::chrono::milliseconds max_time) {
+    impl::with(this)->_max_time = max_time;
+    return *this;
+}
+
+bsoncxx::v1::stdx::optional<std::chrono::milliseconds> estimated_document_count_options::max_time() const {
+    return impl::with(this)->_max_time;
+}
+
+estimated_document_count_options& estimated_document_count_options::comment(bsoncxx::v1::types::value comment) {
+    impl::with(this)->_comment = std::move(comment);
+    return *this;
+}
+
+bsoncxx::v1::stdx::optional<bsoncxx::v1::types::view> estimated_document_count_options::comment() const {
+    return impl::with(this)->_comment;
+}
+
+estimated_document_count_options& estimated_document_count_options::read_preference(v1::read_preference rp) {
+    impl::with(this)->_read_preference = std::move(rp);
+    return *this;
+}
+
+bsoncxx::v1::stdx::optional<v1::read_preference> estimated_document_count_options::read_preference() const {
+    return impl::with(this)->_read_preference;
+}
+
+bsoncxx::v1::stdx::optional<bsoncxx::v1::types::value>& estimated_document_count_options::internal::comment(
+    estimated_document_count_options& self) {
+    return impl::with(self)._comment;
+}
+
+bsoncxx::v1::stdx::optional<mongocxx::v1::read_preference>& estimated_document_count_options::internal::read_preference(
+    estimated_document_count_options& self) {
+    return impl::with(self)._read_preference;
+}
+
+} // namespace v1
+} // namespace mongocxx

src/mongocxx/lib/mongocxx/v1/estimated_document_count_options.hh

@@ -0,0 +1,38 @@
+// Copyright 2009-present MongoDB, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#pragma once
+
+#include <mongocxx/v1/estimated_document_count_options.hpp> // IWYU pragma: export
+
+//
+
+#include <bsoncxx/v1/types/value-fwd.hpp>
+
+#include <mongocxx/v1/read_preference-fwd.hpp>
+
+#include <bsoncxx/v1/stdx/optional.hpp>
+
+namespace mongocxx {
+namespace v1 {
+
+class estimated_document_count_options::internal {
+   public:
+    static bsoncxx::v1::stdx::optional<bsoncxx::v1::types::value>& comment(estimated_document_count_options& self);
+    static bsoncxx::v1::stdx::optional<mongocxx::v1::read_preference>& read_preference(
+        estimated_document_count_options& self);
+};
+
+} // namespace v1
+} // namespace mongocxx