Skip to content
Snippets Groups Projects
Commit b9aa2c79 authored by Daniel Hornung's avatar Daniel Hornung
Browse files

MAINT: Renamed GenericException -> Exception.

parent 4a738a7a
No related branches found
No related tags found
1 merge request!3Better Error Handling and Logging
Pipeline #10978 passed
Pipeline: caosdb-cppinttest

#10979

    ...@@ -32,9 +32,9 @@ using std::runtime_error; ...@@ -32,9 +32,9 @@ using std::runtime_error;
    /** /**
    * @brief Generic exception class of the caosdb client library. * @brief Generic exception class of the caosdb client library.
    */ */
    class GenericException : public runtime_error { class Exception : public runtime_error {
    public: public:
    explicit GenericException(StatusCode code, const std::string &what_arg) explicit Exception(StatusCode code, const std::string &what_arg)
    : runtime_error(what_arg), code(code) {} : runtime_error(what_arg), code(code) {}
    [[nodiscard]] inline auto GetCode() const -> StatusCode { return this->code; } [[nodiscard]] inline auto GetCode() const -> StatusCode { return this->code; }
    ...@@ -45,47 +45,47 @@ private: ...@@ -45,47 +45,47 @@ private:
    /** /**
    * @brief Exception for authentication errors. * @brief Exception for authentication errors.
    */ */
    class AuthenticationError : public GenericException { class AuthenticationError : public Exception {
    public: public:
    explicit AuthenticationError(const std::string &what_arg) explicit AuthenticationError(const std::string &what_arg)
    : GenericException(StatusCode::AUTHENTICATION_ERROR, what_arg) {} : Exception(StatusCode::AUTHENTICATION_ERROR, what_arg) {}
    }; };
    /** /**
    * @brief The connection to the CaosDB server is down. * @brief The connection to the CaosDB server is down.
    */ */
    class ConnectionError : public GenericException { class ConnectionError : public Exception {
    public: public:
    explicit ConnectionError(const std::string &what_arg) explicit ConnectionError(const std::string &what_arg)
    : GenericException(StatusCode::CONNECTION_ERROR, what_arg) {} : Exception(StatusCode::CONNECTION_ERROR, what_arg) {}
    }; };
    /** /**
    * @brief The transaction terminated unsuccessfully. * @brief The transaction terminated unsuccessfully.
    */ */
    class TransactionError : public GenericException { class TransactionError : public Exception {
    public: public:
    explicit TransactionError(const std::string &what_arg) explicit TransactionError(const std::string &what_arg)
    : GenericException(StatusCode::GENERIC_TRANSACTION_ERROR, what_arg) {} : Exception(StatusCode::GENERIC_TRANSACTION_ERROR, what_arg) {}
    }; };
    /** /**
    * @brief Exception for errors of the ConfigurationManager or other components * @brief Exception for errors of the ConfigurationManager or other components
    * of the configuration. * of the configuration.
    */ */
    class ConfigurationError : public GenericException { class ConfigurationError : public Exception {
    public: public:
    explicit ConfigurationError(const std::string &what_arg) explicit ConfigurationError(const std::string &what_arg)
    : GenericException(StatusCode::CONFIGURATION_ERROR, what_arg) {} : Exception(StatusCode::CONFIGURATION_ERROR, what_arg) {}
    }; };
    /** /**
    * @brief The connection isn't known to the ConnectionManager under this name. * @brief The connection isn't known to the ConnectionManager under this name.
    */ */
    class UnknownConnectionError : public GenericException { class UnknownConnectionError : public Exception {
    public: public:
    explicit UnknownConnectionError(const std::string &what_arg) explicit UnknownConnectionError(const std::string &what_arg)
    : GenericException(StatusCode::UNKNOWN_CONNECTION_ERROR, what_arg) {} : Exception(StatusCode::UNKNOWN_CONNECTION_ERROR, what_arg) {}
    }; };
    } // namespace caosdb::exceptions } // namespace caosdb::exceptions
    ......
    ...@@ -35,7 +35,7 @@ namespace caosdb::transaction { ...@@ -35,7 +35,7 @@ namespace caosdb::transaction {
    using caosdb::StatusCode; using caosdb::StatusCode;
    using caosdb::exceptions::AuthenticationError; using caosdb::exceptions::AuthenticationError;
    using caosdb::exceptions::ConnectionError; using caosdb::exceptions::ConnectionError;
    using caosdb::exceptions::GenericException; using caosdb::exceptions::Exception;
    using caosdb::exceptions::TransactionError; using caosdb::exceptions::TransactionError;
    /** /**
    ...@@ -113,7 +113,7 @@ public: ...@@ -113,7 +113,7 @@ public:
    case StatusCode::GENERIC_TRANSACTION_ERROR: case StatusCode::GENERIC_TRANSACTION_ERROR:
    throw TransactionError(this->description); throw TransactionError(this->description);
    default: default:
    throw GenericException(StatusCode::GENERIC_ERROR, this->description); throw Exception(StatusCode::GENERIC_ERROR, this->description);
    } }
    } }
    ......
    ...@@ -357,7 +357,7 @@ auto ConfigurationManager::mReset() noexcept -> int { ...@@ -357,7 +357,7 @@ auto ConfigurationManager::mReset() noexcept -> int {
    mClear(); mClear();
    InitializeDefaults(); InitializeDefaults();
    return StatusCode::SUCCESS; return StatusCode::SUCCESS;
    } catch (const caosdb::exceptions::GenericException &exc) { } catch (const caosdb::exceptions::Exception &exc) {
    return exc.GetCode(); return exc.GetCode();
    } catch (const std::exception &exc) { } catch (const std::exception &exc) {
    CAOSDB_LOG_ERROR(logger_name) CAOSDB_LOG_ERROR(logger_name)
    ...@@ -372,7 +372,7 @@ auto ConfigurationManager::mClear() noexcept -> int { ...@@ -372,7 +372,7 @@ auto ConfigurationManager::mClear() noexcept -> int {
    json_configuration = value(nullptr); json_configuration = value(nullptr);
    ConnectionManager::Reset(); ConnectionManager::Reset();
    return StatusCode::SUCCESS; return StatusCode::SUCCESS;
    } catch (const caosdb::exceptions::GenericException &exc) { } catch (const caosdb::exceptions::Exception &exc) {
    return exc.GetCode(); return exc.GetCode();
    } catch (const std::exception &exc) { } catch (const std::exception &exc) {
    CAOSDB_LOG_ERROR(logger_name) CAOSDB_LOG_ERROR(logger_name)
    ......
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment