CXX-785 Clean up some latent TODO items, mostly around exceptions

Author: acmorrow

src/bsoncxx/builder/core.hpp

@@ -44,9 +44,6 @@ class BSONCXX_API core {
    public:
     class BSONCXX_PRIVATE impl;
 
-    // TODO this should fit with the larger bson exception heirarchy
-    class invalid_state : public std::runtime_error {};
-
     ///
     /// Constructs an empty BSON datum.
     ///

src/bsoncxx/document/element.hpp

@@ -82,7 +82,6 @@ class BSONCXX_API element {
 
     stdx::string_view key() const;
 
-    // TODO figure out a better exception than std::runtime_error
     types::b_double get_double() const;
     types::b_utf8 get_utf8() const;
     types::b_document get_document() const;

src/mongocxx/bulk_write.cpp

@@ -83,7 +83,7 @@ void bulk_write::append(const model::write& operation) {
             break;
         }
         case write_type::k_uninitialized:
-            break;  // TODO: something exceptiony
+            break;  // TODO: something exceptiony (see CXX-630)
     }
 }
 

src/mongocxx/client.cpp

@@ -42,7 +42,7 @@ client::client(const class uri& uri, const options::client& options)
         auto mongoc_opts = options::make_ssl_opts(*options.ssl_opts());
         libmongoc::client_set_ssl_opts(_get_impl().client_t, &mongoc_opts);
 #else
-        // TODO: For now, just ignoring. Should we throw?
+        throw exception{make_error_code(error_code::k_ssl_not_supported)};
 #endif
     }
 }

src/mongocxx/client.hpp

@@ -47,9 +47,6 @@ MONGOCXX_INLINE_NAMESPACE_BEGIN
 ///   mongocxx::client mongo_client("mongodb://localhost:27017");
 /// @endcode
 ///
-/// @todo Make iterable for databases on the server
-/// @todo Add + implement missing client api methods
-///
 class MONGOCXX_API client {
 
    public:

src/mongocxx/database.hpp

@@ -38,9 +38,8 @@ class client;
 /// Acts as a gateway for accessing collections that are contained within a database. It inherits
 /// all of its default settings from the client that creates it.
 ///
-/// @todo Make iterable for collections in the database
 /// @todo Add auth functions (add_user, remove_all_users, remove_user)
-
+///
 class MONGOCXX_API database {
    public:
     ///

src/mongocxx/exception/error_code.hpp

@@ -26,6 +26,9 @@ enum class error_code : std::int32_t {
     k_invalid_collection_object,
     k_invalid_database_object,
     k_invalid_parameter,
+    k_ssl_not_supported,
+    k_unknown_read_concern,
+    k_unknown_write_concern,
 };
 
 MONGOCXX_INLINE_NAMESPACE_END

src/mongocxx/exception/private/error_category.cpp

@@ -393,6 +393,12 @@ class mongocxx_error_category_impl final : public std::error_category {
                 return "invalid use of default constructed or moved-from mongocxx::database object";
             case error_code::k_invalid_parameter:
                 return "an invalid or out-of-bounds parameter was provided";
+            case error_code::k_ssl_not_supported:
+                return "SSL support not available";
+            case error_code::k_unknown_read_concern:
+                return "invalid attempt to set an unknown read concern level";
+            case error_code::k_unknown_write_concern:
+                return "invalid attempt to set an unknown write concern level";
             default:
                 return "unknown mongocxx error";
         }

src/mongocxx/instance.cpp

@@ -43,8 +43,7 @@ log_level convert_log_level(::mongoc_log_level_t mongoc_log_level) {
         case MONGOC_LOG_LEVEL_TRACE:
             return log_level::k_trace;
         default:
-            // TODO: MONGOCXX_UNREACHABLE (CXX-628)
-            std::abort();
+            MONGOCXX_UNREACHABLE;
     }
 }
 

src/mongocxx/pool.cpp

@@ -21,10 +21,13 @@
 #include <mongocxx/config/prelude.hpp>
 
 #include <mongocxx/client.hpp>
+#include <mongocxx/exception/error_code.hpp>
+#include <mongocxx/exception/exception.hpp>
+#include <mongocxx/exception/private/error_code.hpp>
 #include <mongocxx/private/client.hpp>
 #include <mongocxx/private/pool.hpp>
-#include <mongocxx/private/uri.hpp>
 #include <mongocxx/private/ssl.hpp>
+#include <mongocxx/private/uri.hpp>
 
 namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
@@ -49,7 +52,7 @@ pool::pool(const uri& mongodb_uri, stdx::optional<options::ssl> ssl_options)
         // temporary as the driver will copy it.
         libmongoc::client_pool_set_ssl_opts(_impl->client_pool_t, &mongoc_opts);
 #else
-        // TODO: For now, just ignoring. Should we throw?
+        throw exception{make_error_code(error_code::k_ssl_not_supported)};
 #endif
     }
 }

