Allow commands to be aliased in the CommandCodec

Rather than just relying on the URL being the same, make the
fact that some commands are aliases of another clear.

Author: shs96c

java/client/src/org/openqa/selenium/remote/CommandCodec.java

@@ -50,4 +50,11 @@ public interface CommandCodec<T> {
    * Enhance this command codec with additional commands.
    */
   void defineCommand(String name, HttpMethod method, String pathPattern);
+
+  /**
+   * Allow commands to have aliases.
+   * @param commandName The command being added.
+   * @param isAnAliasFor The command name that this is an alias for.
+   */
+  void alias(String commandName, String isAnAliasFor);
 }

java/client/src/org/openqa/selenium/remote/http/AbstractHttpCommandCodec.java

@@ -151,6 +151,7 @@ public abstract class AbstractHttpCommandCodec implements CommandCodec<HttpReque
   private static final String SESSION_ID_PARAM = "sessionId";
 
   private final BiMap<String, CommandSpec> nameToSpec = HashBiMap.create();
+  private final Map<String, String> aliases = new HashMap<>();
   private final BeanToJsonConverter beanToJsonConverter = new BeanToJsonConverter();
   private final JsonToBeanConverter jsonToBeanConverter = new JsonToBeanConverter();
 
@@ -277,12 +278,13 @@ public AbstractHttpCommandCodec() {
 
   @Override
   public HttpRequest encode(Command command) {
-    CommandSpec spec = nameToSpec.get(command.getName());
+    String name = aliases.getOrDefault(command.getName(), command.getName());
+    CommandSpec spec = nameToSpec.get(name);
     if (spec == null) {
       throw new UnsupportedCommandException(command.getName());
     }
     Map<String, ?> parameters = amendParameters(command.getName(), command.getParameters());
-    String uri = buildUri(command.getName(), command.getSessionId(), parameters, spec);
+    String uri = buildUri(name, command.getSessionId(), parameters, spec);
 
     HttpRequest request = new HttpRequest(spec.method, uri);
 
@@ -357,6 +359,11 @@ public void defineCommand(String name, HttpMethod method, String pathPattern) {
     defineCommand(name, new CommandSpec(method, pathPattern));
   }
 
+  @Override
+  public void alias(String commandName, String isAnAliasFor) {
+    aliases.put(commandName, isAnAliasFor);
+  }
+
   protected void defineCommand(String name, CommandSpec spec) {
     checkNotNull(name, "null name");
     nameToSpec.put(name, spec);

java/client/src/org/openqa/selenium/remote/http/W3CHttpCommandCodec.java

@@ -61,18 +61,18 @@
 public class W3CHttpCommandCodec extends AbstractHttpCommandCodec {
 
   public W3CHttpCommandCodec() {
-    defineCommand(GET_ELEMENT_ATTRIBUTE, post("/session/:sessionId/execute/sync"));
-    defineCommand(GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW, post("/session/:sessionId/execute/sync"));
-    defineCommand(SUBMIT_ELEMENT, post("/session/:sessionId/execute/sync"));
+    alias(GET_ELEMENT_ATTRIBUTE, EXECUTE_SCRIPT);
+    alias(GET_ELEMENT_LOCATION_ONCE_SCROLLED_INTO_VIEW, EXECUTE_SCRIPT);
+    alias(SUBMIT_ELEMENT, EXECUTE_SCRIPT);
 
     defineCommand(EXECUTE_SCRIPT, post("/session/:sessionId/execute/sync"));
     defineCommand(EXECUTE_ASYNC_SCRIPT, post("/session/:sessionId/execute/async"));
 
-    defineCommand(GET_PAGE_SOURCE, post("/session/:sessionId/execute/sync"));
+    alias(GET_PAGE_SOURCE, EXECUTE_SCRIPT);
 
     defineCommand(MAXIMIZE_CURRENT_WINDOW, post("/session/:sessionId/window/maximize"));
-    defineCommand(GET_CURRENT_WINDOW_POSITION, get("/session/:sessionId/execute/sync"));
-    defineCommand(SET_CURRENT_WINDOW_POSITION, post("/session/:sessionId/execute/sync"));
+    alias(GET_CURRENT_WINDOW_POSITION, EXECUTE_SCRIPT);
+    alias(SET_CURRENT_WINDOW_POSITION, EXECUTE_SCRIPT);
     defineCommand(GET_CURRENT_WINDOW_SIZE, get("/session/:sessionId/window/size"));
     defineCommand(SET_CURRENT_WINDOW_SIZE, post("/session/:sessionId/window/size"));
     defineCommand(GET_CURRENT_WINDOW_HANDLE, get("/session/:sessionId/window"));