From 53f538312816f386a9e6cab2cdd763f318e119d4 Mon Sep 17 00:00:00 2001
From: Timm Fitschen <t.fitschen@indiscale.com>
Date: Thu, 30 Jun 2022 21:30:14 +0200
Subject: [PATCH] MAINT: clean up imports
---
include/caosdb/acm/role.h | 8 ++++----
.../register_file_upload_handler.h | 14 ++++++-------
include/caosdb/transaction_handler.h | 14 ++++++-------
include/caosdb/unary_rpc_handler.h | 10 +++++-----
src/caosdb/acm/role.cpp | 20 +++++++++----------
src/caosdb/acm/role_impl.h | 4 ++--
.../register_file_upload_handler.cpp | 4 +---
src/caosdb/transaction_handler.cpp | 2 --
8 files changed, 36 insertions(+), 40 deletions(-)
diff --git a/include/caosdb/acm/role.h b/include/caosdb/acm/role.h
index f6ff4eb..cf1a90b 100644
--- a/include/caosdb/acm/role.h
+++ b/include/caosdb/acm/role.h
@@ -44,17 +44,17 @@ class RoleImpl;
class Role {
public:
- explicit Role(std::string name);
+ explicit Role(const std::string &name);
explicit Role(std::unique_ptr<RoleImpl> wrapped);
- Role(std::string name, std::string description);
+ Role(const std::string &name, const std::string &description);
Role(const Role &role);
auto operator=(const Role &role) -> Role &;
~Role();
auto ToString() const -> std::string;
[[nodiscard]] auto GetName() const -> const std::string &;
- auto SetName(std::string name) -> void;
+ auto SetName(const std::string &name) -> void;
[[nodiscard]] auto GetDescription() const -> const std::string &;
- auto SetDescription(std::string description) -> void;
+ auto SetDescription(const std::string &description) -> void;
[[nodiscard]] auto GetPermissionRules() const -> const PermissionRules &;
// auto SetPermissionRules(PermissionRules rules) -> void;
auto ClearPermissionRules() -> void;
diff --git a/include/caosdb/file_transmission/register_file_upload_handler.h b/include/caosdb/file_transmission/register_file_upload_handler.h
index 37df2db..37cc6cf 100644
--- a/include/caosdb/file_transmission/register_file_upload_handler.h
+++ b/include/caosdb/file_transmission/register_file_upload_handler.h
@@ -49,13 +49,13 @@
#ifndef CAOSDB_FILE_TRANSMISSION_REGISTER_FILE_UPLOAD_H
#define CAOSDB_FILE_TRANSMISSION_REGISTER_FILE_UPLOAD_H
-#include "caosdb/entity/v1/main.grpc.pb.h" // for FileTransmissionS...
-#include "caosdb/entity/v1/main.pb.h" // for FileDownloadResponse
-#include "caosdb/handler_interface.h" // for HandlerTag, Handl...
-#include "caosdb/unary_rpc_handler.h"
-#include <grpcpp/impl/codegen/async_unary_call.h> // for ClientAsyncRespons...
-#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
-#include <memory> // for unique_ptr
+#include "caosdb/entity/v1/main.grpc.pb.h" // for FileTransmissionS...
+#include "caosdb/entity/v1/main.pb.h" // for FileDownloadResponse
+#include "caosdb/handler_interface.h" // for HandlerTag, Handl...
+#include "caosdb/unary_rpc_handler.h" // for UnaryRpcHandler
+#include <grpcpp/completion_queue.h> // for CompletionQueue
+#include <grpcpp/support/async_unary_call.h> // for ClientAsyncResponseReader
+#include <memory> // for unique_ptr
namespace caosdb::transaction {
diff --git a/include/caosdb/transaction_handler.h b/include/caosdb/transaction_handler.h
index 6fa386b..3f9fc81 100644
--- a/include/caosdb/transaction_handler.h
+++ b/include/caosdb/transaction_handler.h
@@ -1,11 +1,11 @@
#pragma once
-#include "caosdb/entity/v1/main.grpc.pb.h" // for FileTransmissionS...
-#include "caosdb/entity/v1/main.pb.h" // for FileDownloadResponse
-#include "caosdb/handler_interface.h" // for HandlerTag
-#include "caosdb/unary_rpc_handler.h" // for HandlerTag, Handl...
-#include <grpcpp/impl/codegen/async_unary_call.h> // for ClientAsyncRespons...
-#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
-#include <memory> // for unique_ptr
+#include "caosdb/entity/v1/main.grpc.pb.h" // for FileTransmissionS...
+#include "caosdb/entity/v1/main.pb.h" // for FileDownloadResponse
+#include "caosdb/handler_interface.h" // for HandlerTag
+#include "caosdb/unary_rpc_handler.h" // for HandlerTag, Handl...
+#include <grpcpp/completion_queue.h> // for CompletionQueue
+#include <grpcpp/support/async_unary_call.h> // for ClientAsyncResponseReader
+#include <memory> // for unique_ptr
namespace caosdb::transaction {
diff --git a/include/caosdb/unary_rpc_handler.h b/include/caosdb/unary_rpc_handler.h
index a505a87..06b9457 100644
--- a/include/caosdb/unary_rpc_handler.h
+++ b/include/caosdb/unary_rpc_handler.h
@@ -49,11 +49,11 @@
#ifndef CAOSDB_UNARY_RPC_HANDLER_H
#define CAOSDB_UNARY_RPC_HANDLER_H
-#include "caosdb/handler_interface.h" // for HandlerTag, Handl...
-#include "caosdb/transaction_status.h" // for TransactionStatus
-#include <grpcpp/impl/codegen/client_context.h> // for ClientContext
-#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
-#include <grpcpp/impl/codegen/status.h> // for Status
+#include "caosdb/handler_interface.h" // for HandlerTag, Handl...
+#include "caosdb/transaction_status.h" // for TransactionStatus
+#include <grpcpp/client_context.h> // for ClientContext
+#include <grpcpp/completion_queue.h> // for CompletionQueue
+#include <grpcpp/support/status.h> // for Status
namespace caosdb::transaction {
diff --git a/src/caosdb/acm/role.cpp b/src/caosdb/acm/role.cpp
index d2761a8..23b919f 100644
--- a/src/caosdb/acm/role.cpp
+++ b/src/caosdb/acm/role.cpp
@@ -23,7 +23,6 @@
#include "caosdb/acm/role_impl.h" // for RoleImpl
#include "caosdb/acm/v1alpha1/main.pb.h" // for ListRolesRequest
#include "caosdb/protobuf_helper.h" // for ProtoMessageWrapper
-#include <type_traits> // for remove_reference<>::type
#include <unordered_set> // for _Node_iterator, operator!=
#include <utility> // for move
// IWYU pragma: no_include "net/proto2/public/repeated_field.h"
@@ -35,7 +34,7 @@ using ProtoRolePermissions = caosdb::acm::v1alpha1::RolePermissions;
using ProtoRoleCapabilities = caosdb::acm::v1alpha1::RoleCapabilities;
using ProtoListRoleItem = caosdb::acm::v1alpha1::ListRoleItem;
-RoleImpl::RoleImpl(std::string name, std::string description) {
+RoleImpl::RoleImpl(const std::string &name, const std::string &description) {
if (!name.empty()) {
this->wrapped->set_name(name);
}
@@ -49,7 +48,7 @@ RoleImpl::RoleImpl(ProtoRole *role) : ScalarProtoMessageWrapper<ProtoRole>(role)
RoleImpl::RoleImpl(ProtoListRoleItem &role_item)
: ScalarProtoMessageWrapper<ProtoRole>(role_item.release_role()) {}
-RoleImpl::RoleImpl(std::string name) : RoleImpl(std::move(name), "") {}
+RoleImpl::RoleImpl(const std::string &name) : RoleImpl(name, "") {}
[[nodiscard]] auto RoleImpl::GeneratePermissionRulesSet() -> std::unique_ptr<PermissionRules> {
auto result = std::make_unique<PermissionRules>();
@@ -61,10 +60,10 @@ RoleImpl::RoleImpl(std::string name) : RoleImpl(std::move(name), "") {}
Role::Role(std::unique_ptr<RoleImpl> wrapped) : wrapped(std::move(wrapped)) {}
-Role::Role(std::string name, std::string description)
- : wrapped(std::make_unique<RoleImpl>(std::move(name), std::move(description))) {}
+Role::Role(const std::string &name, const std::string &description)
+ : wrapped(std::make_unique<RoleImpl>(name, description)) {}
-Role::Role(std::string name) : Role(std::move(name), {""}) {}
+Role::Role(const std::string &name) : Role(name, {""}) {}
Role::Role(const Role &role) : Role(role.GetName(), role.GetDescription()) {}
@@ -78,11 +77,12 @@ auto Role::operator=(const Role &role) -> Role & {
}
Role::~Role() = default;
+
auto Role::GetName() const -> const std::string & { return this->wrapped->wrapped->name(); }
-auto Role::SetName(std::string name) -> void {
+auto Role::SetName(const std::string &name) -> void {
if (!name.empty()) {
- this->wrapped->wrapped->set_name(std::move(name));
+ this->wrapped->wrapped->set_name(name);
} else {
this->wrapped->wrapped->clear_name();
}
@@ -92,9 +92,9 @@ auto Role::GetDescription() const -> const std::string & {
return this->wrapped->wrapped->description();
}
-auto Role::SetDescription(std::string description) -> void {
+auto Role::SetDescription(const std::string &description) -> void {
if (!description.empty()) {
- this->wrapped->wrapped->set_description(std::move(description));
+ this->wrapped->wrapped->set_description(description);
} else {
this->wrapped->wrapped->clear_description();
}
diff --git a/src/caosdb/acm/role_impl.h b/src/caosdb/acm/role_impl.h
index 6f337f3..090de22 100644
--- a/src/caosdb/acm/role_impl.h
+++ b/src/caosdb/acm/role_impl.h
@@ -40,11 +40,11 @@ public:
/**
* Constructor. Instanciate a role with the given name.
*/
- explicit RoleImpl(std::string name);
+ explicit RoleImpl(const std::string &name);
/**
* Constructor. Instanciate a role with the given name and description.
*/
- RoleImpl(std::string name, std::string description);
+ RoleImpl(const std::string &name, const std::string &description);
/**
* Constructor. Instanciate a role from the server's responces.
*/
diff --git a/src/caosdb/file_transmission/register_file_upload_handler.cpp b/src/caosdb/file_transmission/register_file_upload_handler.cpp
index 9460d18..3a47715 100644
--- a/src/caosdb/file_transmission/register_file_upload_handler.cpp
+++ b/src/caosdb/file_transmission/register_file_upload_handler.cpp
@@ -47,9 +47,7 @@
* > DEALINGS IN THE SOFTWARE.
*/
#include "caosdb/file_transmission/register_file_upload_handler.h"
-#include "caosdb/logging.h" // for CAOSDB_LOG_TRACE
-#include <grpcpp/impl/codegen/async_unary_call.h> // for ClientAsyncRes...
-#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
+#include "caosdb/logging.h" // for CAOSDB_LOG_TRACE
namespace caosdb::transaction {
diff --git a/src/caosdb/transaction_handler.cpp b/src/caosdb/transaction_handler.cpp
index cbcbf76..ef4897d 100644
--- a/src/caosdb/transaction_handler.cpp
+++ b/src/caosdb/transaction_handler.cpp
@@ -2,8 +2,6 @@
#include "caosdb/logging.h" // for CAOSDB_LOG_TRACE
#include <exception> // IWYU pragma: keep
// IWYU pragma: no_include <bits/exception.h>
-#include <grpcpp/impl/codegen/async_unary_call.h> // for ClientAsyncRes...
-#include <grpcpp/impl/codegen/completion_queue.h> // for CompletionQueue
namespace caosdb::transaction {
--
GitLab