From 324eb98bb9bd2d95de4fe166e3e317fe5585e3b2 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Mon, 17 Oct 2022 16:22:59 +0200 Subject: [PATCH] WebDriver: Pass endpoint handler function parameters by const reference --- Userland/Services/WebDriver/Client.cpp | 32 ++++++++++++------------ Userland/Services/WebDriver/Client.h | 34 +++++++++++++------------- 2 files changed, 33 insertions(+), 33 deletions(-) diff --git a/Userland/Services/WebDriver/Client.cpp b/Userland/Services/WebDriver/Client.cpp index 8369ba6ea7..f95eb2eda3 100644 --- a/Userland/Services/WebDriver/Client.cpp +++ b/Userland/Services/WebDriver/Client.cpp @@ -228,7 +228,7 @@ void Client::log_response(unsigned code, HTTP::HttpRequest const& request) } // https://w3c.github.io/webdriver/#dfn-match-a-request -ErrorOr Client::match_route(HTTP::HttpRequest::Method method, String resource) +ErrorOr Client::match_route(HTTP::HttpRequest::Method method, String const& resource) { // FIXME: Implement to spec. @@ -317,7 +317,7 @@ JsonValue Client::make_json_value(JsonValue const& value) // 8.1 New Session, https://w3c.github.io/webdriver/#dfn-new-sessions // POST /session -ErrorOr Client::handle_post_session(Vector, JsonValue const&) +ErrorOr Client::handle_post_session(Vector const&, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session"); @@ -381,7 +381,7 @@ ErrorOr Client::handle_post_session(Vector, Js // 8.2 Delete Session, https://w3c.github.io/webdriver/#dfn-delete-session // DELETE /session/{session id} -ErrorOr Client::handle_delete_session(Vector parameters, JsonValue const&) +ErrorOr Client::handle_delete_session(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling DELETE /session/"); @@ -399,7 +399,7 @@ ErrorOr Client::handle_delete_session(Vector p // 8.3 Status, https://w3c.github.io/webdriver/#dfn-status // GET /status -ErrorOr Client::handle_get_status(Vector, JsonValue const&) +ErrorOr Client::handle_get_status(Vector const&, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling GET /status"); @@ -419,7 +419,7 @@ ErrorOr Client::handle_get_status(Vector, Json // 10.1 Navigate To, https://w3c.github.io/webdriver/#dfn-navigate-to // POST /session/{session id}/url -ErrorOr Client::handle_post_url(Vector parameters, JsonValue const& payload) +ErrorOr Client::handle_post_url(Vector const& parameters, JsonValue const& payload) { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//url"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -431,7 +431,7 @@ ErrorOr Client::handle_post_url(Vector paramet // 10.2 Get Current URL, https://w3c.github.io/webdriver/#dfn-get-current-url // GET /session/{session id}/url -ErrorOr Client::handle_get_url(Vector parameters, JsonValue const&) +ErrorOr Client::handle_get_url(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session//url"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -443,7 +443,7 @@ ErrorOr Client::handle_get_url(Vector paramete // 10.3 Back, https://w3c.github.io/webdriver/#dfn-back // POST /session/{session id}/back -ErrorOr Client::handle_back(Vector parameters, JsonValue const&) +ErrorOr Client::handle_back(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//back"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -455,7 +455,7 @@ ErrorOr Client::handle_back(Vector parameters, // 10.4 Forward, https://w3c.github.io/webdriver/#dfn-forward // POST /session/{session id}/forward -ErrorOr Client::handle_forward(Vector parameters, JsonValue const&) +ErrorOr Client::handle_forward(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//forward"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -467,7 +467,7 @@ ErrorOr Client::handle_forward(Vector paramete // 10.5 Refresh, https://w3c.github.io/webdriver/#dfn-refresh // POST /session/{session id}/refresh -ErrorOr Client::handle_refresh(Vector parameters, JsonValue const&) +ErrorOr Client::handle_refresh(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//refresh"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -479,7 +479,7 @@ ErrorOr Client::handle_refresh(Vector paramete // 10.6 Get Title, https://w3c.github.io/webdriver/#dfn-get-title // GET /session/{session id}/title -ErrorOr Client::handle_get_title(Vector parameters, JsonValue const&) +ErrorOr Client::handle_get_title(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session//title"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -492,7 +492,7 @@ ErrorOr Client::handle_get_title(Vector parame // 11.2 Close Window, https://w3c.github.io/webdriver/#dfn-close-window // DELETE /session/{session id}/window -ErrorOr Client::handle_delete_window(Vector parameters, JsonValue const&) +ErrorOr Client::handle_delete_window(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling DELETE /session//window"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -505,7 +505,7 @@ ErrorOr Client::handle_delete_window(Vector pa // 14.1 Get All Cookies, https://w3c.github.io/webdriver/#dfn-get-all-cookies // GET /session/{session id}/cookie -ErrorOr Client::handle_get_all_cookies(Vector parameters, JsonValue const&) +ErrorOr Client::handle_get_all_cookies(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session//cookie"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -518,7 +518,7 @@ ErrorOr Client::handle_get_all_cookies(Vector // 14.2 Get Named Cookie, https://w3c.github.io/webdriver/#dfn-get-named-cookie // GET /session/{session id}/cookie/{name} -ErrorOr Client::handle_get_named_cookie(Vector parameters, JsonValue const&) +ErrorOr Client::handle_get_named_cookie(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session//cookie/"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -531,7 +531,7 @@ ErrorOr Client::handle_get_named_cookie(Vector // 14.3 Add Cookie, https://w3c.github.io/webdriver/#dfn-adding-a-cookie // POST /session/{session id}/cookie -ErrorOr Client::handle_add_cookie(Vector parameters, JsonValue const& payload) +ErrorOr Client::handle_add_cookie(Vector const& parameters, JsonValue const& payload) { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//cookie"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -543,7 +543,7 @@ ErrorOr Client::handle_add_cookie(Vector param // 14.4 Delete Cookie, https://w3c.github.io/webdriver/#dfn-delete-cookie // DELETE /session/{session id}/cookie/{name} -ErrorOr Client::handle_delete_cookie(Vector parameters, JsonValue const&) +ErrorOr Client::handle_delete_cookie(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling DELETE /session//cookie/"); Session* session = TRY(find_session_with_id(parameters[0])); @@ -555,7 +555,7 @@ ErrorOr Client::handle_delete_cookie(Vector pa // 14.5 Delete All Cookies, https://w3c.github.io/webdriver/#dfn-delete-all-cookies // DELETE /session/{session id}/cookie -ErrorOr Client::handle_delete_all_cookies(Vector parameters, JsonValue const&) +ErrorOr Client::handle_delete_all_cookies(Vector const& parameters, JsonValue const&) { dbgln_if(WEBDRIVER_DEBUG, "Handling DELETE /session//cookie"); Session* session = TRY(find_session_with_id(parameters[0])); diff --git a/Userland/Services/WebDriver/Client.h b/Userland/Services/WebDriver/Client.h index 8ee1b257c5..765396cd30 100644 --- a/Userland/Services/WebDriver/Client.h +++ b/Userland/Services/WebDriver/Client.h @@ -33,7 +33,7 @@ private: void die(); void log_response(unsigned code, HTTP::HttpRequest const&); - using RouteHandler = ErrorOr (Client::*)(Vector, JsonValue const&); + using RouteHandler = ErrorOr (Client::*)(Vector const&, JsonValue const&); struct Route { HTTP::HttpRequest::Method method; Vector path; @@ -45,22 +45,22 @@ private: Vector parameters; }; - ErrorOr match_route(HTTP::HttpRequest::Method method, String resource); - ErrorOr handle_post_session(Vector, JsonValue const& payload); - ErrorOr handle_delete_session(Vector, JsonValue const& payload); - ErrorOr handle_get_status(Vector, JsonValue const& payload); - ErrorOr handle_post_url(Vector, JsonValue const& payload); - ErrorOr handle_get_url(Vector, JsonValue const& payload); - ErrorOr handle_back(Vector, JsonValue const& payload); - ErrorOr handle_forward(Vector, JsonValue const& payload); - ErrorOr handle_refresh(Vector, JsonValue const& payload); - ErrorOr handle_get_title(Vector, JsonValue const& payload); - ErrorOr handle_delete_window(Vector, JsonValue const& payload); - ErrorOr handle_get_all_cookies(Vector, JsonValue const& payload); - ErrorOr handle_get_named_cookie(Vector, JsonValue const& payload); - ErrorOr handle_add_cookie(Vector, JsonValue const& payload); - ErrorOr handle_delete_cookie(Vector, JsonValue const& payload); - ErrorOr handle_delete_all_cookies(Vector, JsonValue const& payload); + ErrorOr match_route(HTTP::HttpRequest::Method method, String const& resource); + ErrorOr handle_post_session(Vector const&, JsonValue const& payload); + ErrorOr handle_delete_session(Vector const&, JsonValue const& payload); + ErrorOr handle_get_status(Vector const&, JsonValue const& payload); + ErrorOr handle_post_url(Vector const&, JsonValue const& payload); + ErrorOr handle_get_url(Vector const&, JsonValue const& payload); + ErrorOr handle_back(Vector const&, JsonValue const& payload); + ErrorOr handle_forward(Vector const&, JsonValue const& payload); + ErrorOr handle_refresh(Vector const&, JsonValue const& payload); + ErrorOr handle_get_title(Vector const&, JsonValue const& payload); + ErrorOr handle_delete_window(Vector const&, JsonValue const& payload); + ErrorOr handle_get_all_cookies(Vector const&, JsonValue const& payload); + ErrorOr handle_get_named_cookie(Vector const&, JsonValue const& payload); + ErrorOr handle_add_cookie(Vector const&, JsonValue const& payload); + ErrorOr handle_delete_cookie(Vector const&, JsonValue const& payload); + ErrorOr handle_delete_all_cookies(Vector const&, JsonValue const& payload); ErrorOr find_session_with_id(StringView session_id); JsonValue make_json_value(JsonValue const&);