CXX-739 Apply string::view_or_value elsewhere in codebase

Author: samantharitter

src/bsoncxx/oid.cpp

@@ -34,10 +34,11 @@ oid::oid(init_tag_t) : _is_valid(true) {
     std::memcpy(_bytes, oid.bytes, sizeof(oid.bytes));
 }
 
-oid::oid(stdx::string_view str) : _is_valid(bson_oid_is_valid(str.data(), str.length())) {
+oid::oid(const string::view_or_value& str)
+    : _is_valid(bson_oid_is_valid(str.data(), str.view().length())) {
     if (_is_valid) {
         bson_oid_t oid;
-        bson_oid_init_from_string(&oid, str.data());
+        bson_oid_init_from_string(&oid, str.terminated().data());
         memcpy(_bytes, oid.bytes, sizeof(_bytes));
     }
 }

src/bsoncxx/oid.hpp

@@ -20,7 +20,7 @@
 #include <ctime>
 #include <string>
 
-#include <bsoncxx/stdx/string_view.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
 
 namespace bsoncxx {
 BSONCXX_INLINE_NAMESPACE_BEGIN
@@ -64,12 +64,12 @@ class BSONCXX_API oid {
     explicit oid(const char* bytes, std::size_t len);
 
     ///
-    /// Constructs and oid an initializes it from the provided hex string.
+    /// Constructs an oid and initializes it from the provided hex string.
     ///
     /// @param str
-    ///   A string_view of a hexadecimal representation of a valid ObjectId.
+    ///   A string of a hexadecimal representation of a valid ObjectId.
     ///
-    explicit oid(stdx::string_view str);
+    explicit oid(const string::view_or_value& str);
 
     ///
     /// Converts this oid to a hexadecimal string.

src/mongocxx/collection.cpp

@@ -18,7 +18,6 @@
 #include <cstdint>
 #include <limits>
 #include <tuple>
-#include <unordered_set>
 #include <utility>
 
 #include <bsoncxx/builder/stream/document.hpp>

src/mongocxx/hint.cpp

@@ -24,7 +24,7 @@ MONGOCXX_INLINE_NAMESPACE_BEGIN
 hint::hint(bsoncxx::document::view_or_value index) : _index_doc(std::move(index)) {
 }
 
-hint::hint(stdx::string_view index) : _index_string(std::move(index)) {
+hint::hint(bsoncxx::string::view_or_value index) : _index_string(std::move(index)) {
 }
 
 bsoncxx::document::value hint::to_document() const {
@@ -42,7 +42,7 @@ bsoncxx::document::value hint::to_document() const {
 }
 
 bool operator==(const hint& index_hint, std::string index) {
-    return index_hint._index_string && index_hint._index_string->to_string() == index;
+    return ((index_hint._index_string) && (*(index_hint._index_string) == index));
 }
 
 bool operator==(std::string index, const hint& index_hint) {

src/mongocxx/hint.hpp

@@ -22,6 +22,7 @@
 #include <bsoncxx/builder/stream/helpers.hpp>
 #include <bsoncxx/builder/stream/key_context.hpp>
 #include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
 #include <mongocxx/stdx.hpp>
 
 namespace mongocxx {
@@ -49,7 +50,7 @@ class MONGOCXX_API hint {
     /// @param index
     ///   String representing the name of the index to be used.
     ///
-    explicit hint(stdx::string_view index);
+    explicit hint(bsoncxx::string::view_or_value index);
 
     friend bool operator==(const hint& index_hint, std::string index);
     friend bool operator==(const hint& index_hint, bsoncxx::document::view index);
@@ -64,7 +65,7 @@ class MONGOCXX_API hint {
 
    private:
     stdx::optional<bsoncxx::document::view_or_value> _index_doc;
-    stdx::optional<stdx::string_view> _index_string;
+    stdx::optional<bsoncxx::string::view_or_value> _index_string;
 };
 
 ///

src/mongocxx/options/find.cpp

@@ -30,8 +30,8 @@ void find::batch_size(std::int32_t batch_size) {
     _batch_size = batch_size;
 }
 
-void find::comment(std::string comment) {
-    _comment = comment;
+void find::comment(bsoncxx::string::view_or_value comment) {
+    _comment = std::move(comment);
 }
 
 void find::cursor_type(enum find::cursor_type cursor_type) {
@@ -90,7 +90,7 @@ const stdx::optional<std::int32_t>& find::batch_size() const {
     return _batch_size;
 }
 
-const stdx::optional<std::string>& find::comment() const {
+const stdx::optional<bsoncxx::string::view_or_value>& find::comment() const {
     return _comment;
 }
 

src/mongocxx/options/find.hpp

@@ -21,6 +21,7 @@
 
 #include <bsoncxx/document/view_or_value.hpp>
 #include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
 #include <mongocxx/hint.hpp>
 #include <mongocxx/read_preference.hpp>
 
@@ -83,7 +84,7 @@ class MONGOCXX_API find {
     ///
     /// @see http://docs.mongodb.org/manual/reference/operator/meta/comment/
     ///
-    void comment(std::string comment);
+    void comment(bsoncxx::string::view_or_value comment);
 
     ///
     /// Gets the current comment attached to this query.
@@ -92,7 +93,7 @@ class MONGOCXX_API find {
     ///
     /// @see http://docs.mongodb.org/manual/reference/operator/meta/comment/
     ///
-    const stdx::optional<std::string>& comment() const;
+    const stdx::optional<bsoncxx::string::view_or_value>& comment() const;
 
     ///
     /// Indicates the type of cursor to use for this query.
@@ -311,7 +312,7 @@ class MONGOCXX_API find {
    private:
     stdx::optional<bool> _allow_partial_results;
     stdx::optional<std::int32_t> _batch_size;
-    stdx::optional<std::string> _comment;
+    stdx::optional<bsoncxx::string::view_or_value> _comment;
     stdx::optional<enum cursor_type> _cursor_type;
     stdx::optional<class hint> _hint;
     stdx::optional<std::int32_t> _limit;

src/mongocxx/options/ssl.cpp

@@ -20,43 +20,43 @@ namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
 namespace options {
 
-void ssl::pem_file(std::string pem_file) {
+void ssl::pem_file(bsoncxx::string::view_or_value pem_file) {
     _pem_file = std::move(pem_file);
 }
 
-const stdx::optional<std::string>& ssl::pem_file() const {
+const stdx::optional<bsoncxx::string::view_or_value>& ssl::pem_file() const {
     return _pem_file;
 }
 
-void ssl::pem_password(std::string pem_password) {
+void ssl::pem_password(bsoncxx::string::view_or_value pem_password) {
     _pem_password = std::move(pem_password);
 }
 
-const stdx::optional<std::string>& ssl::pem_password() const {
+const stdx::optional<bsoncxx::string::view_or_value>& ssl::pem_password() const {
     return _pem_password;
 }
 
-void ssl::ca_file(std::string ca_file) {
+void ssl::ca_file(bsoncxx::string::view_or_value ca_file) {
     _ca_file = std::move(ca_file);
 }
 
-const stdx::optional<std::string>& ssl::ca_file() const {
+const stdx::optional<bsoncxx::string::view_or_value>& ssl::ca_file() const {
     return _ca_file;
 }
 
-void ssl::ca_dir(std::string ca_dir) {
+void ssl::ca_dir(bsoncxx::string::view_or_value ca_dir) {
     _ca_dir = std::move(ca_dir);
 }
 
-const stdx::optional<std::string>& ssl::ca_dir() const {
+const stdx::optional<bsoncxx::string::view_or_value>& ssl::ca_dir() const {
     return _ca_dir;
 }
 
-void ssl::crl_file(std::string crl_file) {
+void ssl::crl_file(bsoncxx::string::view_or_value crl_file) {
     _crl_file = std::move(crl_file);
 }
 
-const stdx::optional<std::string>& ssl::crl_file() const {
+const stdx::optional<bsoncxx::string::view_or_value>& ssl::crl_file() const {
     return _crl_file;
 }
 

src/mongocxx/options/ssl.hpp

@@ -19,6 +19,7 @@
 #include <string>
 
 #include <bsoncxx/stdx/optional.hpp>
+#include <bsoncxx/string/view_or_value.hpp>
 
 #include <mongocxx/stdx.hpp>
 
@@ -38,29 +39,29 @@ class MONGOCXX_API ssl {
     /// @param pem_file
     ///   The path to the .pem file.
     ///
-    void pem_file(std::string pem_file);
+    void pem_file(bsoncxx::string::view_or_value pem_file);
 
     ///
     /// Retrieves the current path to the .pem file.
     ///
     /// @return The path to the .pem file.
     ///
-    const stdx::optional<std::string>& pem_file() const;
+    const stdx::optional<bsoncxx::string::view_or_value>& pem_file() const;
 
     ///
     /// The pass phrase used to decrypt an encrypted PEM file.
     ///
     /// @param pem_password
     ///   The pass phrase.
     ///
-    void pem_password(std::string pem_password);
+    void pem_password(bsoncxx::string::view_or_value pem_password);
 
     ///
     /// Retrieves the current decryption pass phrase.
     ///
     /// @return The pass phrase.
     ///
-    const stdx::optional<std::string>& pem_password() const;
+    const stdx::optional<bsoncxx::string::view_or_value>& pem_password() const;
 
     ///
     /// The path to the .pem file that contains the root certificate chain from the Certificate
@@ -69,44 +70,44 @@ class MONGOCXX_API ssl {
     /// @param ca_file
     ///   The path to the CA file.
     ///
-    void ca_file(std::string ca_file);
+    void ca_file(bsoncxx::string::view_or_value ca_file);
 
     ///
     /// Retrieves the current path to the CA file.
     ///
     /// @return The path to the CA file.
     ///
-    const stdx::optional<std::string>& ca_file() const;
+    const stdx::optional<bsoncxx::string::view_or_value>& ca_file() const;
 
     ///
     /// The path to the Certificate Authority directory.
     ///
     /// @param ca_dir
     ///   The path to the CA directory.
     ///
-    void ca_dir(std::string ca_dir);
+    void ca_dir(bsoncxx::string::view_or_value ca_dir);
 
     ///
     /// Retrieves the current path to the CA directory.
     ///
     /// @return The path to the CA directory.
     ///
-    const stdx::optional<std::string>& ca_dir() const;
+    const stdx::optional<bsoncxx::string::view_or_value>& ca_dir() const;
 
     ///
     /// The path to the .pem file that contains revoked certificates.
     ///
     /// @param crl_file
     ///   The path to the PEM file.
     ///
-    void crl_file(std::string crl_file);
+    void crl_file(bsoncxx::string::view_or_value crl_file);
 
     ///
     /// Retrieves the current path to the .pem file that contains revoked certificates.
     ///
     /// @return The path to the revoked certificates file.
     ///
-    const stdx::optional<std::string>& crl_file() const;
+    const stdx::optional<bsoncxx::string::view_or_value>& crl_file() const;
 
     ///
     /// If false, the driver will not verify the server's CA file.
@@ -124,11 +125,11 @@ class MONGOCXX_API ssl {
     const stdx::optional<bool>& allow_invalid_certificates() const;
 
    private:
-    stdx::optional<std::string> _pem_file;
-    stdx::optional<std::string> _pem_password;
-    stdx::optional<std::string> _ca_file;
-    stdx::optional<std::string> _ca_dir;
-    stdx::optional<std::string> _crl_file;
+    stdx::optional<bsoncxx::string::view_or_value> _pem_file;
+    stdx::optional<bsoncxx::string::view_or_value> _pem_password;
+    stdx::optional<bsoncxx::string::view_or_value> _ca_file;
+    stdx::optional<bsoncxx::string::view_or_value> _ca_dir;
+    stdx::optional<bsoncxx::string::view_or_value> _crl_file;
     stdx::optional<bool> _allow_invalid_certificates;
 };