Throw Result instead

Author: BewareMyPower

lib/ClientConnection.cc

@@ -189,7 +189,7 @@ ClientConnection::ClientConnection(const std::string& logicalAddress, const std:
     LOG_INFO(cnxString_ << "Create ClientConnection, timeout=" << clientConfiguration.getConnectionTimeout());
     if (!authentication_) {
         LOG_ERROR("Invalid authentication plugin");
-        throw ResultException{ResultAuthenticationError};
+        throw ResultAuthenticationError;
     }
     if (clientConfiguration.isUseTls()) {
 #if BOOST_VERSION >= 105400
@@ -211,7 +211,7 @@ ClientConnection::ClientConnection(const std::string& logicalAddress, const std:
                     ctx.load_verify_file(trustCertFilePath);
                 } else {
                     LOG_ERROR(trustCertFilePath << ": No such trustCertFile");
-                    throw ResultException{ResultAuthenticationError};
+                    throw ResultAuthenticationError;
                 }
             } else {
                 ctx.set_default_verify_paths();
@@ -228,11 +228,11 @@ ClientConnection::ClientConnection(const std::string& logicalAddress, const std:
             tlsPrivateKey = authData->getTlsPrivateKey();
             if (!file_exists(tlsCertificates)) {
                 LOG_ERROR(tlsCertificates << ": No such tlsCertificates");
-                throw ResultException{ResultAuthenticationError};
+                throw ResultAuthenticationError;
             }
             if (!file_exists(tlsCertificates)) {
                 LOG_ERROR(tlsCertificates << ": No such tlsCertificates");
-                throw ResultException{ResultAuthenticationError};
+                throw ResultAuthenticationError;
             }
             ctx.use_private_key_file(tlsPrivateKey, boost::asio::ssl::context::pem);
             ctx.use_certificate_file(tlsCertificates, boost::asio::ssl::context::pem);

lib/ConnectionPool.cc

@@ -24,7 +24,6 @@
 #include "ClientConnection.h"
 #include "ExecutorService.h"
 #include "LogUtils.h"
-#include "ResultUtils.h"
 
 using boost::asio::ip::tcp;
 namespace ssl = boost::asio::ssl;
@@ -96,8 +95,8 @@ auto ConnectionPool::getConnectionAsync(const std::string& logicalAddress, const
         cnx.reset(new ClientConnection(logicalAddress, physicalAddress, executorProvider_->get(keySuffix),
                                        clientConfiguration_, authentication_, clientVersion_, *this,
                                        keySuffix));
-    } catch (const ResultException& e) {
-        return ConnectionFuture::failure(e.result());
+    } catch (Result result) {
+        return ConnectionFuture::failure(result);
     } catch (const std::runtime_error& e) {
         lock.unlock();
         LOG_ERROR("Failed to create connection: " << e.what())

lib/ResultUtils.h

@@ -20,22 +20,10 @@
 
 #include <pulsar/Result.h>
 
-#include <exception>
-
 namespace pulsar {
 
 inline bool isResultRetryable(Result result) {
     return result == ResultRetryable || result == ResultDisconnected;
 }
 
-class ResultException : public std::exception {
-   public:
-    ResultException(Result result) : result_(result) {}
-    Result result() const noexcept { return result_; }
-    const char* what() const noexcept { return strResult(result_); }
-
-   private:
-    const Result result_;
-};
-
 }  // namespace pulsar