src/mongocxx/read_concern.cpp

@@ -13,9 +13,13 @@
 // limitations under the License.
 
 #include <mongocxx/read_concern.hpp>
+
 #include <mongocxx/private/read_concern.hpp>
 
 #include <bsoncxx/stdx/make_unique.hpp>
+#include <mongocxx/exception/error_code.hpp>
+#include <mongocxx/exception/exception.hpp>
+#include <mongocxx/exception/private/error_code.hpp>
 #include <mongocxx/private/libmongoc.hpp>
 
 namespace mongocxx {
@@ -53,9 +57,7 @@ void read_concern::acknowledge_level(read_concern::level rc_level) {
                                               MONGOC_READ_CONCERN_LEVEL_MAJORITY);
             break;
         default:
-            // TODO throw a mongocxx exception
-            throw std::invalid_argument(
-                "acknowledge_level can only be used to set levels of k_local or k_majority.");
+            throw exception{make_error_code(error_code::k_unknown_read_concern)};
     }
 }
 

src/mongocxx/test/write_concern.cpp

@@ -14,6 +14,7 @@
 
 #include "catch.hpp"
 
+#include <mongocxx/exception/exception.hpp>
 #include <mongocxx/write_concern.hpp>
 
 using namespace mongocxx;
@@ -91,9 +92,8 @@ TEST_CASE("write_concern fields may be set and retrieved", "[write_concern]") {
     }
 
     SECTION("setting invalid acknowledge levels throws") {
-        // TODO fix exception
-        REQUIRE_THROWS_AS(wc.acknowledge_level(write_concern::level::k_unknown), std::invalid_argument);
-        REQUIRE_THROWS_AS(wc.acknowledge_level(write_concern::level::k_tag), std::invalid_argument);
+        REQUIRE_THROWS_AS(wc.acknowledge_level(write_concern::level::k_unknown), exception);
+        REQUIRE_THROWS_AS(wc.acknowledge_level(write_concern::level::k_tag), exception);
         wc.tag("AnyTag");
         REQUIRE_NOTHROW(wc.acknowledge_level(write_concern::level::k_tag));
     }

src/mongocxx/write_concern.cpp

@@ -18,12 +18,15 @@
 
 #include <bsoncxx/stdx/make_unique.hpp>
 #include <bsoncxx/stdx/optional.hpp>
+#include <mongocxx/exception/error_code.hpp>
+#include <mongocxx/exception/exception.hpp>
 #include <mongocxx/exception/logic_error.hpp>
 #include <mongocxx/exception/private/error_category.hpp>
 #include <mongocxx/exception/private/error_code.hpp>
 #include <mongocxx/private/libmongoc.hpp>
 #include <mongocxx/private/write_concern.hpp>
 #include <mongocxx/stdx.hpp>
+#include <mongocxx/stdx.hpp>
 
 namespace mongocxx {
 MONGOCXX_INLINE_NAMESPACE_BEGIN
@@ -85,11 +88,7 @@ void write_concern::acknowledge_level(write_concern::level confirm_level) {
         if (libmongoc::write_concern_get_w(_impl->write_concern_t) == MONGOC_WRITE_CONCERN_W_TAG)
             return;
     default:
-        // TODO throw a mongocxx exception
-        throw std::invalid_argument(
-            "acknowledge_level can only be used to set levels of k_default, k_majority, or "
-            "k_unacknowledged.");
-        return;
+        throw exception{make_error_code(error_code::k_unknown_write_concern)};
     }
     libmongoc::write_concern_set_w(_impl->write_concern_t, w);
 }