Skip to content

[java] Refactor DriverCommand and W3CHttpCommandCodec for improved readability #16013

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: trunk
Choose a base branch
from
+0 −84
Open

[java] Refactor DriverCommand and W3CHttpCommandCodec for improved readability #16013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions java/src/org/openqa/selenium/remote/DriverCommand.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,18 +106,6 @@ public interface DriverCommand {
String SET_SCRIPT_TIMEOUT = "setScriptTimeout";
String GET_LOCATION = "getLocation";
String SET_LOCATION = "setLocation";
String GET_LOCAL_STORAGE_ITEM = "getLocalStorageItem";
String GET_LOCAL_STORAGE_KEYS = "getLocalStorageKeys";
String SET_LOCAL_STORAGE_ITEM = "setLocalStorageItem";
String REMOVE_LOCAL_STORAGE_ITEM = "removeLocalStorageItem";
String CLEAR_LOCAL_STORAGE = "clearLocalStorage";
String GET_LOCAL_STORAGE_SIZE = "getLocalStorageSize";
String GET_SESSION_STORAGE_ITEM = "getSessionStorageItem";
String GET_SESSION_STORAGE_KEYS = "getSessionStorageKey";
String SET_SESSION_STORAGE_ITEM = "setSessionStorageItem";
String REMOVE_SESSION_STORAGE_ITEM = "removeSessionStorageItem";
String CLEAR_SESSION_STORAGE = "clearSessionStorage";
String GET_SESSION_STORAGE_SIZE = "getSessionStorageSize";
// W3C Actions APIs
String ACTIONS = "actions";
String CLEAR_ACTIONS_STATE = "clearActionState";
Expand Down
72 changes: 0 additions & 72 deletions java/src/org/openqa/selenium/remote/codec/w3c/W3CHttpCommandCodec.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@
import static org.openqa.selenium.remote.DriverCommand.ACCEPT_ALERT;
import static org.openqa.selenium.remote.DriverCommand.ACTIONS;
import static org.openqa.selenium.remote.DriverCommand.CLEAR_ACTIONS_STATE;
import static org.openqa.selenium.remote.DriverCommand.CLEAR_LOCAL_STORAGE;
import static org.openqa.selenium.remote.DriverCommand.CLEAR_SESSION_STORAGE;
import static org.openqa.selenium.remote.DriverCommand.DISMISS_ALERT;
import static org.openqa.selenium.remote.DriverCommand.EXECUTE_ASYNC_SCRIPT;
import static org.openqa.selenium.remote.DriverCommand.EXECUTE_SCRIPT;
Expand All @@ -47,27 +45,17 @@
import static org.openqa.selenium.remote.DriverCommand.GET_ELEMENT_RECT;
import static org.openqa.selenium.remote.DriverCommand.GET_ELEMENT_SHADOW_ROOT;
import static org.openqa.selenium.remote.DriverCommand.GET_ELEMENT_SIZE;
import static org.openqa.selenium.remote.DriverCommand.GET_LOCAL_STORAGE_ITEM;
import static org.openqa.selenium.remote.DriverCommand.GET_LOCAL_STORAGE_KEYS;
import static org.openqa.selenium.remote.DriverCommand.GET_LOCAL_STORAGE_SIZE;
import static org.openqa.selenium.remote.DriverCommand.GET_LOG;
import static org.openqa.selenium.remote.DriverCommand.GET_PAGE_SOURCE;
import static org.openqa.selenium.remote.DriverCommand.GET_SESSION_STORAGE_ITEM;
import static org.openqa.selenium.remote.DriverCommand.GET_SESSION_STORAGE_KEYS;
import static org.openqa.selenium.remote.DriverCommand.GET_SESSION_STORAGE_SIZE;
import static org.openqa.selenium.remote.DriverCommand.GET_WINDOW_HANDLES;
import static org.openqa.selenium.remote.DriverCommand.IS_ELEMENT_DISPLAYED;
import static org.openqa.selenium.remote.DriverCommand.MAXIMIZE_CURRENT_WINDOW;
import static org.openqa.selenium.remote.DriverCommand.MINIMIZE_CURRENT_WINDOW;
import static org.openqa.selenium.remote.DriverCommand.PRINT_PAGE;
import static org.openqa.selenium.remote.DriverCommand.REMOVE_LOCAL_STORAGE_ITEM;
import static org.openqa.selenium.remote.DriverCommand.REMOVE_SESSION_STORAGE_ITEM;
import static org.openqa.selenium.remote.DriverCommand.SEND_KEYS_TO_ELEMENT;
import static org.openqa.selenium.remote.DriverCommand.SET_ALERT_VALUE;
import static org.openqa.selenium.remote.DriverCommand.SET_CURRENT_WINDOW_POSITION;
import static org.openqa.selenium.remote.DriverCommand.SET_CURRENT_WINDOW_SIZE;
import static org.openqa.selenium.remote.DriverCommand.SET_LOCAL_STORAGE_ITEM;
import static org.openqa.selenium.remote.DriverCommand.SET_SESSION_STORAGE_ITEM;
import static org.openqa.selenium.remote.DriverCommand.SET_TIMEOUT;
import static org.openqa.selenium.remote.DriverCommand.SUBMIT_ELEMENT;
import static org.openqa.selenium.remote.DriverCommand.UPLOAD_FILE;
Expand Down Expand Up @@ -117,18 +105,6 @@ public W3CHttpCommandCodec() {
defineCommand(EXECUTE_ASYNC_SCRIPT, post(sessionId + "/execute/async"));

alias(GET_PAGE_SOURCE, EXECUTE_SCRIPT);
alias(CLEAR_LOCAL_STORAGE, EXECUTE_SCRIPT);
alias(GET_LOCAL_STORAGE_KEYS, EXECUTE_SCRIPT);
alias(SET_LOCAL_STORAGE_ITEM, EXECUTE_SCRIPT);
alias(REMOVE_LOCAL_STORAGE_ITEM, EXECUTE_SCRIPT);
alias(GET_LOCAL_STORAGE_ITEM, EXECUTE_SCRIPT);
alias(GET_LOCAL_STORAGE_SIZE, EXECUTE_SCRIPT);
alias(CLEAR_SESSION_STORAGE, EXECUTE_SCRIPT);
alias(GET_SESSION_STORAGE_KEYS, EXECUTE_SCRIPT);
alias(SET_SESSION_STORAGE_ITEM, EXECUTE_SCRIPT);
alias(REMOVE_SESSION_STORAGE_ITEM, EXECUTE_SCRIPT);
alias(GET_SESSION_STORAGE_ITEM, EXECUTE_SCRIPT);
alias(GET_SESSION_STORAGE_SIZE, EXECUTE_SCRIPT);

String window = sessionId + "/window";
defineCommand(MAXIMIZE_CURRENT_WINDOW, post(window + "/maximize"));
Expand Down Expand Up @@ -218,54 +194,6 @@ public W3CHttpCommandCodec() {
+ "if (!source) { source = new XMLSerializer().serializeToString(document); }\n"
+ "return source;");

case CLEAR_LOCAL_STORAGE:
return toScript("localStorage.clear()");

case GET_LOCAL_STORAGE_KEYS:
return toScript("return Object.keys(localStorage)");

case SET_LOCAL_STORAGE_ITEM:
return toScript(
"localStorage.setItem(arguments[0], arguments[1])",
parameters.get("key"),
parameters.get("value"));

case REMOVE_LOCAL_STORAGE_ITEM:
return toScript(
"var item = localStorage.getItem(arguments[0]); localStorage.removeItem(arguments[0]);"
+ " return item",
parameters.get("key"));

case GET_LOCAL_STORAGE_ITEM:
return toScript("return localStorage.getItem(arguments[0])", parameters.get("key"));

case GET_LOCAL_STORAGE_SIZE:
return toScript("return localStorage.length");

case CLEAR_SESSION_STORAGE:
return toScript("sessionStorage.clear()");

case GET_SESSION_STORAGE_KEYS:
return toScript("return Object.keys(sessionStorage)");

case SET_SESSION_STORAGE_ITEM:
return toScript(
"sessionStorage.setItem(arguments[0], arguments[1])",
parameters.get("key"),
parameters.get("value"));

case REMOVE_SESSION_STORAGE_ITEM:
return toScript(
"var item = sessionStorage.getItem(arguments[0]);"
+ " sessionStorage.removeItem(arguments[0]); return item",
parameters.get("key"));

case GET_SESSION_STORAGE_ITEM:
return toScript("return sessionStorage.getItem(arguments[0])", parameters.get("key"));

case GET_SESSION_STORAGE_SIZE:
return toScript("return sessionStorage.length");

case IS_ELEMENT_DISPLAYED:
return executeAtom("isDisplayed.js", asElement(parameters.get("id")));

Expand Down