diff --git a/include/connection.h b/include/connection.h index 0fc90f623cf0895ce6e4aeaf237ff5b2ff861dc2..a6046c8364e14e112a24990e8148d00287417b4a 100644 --- a/include/connection.h +++ b/include/connection.h @@ -36,7 +36,6 @@ #include <grpcpp/create_channel.h> #include <grpcpp/security/credentials.h> - namespace caosdb { using caosdb::info::v1alpha1::GeneralInfoService; using caosdb::info::v1alpha1::VersionInfo; @@ -47,15 +46,16 @@ using caosdb::info::v1alpha1::VersionInfo; class CaosDBConnectionConfig { std::string host; int port; - public: - CaosDBConnectionConfig(const std::string &host, int port); - friend auto operator << (std::ostream &out, const CaosDBConnectionConfig &config) -> std::ostream &; - [[nodiscard]] - auto getHost() -> std::string; +public: + CaosDBConnectionConfig(const std::string &host, int port); + friend auto operator<<(std::ostream &out, + const CaosDBConnectionConfig &config) + -> std::ostream &; + + [[nodiscard]] auto getHost() -> std::string; - [[nodiscard]] - auto getPort() const -> int; + [[nodiscard]] auto getPort() const -> int; }; /** @@ -64,12 +64,13 @@ class CaosDBConnectionConfig { class CaosDBConnection { CaosDBConnectionConfig config; std::unique_ptr<GeneralInfoService::Stub> stub_; - public: - explicit CaosDBConnection(const CaosDBConnectionConfig &config); - friend auto operator << (std::ostream &out, const CaosDBConnection &connection) -> std::ostream &; - auto getGeneralInfoService() -> GeneralInfoService::Stub &; - [[nodiscard]] - auto getVersionInfo() const -> const VersionInfo &; + +public: + explicit CaosDBConnection(const CaosDBConnectionConfig &config); + friend auto operator<<(std::ostream &out, const CaosDBConnection &connection) + -> std::ostream &; + auto getGeneralInfoService() -> GeneralInfoService::Stub &; + [[nodiscard]] auto getVersionInfo() const -> const VersionInfo &; }; } // namespace caosdb #endif diff --git a/src/caosdbcli.cpp b/src/caosdbcli.cpp index daa744da6655d3671954e6fd1e8b761034637e21..fd591a2d1fe58841a24ebceb12d06466d214d831 100644 --- a/src/caosdbcli.cpp +++ b/src/caosdbcli.cpp @@ -41,7 +41,8 @@ auto main() -> int { caosdb::CaosDBConnectionConfig config(host, port); caosdb::CaosDBConnection connection(config); std::cout << std::endl << connection << std::endl; - const caosdb::info::v1alpha1::VersionInfo &v_info = connection.getVersionInfo(); + const caosdb::info::v1alpha1::VersionInfo &v_info = + connection.getVersionInfo(); std::cout << "VersionInfo(" << v_info.major() << ")" << std::endl; return 0; } diff --git a/src/connection.cpp b/src/connection.cpp index 9b32b1722870900e4d9a04741681a35bce46f1fd..580a6ad6393accfcba945513dff28e4dc3d5b22a 100644 --- a/src/connection.cpp +++ b/src/connection.cpp @@ -28,35 +28,38 @@ namespace caosdb { using caosdb::info::v1alpha1::GeneralInfoService; -using caosdb::info::v1alpha1::VersionInfo; using caosdb::info::v1alpha1::GetVersionInfoRequest; using caosdb::info::v1alpha1::GetVersionInfoResponse; +using caosdb::info::v1alpha1::VersionInfo; -CaosDBConnectionConfig::CaosDBConnectionConfig(const std::string &host, int port) { - this->host = host; - this->port = port; +CaosDBConnectionConfig::CaosDBConnectionConfig(const std::string &host, + int port) { + this->host = host; + this->port = port; } -auto CaosDBConnectionConfig::getHost() -> std::string { - return this->host; -} +auto CaosDBConnectionConfig::getHost() -> std::string { return this->host; } -auto CaosDBConnectionConfig::getPort() const -> int { - return this->port; -} +auto CaosDBConnectionConfig::getPort() const -> int { return this->port; } -auto operator << (std::ostream &out, const CaosDBConnectionConfig &config) -> std::ostream & { - out << "CaosDBConnectionConfig(\"" << config.host << "\"," << config.port << ")"; +auto operator<<(std::ostream &out, const CaosDBConnectionConfig &config) + -> std::ostream & { + out << "CaosDBConnectionConfig(\"" << config.host << "\"," << config.port + << ")"; return out; } -CaosDBConnection::CaosDBConnection(const CaosDBConnectionConfig &config) : config(config) { +CaosDBConnection::CaosDBConnection(const CaosDBConnectionConfig &config) + : config(config) { this->config = config; - std::shared_ptr<grpc::Channel> channel = grpc::CreateChannel(this->config.getHost() + ":" + std::to_string(this->config.getPort()), grpc::InsecureChannelCredentials()); + std::shared_ptr<grpc::Channel> channel = grpc::CreateChannel( + this->config.getHost() + ":" + std::to_string(this->config.getPort()), + grpc::InsecureChannelCredentials()); this->stub_ = GeneralInfoService::NewStub(channel); } -auto operator << (std::ostream &out, const CaosDBConnection &connection) -> std::ostream & { +auto operator<<(std::ostream &out, const CaosDBConnection &connection) + -> std::ostream & { out << "CaosDBConnection(" << connection.config << ")"; return out; } @@ -65,14 +68,15 @@ auto CaosDBConnection::getGeneralInfoService() -> GeneralInfoService::Stub & { return *stub_; } -[[nodiscard]] -auto CaosDBConnection::getVersionInfo() const -> const VersionInfo & { +[[nodiscard]] auto CaosDBConnection::getVersionInfo() const + -> const VersionInfo & { const GetVersionInfoRequest request; GetVersionInfoResponse response; grpc::ClientContext context; - const grpc::Status status = stub_->GetVersionInfo(&context, request, &response); + const grpc::Status status = + stub_->GetVersionInfo(&context, request, &response); - if(!status.ok()) { + if (!status.ok()) { throw std::runtime_error(status.error_message()); } return response.version_info();