more sonarcloud

ad-freiburg · Feb 7, 2025 · 0f1ffd9 · 0f1ffd9
1 parent be519ce
commit 0f1ffd9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/src/engine/Server.cpp b/src/engine/Server.cpp
@@ -915,7 +915,8 @@ Awaitable<void> Server::processUpdate(
 
 // ____________________________________________________________________________
 Awaitable<void> Server::processOperation(
-    auto&& operation, auto visitor, const ad_utility::Timer& requestTimer,
+    ad_utility::url_parser::sparqlOperation::Operation operation, auto visitor,
+    const ad_utility::Timer& requestTimer,
     const ad_utility::httpUtils::HttpRequest auto& request, auto& send) {
   auto operationString = [&operation] {
     if (auto* q = std::get_if<Query>(&operation)) {
@@ -941,8 +942,7 @@ Awaitable<void> Server::processOperation(
   // of an error has been broken for some time
   std::optional<PlannedQuery> plannedQuery;
   try {
-    co_return co_await std::visit(visitor,
-                                  std::forward<decltype(operation)>(operation));
+    co_return co_await std::visit(visitor, std::move(operation));
   } catch (const ParseException& e) {
     responseStatus = http::status::bad_request;
     exceptionErrorMsg = e.errorMessageWithoutPositionalInfo();

diff --git a/src/engine/Server.h b/src/engine/Server.h
@@ -127,7 +127,8 @@ class Server {
   // Wraps the error handling around the processing of operations. Calls the
   // visitor on the given operation.
   Awaitable<void> processOperation(
-      auto&& operation, auto visitor, const ad_utility::Timer& requestTimer,
+      ad_utility::url_parser::sparqlOperation::Operation operation,
+      auto visitor, const ad_utility::Timer& requestTimer,
       const ad_utility::httpUtils::HttpRequest auto& request, auto& send);
   // Do the actual execution of a query.
   Awaitable<void> processQuery(

diff --git a/src/util/http/UrlParser.h b/src/util/http/UrlParser.h
@@ -67,6 +67,8 @@ struct Update {
 struct None {
   bool operator==(const None& rhs) const = default;
 };
+
+using Operation = std::variant<Query, Update, None>;
 }  // namespace sparqlOperation
 
 // Representation of parsed HTTP request.
@@ -78,9 +80,7 @@ struct ParsedRequest {
   std::string path_;
   std::optional<std::string> accessToken_;
   ParamValueMap parameters_;
-  std::variant<sparqlOperation::Query, sparqlOperation::Update,
-               sparqlOperation::None>
-      operation_;
+  sparqlOperation::Operation operation_;
 };
 
 // Parse the URL path and the URL query parameters of an HTTP Request target.