From 0f1ffd97b21e7644eed808400e9944fc28ef8050 Mon Sep 17 00:00:00 2001 From: Julian Mundhahs Date: Fri, 7 Feb 2025 18:07:05 +0100 Subject: [PATCH] more sonarcloud --- src/engine/Server.cpp | 6 +++--- src/engine/Server.h | 3 ++- src/util/http/UrlParser.h | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/engine/Server.cpp b/src/engine/Server.cpp index 969e73aeb3..afb15ac841 100644 --- a/src/engine/Server.cpp +++ b/src/engine/Server.cpp @@ -915,7 +915,8 @@ Awaitable Server::processUpdate( // ____________________________________________________________________________ Awaitable 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(&operation)) { @@ -941,8 +942,7 @@ Awaitable Server::processOperation( // of an error has been broken for some time std::optional plannedQuery; try { - co_return co_await std::visit(visitor, - std::forward(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 index 08d583a00e..9383d50c0d 100644 --- 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 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 processQuery( diff --git a/src/util/http/UrlParser.h b/src/util/http/UrlParser.h index 45b05e4334..0ca24127b7 100644 --- 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; } // namespace sparqlOperation // Representation of parsed HTTP request. @@ -78,9 +80,7 @@ struct ParsedRequest { std::string path_; std::optional accessToken_; ParamValueMap parameters_; - std::variant - operation_; + sparqlOperation::Operation operation_; }; // Parse the URL path and the URL query parameters of an HTTP Request target.