Handle both JSON and W3C end points on the server

We do this by iterating over all known command codecs when
decoding a request's URL.

Author: shs96c

java/server/src/org/openqa/selenium/remote/server/JsonHttpCommandHandler.java

@@ -22,12 +22,15 @@
 
 import org.openqa.selenium.UnsupportedCommandException;
 import org.openqa.selenium.remote.Command;
+import org.openqa.selenium.remote.CommandCodec;
 import org.openqa.selenium.remote.ErrorCodes;
 import org.openqa.selenium.remote.Response;
+import org.openqa.selenium.remote.ResponseCodec;
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.http.JsonHttpCommandCodec;
 import org.openqa.selenium.remote.http.JsonHttpResponseCodec;
+import org.openqa.selenium.remote.http.W3CHttpCommandCodec;
 import org.openqa.selenium.remote.server.handler.AcceptAlert;
 import org.openqa.selenium.remote.server.handler.AddConfig;
 import org.openqa.selenium.remote.server.handler.AddCookie;
@@ -136,7 +139,9 @@
 import org.openqa.selenium.remote.server.rest.ResultConfig;
 
 import java.util.LinkedHashMap;
+import java.util.LinkedHashSet;
 import java.util.Map;
+import java.util.Set;
 import java.util.logging.Logger;
 
 public class JsonHttpCommandHandler {
@@ -145,15 +150,17 @@ public class JsonHttpCommandHandler {
 
   private final DriverSessions sessions;
   private final Logger log;
-  private final JsonHttpCommandCodec commandCodec;
-  private final JsonHttpResponseCodec responseCodec;
+  private final Set<CommandCodec<HttpRequest>> commandCodecs;
+  private final ResponseCodec<HttpResponse> responseCodec;
   private final Map<String, ResultConfig> configs = new LinkedHashMap<>();
   private final ErrorCodes errorCodes = new ErrorCodes();
 
   public JsonHttpCommandHandler(DriverSessions sessions, Logger log) {
     this.sessions = sessions;
     this.log = log;
-    this.commandCodec = new JsonHttpCommandCodec();
+    this.commandCodecs = new LinkedHashSet<>();
+    this.commandCodecs.add(new JsonHttpCommandCodec());
+    this.commandCodecs.add(new W3CHttpCommandCodec());
     this.responseCodec = new JsonHttpResponseCodec();
     setUpMappings();
   }
@@ -170,7 +177,7 @@ public HttpResponse handleRequest(HttpRequest request) {
     Command command = null;
     Response response;
     try {
-      command = commandCodec.decode(request);
+      command = decode(request);
       ResultConfig config = configs.get(command.getName());
       if (config == null) {
         throw new UnsupportedCommandException();
@@ -191,8 +198,26 @@ public HttpResponse handleRequest(HttpRequest request) {
     return responseCodec.encode(response);
   }
 
+  private Command decode(HttpRequest request) {
+    UnsupportedCommandException lastException = null;
+    for (CommandCodec<HttpRequest> codec : commandCodecs) {
+      try {
+        return codec.decode(request);
+      } catch (UnsupportedCommandException e) {
+        lastException = e;
+      }
+    }
+    if (lastException != null) {
+      throw lastException;
+    }
+    throw new UnsupportedOperationException("Cannot find command for: " + request.getUri());
+  }
+
   private void setUpMappings() {
-    commandCodec.defineCommand(ADD_CONFIG_COMMAND_NAME, POST, "/config/drivers");
+    for (CommandCodec<HttpRequest> codec : commandCodecs) {
+      codec.defineCommand(ADD_CONFIG_COMMAND_NAME, POST, "/config/drivers");
+    }
+
     addNewMapping(ADD_CONFIG_COMMAND_NAME, AddConfig.class);
 
     addNewMapping(STATUS, Status.class);
@@ -328,17 +353,8 @@ private void setUpMappings() {
     addNewMapping(SET_NETWORK_CONNECTION, SetNetworkConnection.class);
 
     // Deprecated end points. Will be removed.
-    addNewMapping("getCurrentWindowHandleW3C", GetCurrentWindowHandle.class);
-    addNewMapping("getWindowHandlesW3C", GetAllWindowHandles.class);
-
-    addNewMapping("dimissAlertW3C", DismissAlert.class);
-    addNewMapping("acceptAlertW3C", AcceptAlert.class);
-    addNewMapping("getAlertTextW3C", GetAlertText.class);
-    addNewMapping("setAlertValueW3C", SetAlertText.class);
-    addNewMapping("executeScriptW3C", ExecuteScript.class);
-    addNewMapping("executeAsyncScriptW3C", ExecuteAsyncScript.class);
     addNewMapping("getWindowSize", GetWindowSize.class);
     addNewMapping("setWindowSize", SetWindowSize.class);
     addNewMapping("maximizeWindow", MaximizeWindow.class);
-    }
+  }
 }