From 6eecdb6853ef8eb881e5431d857c5d9c71a9b881 Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Wed, 19 Oct 2022 19:41:34 +0200 Subject: [PATCH] WebDriver: Condense Client handler functions a bit These comments really aren't necessary, it's clear from the code that they forward to Session for the actual implementation. --- Userland/Services/WebDriver/Client.cpp | 49 -------------------------- 1 file changed, 49 deletions(-) diff --git a/Userland/Services/WebDriver/Client.cpp b/Userland/Services/WebDriver/Client.cpp index 92314bcfd8..ebd813c62e 100644 --- a/Userland/Services/WebDriver/Client.cpp +++ b/Userland/Services/WebDriver/Client.cpp @@ -435,8 +435,6 @@ ErrorOr Client::handle_get_timeouts(Vector { dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session//timeouts"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::get_timeouts(). auto result = session->get_timeouts(); return make_json_value(result); } @@ -447,8 +445,6 @@ ErrorOr Client::handle_set_timeouts(Vector { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//timeouts"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::set_timeouts(). auto result = TRY(session->set_timeouts(payload)); return make_json_value(result); } @@ -459,8 +455,6 @@ ErrorOr Client::handle_navigate_to(Vector cons { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//url"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::navigate_to(). auto result = TRY(session->navigate_to(payload)); return make_json_value(result); } @@ -471,8 +465,6 @@ ErrorOr Client::handle_get_current_url(Vector { dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session//url"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::get_current_url(). auto result = TRY(session->get_current_url()); return make_json_value(result); } @@ -483,8 +475,6 @@ ErrorOr Client::handle_back(Vector const& para { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//back"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::back(). auto result = TRY(session->back()); return make_json_value(result); } @@ -495,8 +485,6 @@ ErrorOr Client::handle_forward(Vector const& p { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//forward"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::forward(). auto result = TRY(session->forward()); return make_json_value(result); } @@ -507,8 +495,6 @@ ErrorOr Client::handle_refresh(Vector const& p { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//refresh"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::refresh(). auto result = TRY(session->refresh()); return make_json_value(result); } @@ -519,10 +505,7 @@ ErrorOr Client::handle_get_title(Vector const& { dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session//title"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::get_title(). auto result = TRY(session->get_title()); - return make_json_value(result); } @@ -532,8 +515,6 @@ ErrorOr Client::handle_get_window_handle(Vector/window"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::get_title(). auto result = TRY(session->get_window_handle()); return make_json_value(result); } @@ -544,10 +525,7 @@ ErrorOr Client::handle_close_window(Vector con { dbgln_if(WEBDRIVER_DEBUG, "Handling DELETE /session//window"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::close_window(). TRY(unwrap_result(session->close_window())); - return make_json_value(JsonValue()); } @@ -557,10 +535,7 @@ ErrorOr Client::handle_find_element(Vector con { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//element"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::find_element(). auto result = TRY(session->find_element(payload)); - return make_json_value(result); } @@ -570,10 +545,7 @@ ErrorOr Client::handle_find_elements(Vector co { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//elements"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::find_elements(). auto result = TRY(session->find_elements(payload)); - return make_json_value(result); } @@ -583,10 +555,7 @@ ErrorOr Client::handle_find_element_from_element(Vector/element//element"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::find_element_from_element(). auto result = TRY(session->find_element_from_element(payload, parameters[1])); - return make_json_value(result); } @@ -596,10 +565,7 @@ ErrorOr Client::handle_find_elements_from_element(Vector/element//elements"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::find_elements_from_element(). auto result = TRY(session->find_elements_from_element(payload, parameters[1])); - return make_json_value(result); } @@ -609,10 +575,7 @@ ErrorOr Client::handle_get_element_attribute(Vector/element//attribute/"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::get_element_attribute(). auto result = TRY(session->get_element_attribute(payload, parameters[1], parameters[2])); - return make_json_value(result); } @@ -622,10 +585,7 @@ ErrorOr Client::handle_get_all_cookies(Vector { dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session//cookie"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::get_all_cookies(). auto cookies = TRY(session->get_all_cookies()); - return make_json_value(cookies); } @@ -635,10 +595,7 @@ ErrorOr Client::handle_get_named_cookie(Vector { dbgln_if(WEBDRIVER_DEBUG, "Handling GET /session//cookie/"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::get_all_cookies(). auto cookies = TRY(session->get_named_cookie(parameters[1])); - return make_json_value(cookies); } @@ -648,8 +605,6 @@ ErrorOr Client::handle_add_cookie(Vector const { dbgln_if(WEBDRIVER_DEBUG, "Handling POST /session//cookie"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::add_cookie(). auto result = TRY(session->add_cookie(payload)); return make_json_value(result); } @@ -660,8 +615,6 @@ ErrorOr Client::handle_delete_cookie(Vector co { dbgln_if(WEBDRIVER_DEBUG, "Handling DELETE /session//cookie/"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::delete_cookie(). auto result = TRY(session->delete_cookie(parameters[1])); return make_json_value(result); } @@ -672,8 +625,6 @@ ErrorOr Client::handle_delete_all_cookies(Vector/cookie"); auto* session = TRY(find_session_with_id(parameters[0])); - - // NOTE: Spec steps handled in Session::delete_all_cookies(). auto result = TRY(session->delete_all_cookies()); return make_json_value(result); }