diff --git a/include/caosdb/authentication.h b/include/caosdb/authentication.h index 2e117265d71f660888d6fd76d5fe3a3f898cac95..0ea818cc9d95caab96eb45efad30bed6d1a13745 100644 --- a/include/caosdb/authentication.h +++ b/include/caosdb/authentication.h @@ -51,8 +51,8 @@ using grpc::string_ref; class Authenticator { public: virtual ~Authenticator() = default; - [[nodiscard]] virtual auto GetCallCredentials() const - -> std::shared_ptr<grpc::CallCredentials> = 0; + [[nodiscard]] virtual auto + GetCallCredentials() const -> std::shared_ptr<grpc::CallCredentials> = 0; }; /** diff --git a/include/caosdb/configuration.h b/include/caosdb/configuration.h index 053888672ab3e1649a060553264fe8d26fda9907..11b29f3e25097d3d383da9c12aecae08eef188d9 100644 --- a/include/caosdb/configuration.h +++ b/include/caosdb/configuration.h @@ -58,8 +58,8 @@ private: public: ConnectionConfiguration(std::string host, int port); virtual ~ConnectionConfiguration() = default; - friend auto operator<<(std::ostream &out, const ConnectionConfiguration &configuration) - -> std::ostream &; + friend auto operator<<(std::ostream &out, + const ConnectionConfiguration &configuration) -> std::ostream &; [[nodiscard]] auto virtual ToString() const -> std::string = 0; [[nodiscard]] auto GetHost() const -> std::string; @@ -128,16 +128,16 @@ public: /** * See mGetConnectionConfiguration. */ - inline static auto GetConnectionConfiguration(const std::string &name) - -> std::unique_ptr<ConnectionConfiguration> { + inline static auto + GetConnectionConfiguration(const std::string &name) -> std::unique_ptr<ConnectionConfiguration> { return GetInstance().mGetConnectionConfiguration(name); } /** * Return the ConnectionConfiguration for the default connection. */ - inline static auto GetDefaultConnectionConfiguration() - -> std::unique_ptr<ConnectionConfiguration> { + inline static auto + GetDefaultConnectionConfiguration() -> std::unique_ptr<ConnectionConfiguration> { return GetInstance().mGetConnectionConfiguration(GetInstance().mGetDefaultConnectionName()); } @@ -158,7 +158,7 @@ private: JsonValue json_configuration; inline ConfigurationManager() - : json_configuration(nullptr){ + : json_configuration(nullptr) { // InitializeDefaults(); }; diff --git a/include/caosdb/connection.h b/include/caosdb/connection.h index e2a17390293f43bf2d6cc8a2af77f5ca23ab13d0..d3f10480ca9dda9c9fab3bc196dffcd9117ea981 100644 --- a/include/caosdb/connection.h +++ b/include/caosdb/connection.h @@ -111,8 +111,8 @@ public: */ // TODO(tf) find a way to deal with this: // NOLINTNEXTLINE(bugprone-easily-swappable-parameters) - [[nodiscard]] auto RetrieveSingleUser(const std::string &realm, const std::string &name) const - -> User; + [[nodiscard]] auto RetrieveSingleUser(const std::string &realm, + const std::string &name) const -> User; /** * Create a new user. @@ -170,7 +170,7 @@ class ConnectionManager { private: mutable std::map<std::string, std::shared_ptr<Connection>> connections; mutable std::string default_connection_name; - inline ConnectionManager(){}; + inline ConnectionManager() {}; auto mHasConnection(const std::string &name) const -> bool; diff --git a/include/caosdb/entity.h b/include/caosdb/entity.h index 23b6e2f612a52e85df9eb2682b6cac11fd594063..354f60f24872a24ff424d6211304d319dad2188b 100644 --- a/include/caosdb/entity.h +++ b/include/caosdb/entity.h @@ -157,7 +157,7 @@ public: friend class Entity; - virtual ~RepeatedPtrFieldWrapper(){}; + virtual ~RepeatedPtrFieldWrapper() {}; inline auto ToString() const noexcept -> const std::string override { if (this->size() == 0) { @@ -202,7 +202,7 @@ public: } protected: - RepeatedPtrFieldWrapper() : ProtoMessageWrapper<RepeatedPtrField<P>>(){}; + RepeatedPtrFieldWrapper() : ProtoMessageWrapper<RepeatedPtrField<P>>() {}; explicit inline RepeatedPtrFieldWrapper(RepeatedPtrField<P> *wrapped) : ProtoMessageWrapper<RepeatedPtrField<P>>(wrapped) {} @@ -343,7 +343,7 @@ public: private: explicit inline Message(ProtoMessage *wrapped) - : ScalarProtoMessageWrapper<ProtoMessage>(wrapped){}; + : ScalarProtoMessageWrapper<ProtoMessage>(wrapped) {}; }; /** @@ -357,7 +357,7 @@ public: // friend class Property; private: - inline Messages() : RepeatedPtrFieldWrapper<Message, ProtoMessage>(){}; + inline Messages() : RepeatedPtrFieldWrapper<Message, ProtoMessage>() {}; }; /////////////////////////////////////////////////////////////////////////////// @@ -372,8 +372,8 @@ private: */ class Parent : public ScalarProtoMessageWrapper<ProtoParent> { public: - explicit inline Parent(ProtoParent *wrapped) : ScalarProtoMessageWrapper<ProtoParent>(wrapped){}; - Parent() : ScalarProtoMessageWrapper<ProtoParent>(){}; + explicit inline Parent(ProtoParent *wrapped) : ScalarProtoMessageWrapper<ProtoParent>(wrapped) {}; + Parent() : ScalarProtoMessageWrapper<ProtoParent>() {}; ~Parent() = default; /** @@ -475,9 +475,9 @@ public: friend class Entity; private: - inline Parents() : RepeatedPtrFieldWrapper<Parent, ProtoParent>(){}; + inline Parents() : RepeatedPtrFieldWrapper<Parent, ProtoParent>() {}; explicit inline Parents(::google::protobuf::RepeatedPtrField<caosdb::entity::v1::Parent> *wrapped) - : RepeatedPtrFieldWrapper<Parent, ProtoParent>(wrapped){}; + : RepeatedPtrFieldWrapper<Parent, ProtoParent>(wrapped) {}; }; /////////////////////////////////////////////////////////////////////////////// @@ -516,10 +516,10 @@ public: value(this->wrapped->has_value() ? this->wrapped->mutable_value() : static_cast<ProtoValue *>(nullptr)), data_type(this->wrapped->has_data_type() ? this->wrapped->mutable_data_type() - : static_cast<ProtoDataType *>(nullptr)){}; + : static_cast<ProtoDataType *>(nullptr)) {}; inline Property() : ScalarProtoMessageWrapper<ProtoProperty>(), value(static_cast<ProtoValue *>(nullptr)), - data_type(static_cast<ProtoDataType *>(nullptr)){}; + data_type(static_cast<ProtoDataType *>(nullptr)) {}; ~Property() = default; @@ -660,9 +660,9 @@ public: friend class Entity; private: - inline Properties(){}; + inline Properties() {}; explicit inline Properties(RepeatedPtrField<ProtoProperty> *wrapped) - : RepeatedPtrFieldWrapper<Property, ProtoProperty>(wrapped){}; + : RepeatedPtrFieldWrapper<Property, ProtoProperty>(wrapped) {}; }; /////////////////////////////////////////////////////////////////////////////// diff --git a/include/caosdb/info.h b/include/caosdb/info.h index 0c4132f770d7bd68f10a74743246c0c037364f01..4b7c948376df77ee5d468a69218aca64b38c91e3 100644 --- a/include/caosdb/info.h +++ b/include/caosdb/info.h @@ -53,7 +53,7 @@ public: * CaosDBConnection::GetVersionInfo() instead to get the version of the * server behind the given connection. */ - explicit inline VersionInfo(ProtoVersionInfo *info) : info(info){}; + explicit inline VersionInfo(ProtoVersionInfo *info) : info(info) {}; [[nodiscard]] inline auto GetMajor() const -> int32_t { return this->info->major(); } [[nodiscard]] inline auto GetMinor() const -> int32_t { return this->info->minor(); } [[nodiscard]] inline auto GetPatch() const -> int32_t { return this->info->patch(); } diff --git a/include/caosdb/logging.h b/include/caosdb/logging.h index afed074511778de38677ea921c9647b1485e54c8..a0afefb69a042eed13bd38f1cea8d698e0b19893 100644 --- a/include/caosdb/logging.h +++ b/include/caosdb/logging.h @@ -88,7 +88,7 @@ private: */ class LevelConfiguration { public: - LevelConfiguration(int level) : level(level){}; + LevelConfiguration(int level) : level(level) {}; [[nodiscard]] inline auto GetLevel() const -> int { return this->level; } private: diff --git a/include/caosdb/transaction.h b/include/caosdb/transaction.h index b1d3bee8f740b1bcbb62c5f8fe924a937cbdf36c..3d994168d57a9882f8b41215e6c3229275cd02b8 100644 --- a/include/caosdb/transaction.h +++ b/include/caosdb/transaction.h @@ -228,8 +228,8 @@ public: * If the file cannot be downloaded due to unsufficient permissions an error * is appended. */ - auto RetrieveAndDownloadFileById(const std::string &id, const std::string &local_path) noexcept - -> StatusCode; + auto RetrieveAndDownloadFileById(const std::string &id, + const std::string &local_path) noexcept -> StatusCode; /** * Add an entity id to this transaction for retrieval. @@ -481,8 +481,8 @@ private: }; template <class InputIterator> -inline auto Transaction::RetrieveById(InputIterator begin, InputIterator end) noexcept - -> StatusCode { +inline auto Transaction::RetrieveById(InputIterator begin, + InputIterator end) noexcept -> StatusCode { ASSERT_CAN_ADD_RETRIEVAL auto next = begin; diff --git a/include/caosdb/transaction_status.h b/include/caosdb/transaction_status.h index 56bd55be6c0af5adda94fff6f49bd6781ad50816..020da73655b8bc104dc2c4827566f1d783a37d10 100644 --- a/include/caosdb/transaction_status.h +++ b/include/caosdb/transaction_status.h @@ -191,8 +191,8 @@ public: TransactionStatus::ThrowExceptionIfError(this->code, this->description); } - inline static auto ThrowExceptionIfError(StatusCode code, const std::string &description) - -> void { + inline static auto ThrowExceptionIfError(StatusCode code, + const std::string &description) -> void { if (!IsError(code)) { return; } @@ -240,7 +240,7 @@ public: inline auto GetCode() const -> StatusCode { return this->code; } TransactionStatus(StatusCode code, const std::string &description) - : code(code), description(description){}; + : code(code), description(description) {}; private: /** diff --git a/include/caosdb/utility.h b/include/caosdb/utility.h index 3a170d1597f62919b5a41baf49a453b2ffa60f54..2ae2d6d9089a08c2c604a4e37e032932f08a2f69 100644 --- a/include/caosdb/utility.h +++ b/include/caosdb/utility.h @@ -85,8 +85,8 @@ inline auto get_env_fallback(const char *key, const char *fallback) -> const cha * @brief Return the value of an environment variable or - if undefined - the * fallback value. */ -inline auto get_env_fallback(const std::string &key, const std::string &fallback) - -> const std::string { +inline auto get_env_fallback(const std::string &key, + const std::string &fallback) -> const std::string { const char *val = get_env_fallback(key.c_str(), fallback.c_str()); auto const result = std::string(val); @@ -177,7 +177,7 @@ inline auto get_home_directory() -> const path { #else const auto *const home = getenv("HOME"); #endif - + return home; } diff --git a/include/caosdb/value.h b/include/caosdb/value.h index 1da6f1c2178b1b9091b990a016e1959b5e7f2a4c..e17fc5517f8717bec8c8249e7ce6f07b0f7c0e35 100644 --- a/include/caosdb/value.h +++ b/include/caosdb/value.h @@ -170,7 +170,7 @@ public: /** * Destructor. */ - inline ~ScalarValue(){}; + inline ~ScalarValue() {}; /** * Copy constructor. */ @@ -180,7 +180,7 @@ public: /** * Move constructor. */ - inline ScalarValue(ScalarValue &&other) : ScalarValue(std::move(other.wrapped)){}; + inline ScalarValue(ScalarValue &&other) : ScalarValue(std::move(other.wrapped)) {}; /** * Copy assignment operator. */ diff --git a/src/caosdb/authentication.cpp b/src/caosdb/authentication.cpp index 11c3c17366ae9d24f209f7915c640fd2fee80d95..919f9bca3b18fc3aa5192ed10855d60925101bc1 100644 --- a/src/caosdb/authentication.cpp +++ b/src/caosdb/authentication.cpp @@ -37,11 +37,10 @@ using grpc::string_ref; MetadataCredentialsPluginImpl::MetadataCredentialsPluginImpl(std::string key, std::string value) : key(std::move(key)), value(std::move(value)) {} -auto MetadataCredentialsPluginImpl::GetMetadata(string_ref /*service_url*/, - string_ref /*method_name*/, - const AuthContext & /*channel_auth_context*/, - std::multimap<grpc::string, grpc::string> *metadata) - -> Status { +auto MetadataCredentialsPluginImpl::GetMetadata( + string_ref /*service_url*/, string_ref /*method_name*/, + const AuthContext & /*channel_auth_context*/, + std::multimap<grpc::string, grpc::string> *metadata) -> Status { metadata->insert(std::make_pair(this->key, this->value)); return Status::OK; diff --git a/src/caosdb/configuration.cpp b/src/caosdb/configuration.cpp index 6e23985595009f4ab2c544ce46220e54c4b82e9b..507f11e3f8cd8f1fc87dbc04ca1375698e9439b6 100644 --- a/src/caosdb/configuration.cpp +++ b/src/caosdb/configuration.cpp @@ -55,7 +55,7 @@ throw ConfigurationError("This CaosDB client has not been configured."); \ } \ assert(WRAPPED_JSON_CONFIGURATION(this)->is_object()); \ - const auto &configuration = WRAPPED_JSON_CONFIGURATION(this) -> as_object(); \ + const auto &configuration = WRAPPED_JSON_CONFIGURATION(this)->as_object(); \ if (!configuration.contains("connections")) { \ throw ConfigurationError("This CaosDB client hasn't any configured connections."); \ } \ @@ -285,8 +285,8 @@ auto CreateSyslogSinkConfiguration(const object & /*from*/, const std::string &n return result; } -auto CreateFileSinkConfiguration(const object &from, const std::string &name, int level) - -> std::shared_ptr<caosdb::logging::SinkConfiguration> { +auto CreateFileSinkConfiguration(const object &from, const std::string &name, + int level) -> std::shared_ptr<caosdb::logging::SinkConfiguration> { auto result = std::make_shared<FileSinkConfiguration>(name, level); if (from.contains("directory")) { result->SetDirectory(from.at("directory").as_string().c_str()); diff --git a/src/caosdb/result_table_impl.h b/src/caosdb/result_table_impl.h index 3450a68cf7ae0638d42d3ea1c79fd9d181a3eaab..6570e7a71144906128da0cbf9ff38be270790fc0 100644 --- a/src/caosdb/result_table_impl.h +++ b/src/caosdb/result_table_impl.h @@ -76,8 +76,8 @@ class ResultTableImpl : public ScalarProtoMessageWrapper<ProtoSelectQueryResult> friend class ResultTable; friend class ResultTable::HeaderIterator; friend class ResultTableColumn; - friend auto ProcessSelectResponse(ProtoSelectQueryResult *select_result) - -> std::unique_ptr<ResultTable>; + friend auto + ProcessSelectResponse(ProtoSelectQueryResult *select_result) -> std::unique_ptr<ResultTable>; }; } // namespace caosdb::transaction diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp index 56e8e8fc922a380fcdca33d58d91d13f8eb068b9..c67cae1ac2e50d30b2cafbfc60b7e7c28795cd9d 100644 --- a/src/caosdb/transaction.cpp +++ b/src/caosdb/transaction.cpp @@ -79,9 +79,8 @@ auto Transaction::RetrieveById(const std::string &id) noexcept -> StatusCode { return this->status.GetCode(); } -auto Transaction::RetrieveAndDownloadFileById(const std::string &id, - const std::string &local_path) noexcept - -> StatusCode { +auto Transaction::RetrieveAndDownloadFileById( + const std::string &id, const std::string &local_path) noexcept -> StatusCode { ASSERT_CAN_ADD_RETRIEVAL auto *retrieve_request = this->request->add_requests()->mutable_retrieve_request(); @@ -298,10 +297,9 @@ auto ProcessSelectResponse(ProtoSelectQueryResult *select_result) -> std::unique return ResultTableImpl::create(select_result); } -auto Transaction::ProcessRetrieveResponse(RetrieveResponse *retrieve_response, - std::vector<std::unique_ptr<Entity>> *entities, - bool *set_error) const noexcept - -> std::unique_ptr<Entity> { +auto Transaction::ProcessRetrieveResponse( + RetrieveResponse *retrieve_response, std::vector<std::unique_ptr<Entity>> *entities, + bool *set_error) const noexcept -> std::unique_ptr<Entity> { std::unique_ptr<Entity> result; switch (retrieve_response->retrieve_response_case()) { case RetrieveResponseCase::kEntityResponse: {