From 2a15f1030dc701c49e7120f6bfea911a35d11351 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Wed, 30 Jun 2021 12:54:26 +0200
Subject: [PATCH] STY: formatting
---
include/caosdb/authentication.h | 26 ++++++++++++++------------
include/caosdb/connection.h | 26 +++++++++++++++++++-------
src/caosdb/authentication.cpp | 14 +++++++-------
src/caosdb/connection.cpp | 30 ++++++++++++++++--------------
4 files changed, 56 insertions(+), 40 deletions(-)
diff --git a/include/caosdb/authentication.h b/include/caosdb/authentication.h
index de3f984..da00457 100644
--- a/include/caosdb/authentication.h
+++ b/include/caosdb/authentication.h
@@ -28,14 +28,16 @@
* @brief Configuration and setup of the client authentication.
*/
-#include <grpcpp/security/credentials.h> // for MetadataCredentialsPlugin
-#include <map> // for multimap
-#include <memory> // for shared_ptr
-#include <string> // for string
-#include "caosdb/utils.h" // for base64_encode
-#include "grpcpp/impl/codegen/status.h" // for Status
-#include "grpcpp/impl/codegen/string_ref.h" // for string_ref
-namespace grpc { class AuthContext; }
+#include <grpcpp/security/credentials.h> // for MetadataCredentialsPlugin
+#include <map> // for multimap
+#include <memory> // for shared_ptr
+#include <string> // for string
+#include "caosdb/utils.h" // for base64_encode
+#include "grpcpp/impl/codegen/status.h" // for Status
+#include "grpcpp/impl/codegen/string_ref.h" // for string_ref
+namespace grpc {
+class AuthContext;
+}
namespace caosdb {
namespace authentication {
@@ -67,10 +69,10 @@ private:
public:
MetadataCredentialsPluginImpl(std::string key, std::string value);
- auto
- GetMetadata(string_ref service_url, string_ref method_name,
- const AuthContext &channel_auth_context,
- std::multimap<grpc::string, grpc::string> *metadata) -> Status override;
+ auto GetMetadata(string_ref service_url, string_ref method_name,
+ const AuthContext &channel_auth_context,
+ std::multimap<grpc::string, grpc::string> *metadata)
+ -> Status override;
};
class PlainPasswordAuthenticator : public Authenticator {
diff --git a/include/caosdb/connection.h b/include/caosdb/connection.h
index c233dce..1f8bc94 100644
--- a/include/caosdb/connection.h
+++ b/include/caosdb/connection.h
@@ -27,13 +27,25 @@
* @date 2021-05-18
* @brief Configuration and setup of the connection.
*/
-#include <iosfwd> // for ostream
-#include <memory> // for shared_ptr, unique_ptr
-#include <string> // for string
-#include "caosdb/info/v1alpha1/main.grpc.pb.h" // for GeneralInfoService
-namespace caosdb { namespace authentication { class Authenticator; } }
-namespace caosdb { namespace info { namespace v1alpha1 { class VersionInfo; } } }
-namespace grpc { class ChannelCredentials; }
+#include <iosfwd> // for ostream
+#include <memory> // for shared_ptr, unique_ptr
+#include <string> // for string
+#include "caosdb/info/v1alpha1/main.grpc.pb.h" // for GeneralInfoService
+namespace caosdb {
+namespace authentication {
+class Authenticator;
+}
+} // namespace caosdb
+namespace caosdb {
+namespace info {
+namespace v1alpha1 {
+class VersionInfo;
+}
+} // namespace info
+} // namespace caosdb
+namespace grpc {
+class ChannelCredentials;
+}
namespace caosdb::connection {
using caosdb::authentication::Authenticator;
diff --git a/src/caosdb/authentication.cpp b/src/caosdb/authentication.cpp
index 4ff2185..e784982 100644
--- a/src/caosdb/authentication.cpp
+++ b/src/caosdb/authentication.cpp
@@ -19,13 +19,13 @@
*
*/
#include "caosdb/authentication.h"
-#include <grpcpp/impl/codegen/status.h> // for Status, Status::OK
-#include <grpcpp/impl/codegen/string_ref.h> // for string_ref
-#include <map> // for multimap
-#include <memory> // for allocator, shared_ptr
-#include <string> // for basic_string, operator+
-#include <utility> // for pair, move, make_pair
-#include "grpcpp/security/credentials.h" // for MetadataCredentialsFromP...
+#include <grpcpp/impl/codegen/status.h> // for Status, Status::OK
+#include <grpcpp/impl/codegen/string_ref.h> // for string_ref
+#include <map> // for multimap
+#include <memory> // for allocator, shared_ptr
+#include <string> // for basic_string, operator+
+#include <utility> // for pair, move, make_pair
+#include "grpcpp/security/credentials.h" // for MetadataCredentialsFromP...
namespace caosdb::authentication {
using caosdb::utils::base64_encode;
diff --git a/src/caosdb/connection.cpp b/src/caosdb/connection.cpp
index f7fe592..4a78075 100644
--- a/src/caosdb/connection.cpp
+++ b/src/caosdb/connection.cpp
@@ -20,20 +20,22 @@
*
*/
#include "caosdb/connection.h"
-#include <grpcpp/create_channel.h> // for CreateChannel
-#include <grpcpp/impl/codegen/client_context.h> // for ClientContext
-#include <grpcpp/impl/codegen/status.h> // for Status
-#include <grpcpp/security/credentials.h> // for SslCredentials
-#include <iostream> // for operator<<, basic_...
-#include <stdexcept> // for runtime_error
-#include <string> // for operator+, char_tr...
-#include "caosdb/authentication.h" // for Authenticator
-#include "caosdb/exceptions.h" // for AuthenticationError
-#include "caosdb/info/v1alpha1/main.grpc.pb.h" // for GeneralInfoService
-#include "caosdb/info/v1alpha1/main.pb.h" // for GetVersionInfoResp...
-#include "caosdb/utils.h" // for load_string_file
-#include "grpcpp/impl/codegen/status_code_enum.h" // for StatusCode, UNAUTH...
-namespace grpc { class Channel; }
+#include <grpcpp/create_channel.h> // for CreateChannel
+#include <grpcpp/impl/codegen/client_context.h> // for ClientContext
+#include <grpcpp/impl/codegen/status.h> // for Status
+#include <grpcpp/security/credentials.h> // for SslCredentials
+#include <iostream> // for operator<<, basic_...
+#include <stdexcept> // for runtime_error
+#include <string> // for operator+, char_tr...
+#include "caosdb/authentication.h" // for Authenticator
+#include "caosdb/exceptions.h" // for AuthenticationError
+#include "caosdb/info/v1alpha1/main.grpc.pb.h" // for GeneralInfoService
+#include "caosdb/info/v1alpha1/main.pb.h" // for GetVersionInfoResp...
+#include "caosdb/utils.h" // for load_string_file
+#include "grpcpp/impl/codegen/status_code_enum.h" // for StatusCode, UNAUTH...
+namespace grpc {
+class Channel;
+}
namespace caosdb::connection {
using caosdb::authentication::Authenticator;
--
GitLab