CXX-2110 Remove all references to deprecated utf8 (#1250)

Author: eramongodb

CHANGELOG.md

@@ -17,6 +17,11 @@ Changes prior to 3.9.0 are documented as [release notes on GitHub](https://githu
 - Inline namespace macros for bsoncxx and mongocxx namespace: `*_INLINE_NAMESPACE_*`.
 - The `<bsoncxx/types/value.hpp>` header.
 - The `<bsoncxx/util/functor.hpp>` header.
+- References to deprecated `utf8` which have equivalent `string` alternatives.
+  - `k_utf8` in `bsoncxx::v_noabi::type`. Use `k_string` instead.
+  - `b_utf8` in `bsoncxx::v_noabi::types`. Use `b_string` instead.
+  - `get_utf8` in `bsoncxx::v_noabi::document::element`, `bsoncxx::v_noabi::array::element`, and `bsoncxx::v_noabi::types::bson_value::view`. Use `get_string` instead.
+  - `k_cannot_append_utf8` and `k_need_element_type_k_utf8` in `bsoncxx::v_noabi::exception::error_code`. Use `k_cannot_append_string` and `k_need_element_type_k_string` instead.
 
 ## 3.11.0
 

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/array/element.hpp

@@ -65,7 +65,6 @@ class element : private document::element {
     using document::element::get_symbol;
     using document::element::get_timestamp;
     using document::element::get_undefined;
-    using document::element::get_utf8;
 
     using document::element::get_value;
 

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/builder/list.hpp

@@ -125,7 +125,7 @@ class list {
                 }
                 for (size_t i = 0; i < init.size(); i += 2) {
                     auto t = (begin(init) + i)->val.view().type();
-                    if (t != type::k_utf8) {
+                    if (t != type::k_string) {
                         err_msg << " : all keys must be string type. ";
                         err_msg << "Found type=" << to_string(t);
                         return false;

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/document/element.hpp

@@ -114,17 +114,6 @@ class element {
     ///
     BSONCXX_ABI_EXPORT_CDECL(types::b_double) get_double() const;
 
-    ///
-    /// Getter for elements of the b_string type.
-    ///
-    /// @deprecated use document::element::get_string() instead.
-    ///
-    /// @throws bsoncxx::v_noabi::exception if this element is not a b_string.
-    ///
-    /// @return the element's value.
-    ///
-    BSONCXX_DEPRECATED BSONCXX_ABI_EXPORT_CDECL(types::b_string) get_utf8() const;
-
     ///
     /// Getter for elements of the b_string type.
     ///

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/exception/error_code.hpp

@@ -141,12 +141,6 @@ enum class error_code : std::int32_t {
     k_cannot_append_minkey,
     /// @}
 
-    /// Failed to append a value of the given type.
-    k_cannot_append_utf8 = k_cannot_append_string,
-
-    /// @deprecated Use `k_need_element_type_k_string` instead.
-    k_need_element_type_k_utf8 = k_need_element_type_k_string,
-
     // Add new constant string message to error_code.cpp as well!
 };
 

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types.hpp

@@ -43,7 +43,6 @@ namespace v_noabi {
 enum class type : std::uint8_t {
     k_double = 0x01,      ///< 64-bit binary floating point.
     k_string = 0x02,      ///< UTF-8 string.
-    k_utf8 = 0x02,        ///< Equivalent to @ref k_string. @deprecated
     k_document = 0x03,    ///< Embedded document.
     k_array = 0x04,       ///< Array.
     k_binary = 0x05,      ///< Binary data.
@@ -164,13 +163,6 @@ inline bool operator==(const b_string& lhs, const b_string& rhs) {
     return lhs.value == rhs.value;
 }
 
-///
-/// Equivalent to @ref b_string.
-///
-/// @deprecated Use @ref b_string instead.
-///
-BSONCXX_DEPRECATED typedef b_string b_utf8;
-
 ///
 /// A BSON document value.
 ///
@@ -874,8 +866,6 @@ using ::bsoncxx::v_noabi::to_string;
 namespace bsoncxx {
 namespace types {
 
-using ::bsoncxx::v_noabi::types::b_utf8;  // Deprecated.
-
 using ::bsoncxx::v_noabi::types::operator==;
 using ::bsoncxx::v_noabi::types::operator!=;
 
@@ -901,10 +891,6 @@ std::string to_string(v_noabi::binary_sub_type rhs);
 
 namespace types {
 
-/// @ref bsoncxx::v_noabi::types::b_utf8
-/// @deprecated Use @ref bsoncxx::types::b_string instead.
-struct b_utf8 {};
-
 /// @ref bsoncxx::v_noabi::types::operator==(const v_noabi::types::b_double& lhs, const v_noabi::types::b_double& rhs)
 bool operator==(const v_noabi::types::b_double& lhs, const v_noabi::types::b_double& rhs);
 

src/bsoncxx/include/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.hpp

@@ -105,16 +105,6 @@ class view {
     ///
     BSONCXX_ABI_EXPORT_CDECL(const b_double&) get_double() const;
 
-    ///
-    /// Returns the underlying BSON UTF-8 string value.
-    ///
-    /// @deprecated use get_string instead.
-    ///
-    /// @warning
-    ///   Calling the wrong get_<type> method will cause an exception to be thrown.
-    ///
-    BSONCXX_DEPRECATED BSONCXX_ABI_EXPORT_CDECL(const b_string&) get_utf8() const;
-
     ///
     /// Returns the underlying BSON UTF-8 string value.
     ///

src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/document/element.cpp

@@ -103,18 +103,6 @@ stdx::string_view element::key() const {
 #include <bsoncxx/enums/type.hpp>
 #undef BSONCXX_ENUM
 
-types::b_string element::get_utf8() const {
-    if (_raw == nullptr) {
-        throw bsoncxx::v_noabi::exception{
-            error_code::k_unset_element,
-            "cannot get string from an uninitialized element" +
-                std::string(_key ? " with key \"" + std::string(_key.value().data()) + "\"" : "")};
-    }
-
-    types::bson_value::view v{_raw, _length, _offset, _keylen};
-    return v.get_string();
-}
-
 types::bson_value::view element::get_value() const {
     switch (static_cast<int>(type())) {
 #define BSONCXX_ENUM(type, val) \

src/bsoncxx/lib/bsoncxx/v_noabi/bsoncxx/types/bson_value/view.cpp

@@ -114,11 +114,6 @@ bsoncxx::v_noabi::type view::type() const {
 #include <bsoncxx/enums/type.hpp>
 #undef BSONCXX_ENUM
 
-const types::b_string& view::get_utf8() const {
-    BSONCXX_TYPE_CHECK(string);
-    return _b_string;
-}
-
 view::view(const std::uint8_t* raw,
            std::uint32_t length,
            std::uint32_t offset,

src/mongocxx/test/spec/unified_tests/runner.cpp

@@ -517,7 +517,7 @@ read_preference get_read_preference(const document::element& opts) {
 write_concern get_write_concern(const document::element& opts) {
     auto wc = write_concern{};
     if (auto w = opts["writeConcern"]["w"]) {
-        if (w.type() == type::k_utf8) {
+        if (w.type() == type::k_string) {
             const auto strval = w.get_string().value;
             if (0 == strval.compare("majority")) {
                 wc.acknowledge_level(mongocxx::write_concern::level::k_majority);