Skip to content
Snippets Groups Projects
Verified Commit 924a62a6 authored by Timm Fitschen's avatar Timm Fitschen
Browse files

STY: formatting

parent ef0b362f
No related branches found
No related tags found
No related merge requests found
Pipeline #8219 passed
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include <grpcpp/create_channel.h> #include <grpcpp/create_channel.h>
#include <grpcpp/security/credentials.h> #include <grpcpp/security/credentials.h>
namespace caosdb { namespace caosdb {
using caosdb::info::v1alpha1::GeneralInfoService; using caosdb::info::v1alpha1::GeneralInfoService;
using caosdb::info::v1alpha1::VersionInfo; using caosdb::info::v1alpha1::VersionInfo;
...@@ -47,15 +46,16 @@ using caosdb::info::v1alpha1::VersionInfo; ...@@ -47,15 +46,16 @@ using caosdb::info::v1alpha1::VersionInfo;
class CaosDBConnectionConfig { class CaosDBConnectionConfig {
std::string host; std::string host;
int port; int port;
public: public:
CaosDBConnectionConfig(const std::string &host, int port); CaosDBConnectionConfig(const std::string &host, int port);
friend auto operator << (std::ostream &out, const CaosDBConnectionConfig &config) -> std::ostream &; friend auto operator<<(std::ostream &out,
const CaosDBConnectionConfig &config)
-> std::ostream &;
[[nodiscard]] [[nodiscard]] auto getHost() -> std::string;
auto getHost() -> std::string;
[[nodiscard]] [[nodiscard]] auto getPort() const -> int;
auto getPort() const -> int;
}; };
/** /**
...@@ -64,12 +64,13 @@ class CaosDBConnectionConfig { ...@@ -64,12 +64,13 @@ class CaosDBConnectionConfig {
class CaosDBConnection { class CaosDBConnection {
CaosDBConnectionConfig config; CaosDBConnectionConfig config;
std::unique_ptr<GeneralInfoService::Stub> stub_; std::unique_ptr<GeneralInfoService::Stub> stub_;
public: public:
explicit CaosDBConnection(const CaosDBConnectionConfig &config); explicit CaosDBConnection(const CaosDBConnectionConfig &config);
friend auto operator << (std::ostream &out, const CaosDBConnection &connection) -> std::ostream &; friend auto operator<<(std::ostream &out, const CaosDBConnection &connection)
-> std::ostream &;
auto getGeneralInfoService() -> GeneralInfoService::Stub &; auto getGeneralInfoService() -> GeneralInfoService::Stub &;
[[nodiscard]] [[nodiscard]] auto getVersionInfo() const -> const VersionInfo &;
auto getVersionInfo() const -> const VersionInfo &;
}; };
} // namespace caosdb } // namespace caosdb
#endif #endif
...@@ -41,7 +41,8 @@ auto main() -> int { ...@@ -41,7 +41,8 @@ auto main() -> int {
caosdb::CaosDBConnectionConfig config(host, port); caosdb::CaosDBConnectionConfig config(host, port);
caosdb::CaosDBConnection connection(config); caosdb::CaosDBConnection connection(config);
std::cout << std::endl << connection << std::endl; 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; std::cout << "VersionInfo(" << v_info.major() << ")" << std::endl;
return 0; return 0;
} }
...@@ -28,35 +28,38 @@ ...@@ -28,35 +28,38 @@
namespace caosdb { namespace caosdb {
using caosdb::info::v1alpha1::GeneralInfoService; using caosdb::info::v1alpha1::GeneralInfoService;
using caosdb::info::v1alpha1::VersionInfo;
using caosdb::info::v1alpha1::GetVersionInfoRequest; using caosdb::info::v1alpha1::GetVersionInfoRequest;
using caosdb::info::v1alpha1::GetVersionInfoResponse; using caosdb::info::v1alpha1::GetVersionInfoResponse;
using caosdb::info::v1alpha1::VersionInfo;
CaosDBConnectionConfig::CaosDBConnectionConfig(const std::string &host, int port) { CaosDBConnectionConfig::CaosDBConnectionConfig(const std::string &host,
int port) {
this->host = host; this->host = host;
this->port = port; this->port = port;
} }
auto CaosDBConnectionConfig::getHost() -> std::string { auto CaosDBConnectionConfig::getHost() -> std::string { return this->host; }
return this->host;
}
auto CaosDBConnectionConfig::getPort() const -> int { auto CaosDBConnectionConfig::getPort() const -> int { return this->port; }
return this->port;
}
auto operator << (std::ostream &out, const CaosDBConnectionConfig &config) -> std::ostream & { auto operator<<(std::ostream &out, const CaosDBConnectionConfig &config)
out << "CaosDBConnectionConfig(\"" << config.host << "\"," << config.port << ")"; -> std::ostream & {
out << "CaosDBConnectionConfig(\"" << config.host << "\"," << config.port
<< ")";
return out; return out;
} }
CaosDBConnection::CaosDBConnection(const CaosDBConnectionConfig &config) : config(config) { CaosDBConnection::CaosDBConnection(const CaosDBConnectionConfig &config)
: config(config) {
this->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); 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 << ")"; out << "CaosDBConnection(" << connection.config << ")";
return out; return out;
} }
...@@ -65,12 +68,13 @@ auto CaosDBConnection::getGeneralInfoService() -> GeneralInfoService::Stub & { ...@@ -65,12 +68,13 @@ auto CaosDBConnection::getGeneralInfoService() -> GeneralInfoService::Stub & {
return *stub_; return *stub_;
} }
[[nodiscard]] [[nodiscard]] auto CaosDBConnection::getVersionInfo() const
auto CaosDBConnection::getVersionInfo() const -> const VersionInfo & { -> const VersionInfo & {
const GetVersionInfoRequest request; const GetVersionInfoRequest request;
GetVersionInfoResponse response; GetVersionInfoResponse response;
grpc::ClientContext context; 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()); throw std::runtime_error(status.error_message());
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment