Every command handler returns ResultType.SUCCESS and those handlers that

return an actual value do so through a level of indirection. This commit
changes command handlers to just return results directly to the caller,
making it possible to delete a lot of unnecessary code.

Author: jleyba

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

@@ -122,20 +122,10 @@
 import org.openqa.selenium.remote.server.handler.interactions.touch.Scroll;
 import org.openqa.selenium.remote.server.handler.interactions.touch.SingleTapOnElement;
 import org.openqa.selenium.remote.server.handler.interactions.touch.Up;
-import org.openqa.selenium.remote.server.renderer.EmptyResult;
-import org.openqa.selenium.remote.server.renderer.ForwardResult;
-import org.openqa.selenium.remote.server.renderer.JsonErrorExceptionResult;
-import org.openqa.selenium.remote.server.renderer.JsonResult;
-import org.openqa.selenium.remote.server.renderer.RedirectResult;
-import org.openqa.selenium.remote.server.rest.Renderer;
 import org.openqa.selenium.remote.server.rest.RestishHandler;
-import org.openqa.selenium.remote.server.rest.Result;
 import org.openqa.selenium.remote.server.rest.ResultConfig;
-import org.openqa.selenium.remote.server.rest.ResultType;
 import org.openqa.selenium.remote.server.rest.UrlMapper;
-import org.openqa.selenium.remote.server.xdrpc.CrossDomainRpcRenderer;
 
-import java.util.EnumSet;
 import java.util.logging.Logger;
 
 public class JsonHttpRemoteConfig {
@@ -152,16 +142,18 @@ public JsonHttpRemoteConfig(DriverSessions sessions, Logger log) {
     setUpMappings(sessions, log);
   }
 
-  public void addNewGetMapping(String path, Class<? extends RestishHandler> implementationClass) {
+  public void addNewGetMapping(
+      String path, Class<? extends RestishHandler<?>> implementationClass) {
     getMapper.bind(path, implementationClass);
   }
 
-  public void addNewPostMapping(String path, Class<? extends RestishHandler> implementationClass) {
+  public void addNewPostMapping(
+      String path, Class<? extends RestishHandler<?>> implementationClass) {
     postMapper.bind(path, implementationClass);
   }
 
   public void addNewDeleteMapping(
-      String path, Class<? extends RestishHandler> implementationClass) {
+      String path, Class<? extends RestishHandler<?>> implementationClass) {
     deleteMapper.bind(path, implementationClass);
   }
 
@@ -204,12 +196,9 @@ private UrlMapper getUrlMapper(String method) {
   }
 
   private void setUpMappings(DriverSessions driverSessions, Logger logger) {
-    Renderer successRenderer = new JsonResult(RESPONSE);
-    Renderer errorRenderer = new JsonErrorExceptionResult(EXCEPTION, RESPONSE);
-
-    getMapper = new UrlMapper(driverSessions, logger, successRenderer, errorRenderer);
-    postMapper = new UrlMapper(driverSessions, logger, successRenderer, errorRenderer);
-    deleteMapper = new UrlMapper(driverSessions, logger, successRenderer, errorRenderer);
+    getMapper = new UrlMapper(driverSessions, logger);
+    postMapper = new UrlMapper(driverSessions, logger);
+    deleteMapper = new UrlMapper(driverSessions, logger);
 
     postMapper.bind("/config/drivers", AddConfig.class);
 
@@ -313,7 +302,8 @@ private void setUpMappings(DriverSessions driverSessions, Logger logger) {
     getMapper.bind("/session/:sessionId/local_storage/size", GetLocalStorageSize.class);
 
     getMapper.bind("/session/:sessionId/session_storage/key/:key", GetSessionStorageItem.class);
-    deleteMapper.bind("/session/:sessionId/session_storage/key/:key", RemoveSessionStorageItem.class);
+    deleteMapper.bind("/session/:sessionId/session_storage/key/:key",
+                      RemoveSessionStorageItem.class);
     getMapper.bind("/session/:sessionId/session_storage", GetSessionStorageKeys.class);
     postMapper.bind("/session/:sessionId/session_storage", SetSessionStorageItem.class);
     deleteMapper.bind("/session/:sessionId/session_storage", ClearSessionStorage.class);

java/server/src/org/openqa/selenium/remote/server/build.desc

@@ -90,8 +90,6 @@ java_library(name = "server_very_core",
     "DefaultSession.java",
     "SessionCleaner.java",
     "SnapshotScreenListener.java",
-    "renderer/*.java",
-    "xdrpc/CrossDomainRpcRenderer.java",
   ],
   deps = [
     ":http-api",

java/server/src/org/openqa/selenium/remote/server/handler/AcceptAlert.java

@@ -16,19 +16,16 @@
 
 package org.openqa.selenium.remote.server.handler;
 
-import static org.openqa.selenium.remote.server.rest.ResultType.SUCCESS;
-
 import org.openqa.selenium.remote.server.Session;
-import org.openqa.selenium.remote.server.rest.ResultType;
 
-public class AcceptAlert extends WebDriverHandler {
+public class AcceptAlert extends WebDriverHandler<Void> {
   public AcceptAlert(Session session) {
     super(session);
   }
 
-  public ResultType call() throws Exception {
+  public Void call() throws Exception {
     getDriver().switchTo().alert().accept();
-    return SUCCESS;
+    return null;
   }
 
   @Override

java/server/src/org/openqa/selenium/remote/server/handler/AddConfig.java

@@ -16,19 +16,16 @@
 
 package org.openqa.selenium.remote.server.handler;
 
-import static org.openqa.selenium.remote.server.rest.ResultType.SUCCESS;
-
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.server.DriverSessions;
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.rest.RestishHandler;
-import org.openqa.selenium.remote.server.rest.ResultType;
 
 import java.util.Map;
 
-public class AddConfig implements RestishHandler, JsonParametersAware {
+public class AddConfig implements RestishHandler<Void>, JsonParametersAware {
   private final DriverSessions allSessions;
   private volatile Capabilities desiredCapabilities;
   private volatile String className;
@@ -38,18 +35,20 @@ public AddConfig(DriverSessions allSessions) {
   }
 
   @SuppressWarnings("unchecked")
+  @Override
   public void setJsonParameters(Map<String, Object> allParameters) throws Exception {
     Map<String, Object> capabilitiesMap = (Map<String, Object>) allParameters.get("capabilities");
     desiredCapabilities = new DesiredCapabilities(capabilitiesMap);
     className = (String) allParameters.get("class");
   }
 
-  public ResultType handle() throws Exception {
+  @Override
+  public Void handle() throws Exception {
     // We'll let errors bubble up
     Class<? extends WebDriver> clazz = Class.forName(className).asSubclass(WebDriver.class);
 
     allSessions.registerDriver(desiredCapabilities, clazz);
 
-    return SUCCESS;
+    return null;
   }
 }

java/server/src/org/openqa/selenium/remote/server/handler/AddCookie.java

@@ -22,26 +22,26 @@
 import org.openqa.selenium.Cookie;
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.Session;
-import org.openqa.selenium.remote.server.rest.ResultType;
 
 import java.util.Date;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
-public class AddCookie extends WebDriverHandler implements JsonParametersAware {
+public class AddCookie extends WebDriverHandler<Void> implements JsonParametersAware {
 
   private volatile Map<String, Object> rawCookie;
 
   public AddCookie(Session session) {
     super(session);
   }
 
-  public ResultType call() throws Exception {
+  @Override
+  public Void call() throws Exception {
     Cookie cookie = createCookie();
 
     getDriver().manage().addCookie(cookie);
 
-    return ResultType.SUCCESS;
+    return null;
   }
 
   @SuppressWarnings({"unchecked"})

java/server/src/org/openqa/selenium/remote/server/handler/CaptureScreenshot.java

@@ -21,19 +21,18 @@
 import org.openqa.selenium.TakesScreenshot;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.server.Session;
-import org.openqa.selenium.remote.server.rest.ResultType;
 
-public class CaptureScreenshot extends ResponseAwareWebDriverHandler {
+public class CaptureScreenshot extends WebDriverHandler<String> {
 
   public CaptureScreenshot(Session session) {
     super(session);
   }
 
-  public ResultType call() throws Exception {
+  @Override
+  public String call() throws Exception {
     WebDriver driver = getUnwrappedDriver();
 
-    response.setValue(((TakesScreenshot) driver).getScreenshotAs(BASE64));
-    return ResultType.SUCCESS;
+    return ((TakesScreenshot) driver).getScreenshotAs(BASE64);
   }
 
   @Override

java/server/src/org/openqa/selenium/remote/server/handler/ChangeUrl.java

@@ -18,26 +18,27 @@
 
 import org.openqa.selenium.remote.server.JsonParametersAware;
 import org.openqa.selenium.remote.server.Session;
-import org.openqa.selenium.remote.server.rest.ResultType;
 
 import java.util.Map;
 
-public class ChangeUrl extends WebDriverHandler implements JsonParametersAware {
+public class ChangeUrl extends WebDriverHandler<Void> implements JsonParametersAware {
 
   private volatile String url;
 
   public ChangeUrl(Session session) {
     super(session);
   }
 
+  @Override
   public void setJsonParameters(Map<String, Object> allParameters) throws Exception {
     url = (String) allParameters.get("url");
   }
 
-  public ResultType call() throws Exception {
+  @Override
+  public Void call() throws Exception {
     getDriver().get(url);
 
-    return ResultType.SUCCESS;
+    return null;
   }
 
   @Override

java/server/src/org/openqa/selenium/remote/server/handler/ClearElement.java

@@ -17,9 +17,8 @@
 package org.openqa.selenium.remote.server.handler;
 
 import org.openqa.selenium.remote.server.Session;
-import org.openqa.selenium.remote.server.rest.ResultType;
 
-public class ClearElement extends WebDriverHandler {
+public class ClearElement extends WebDriverHandler<Void> {
 
   private volatile String elementId;
 
@@ -31,10 +30,10 @@ public void setId(String elementId) {
     this.elementId = elementId;
   }
 
-  public ResultType call() throws Exception {
+  @Override
+  public Void call() throws Exception {
     getKnownElements().get(elementId).clear();
-
-    return ResultType.SUCCESS;
+    return null;
   }
 
   @Override

java/server/src/org/openqa/selenium/remote/server/handler/ClickElement.java

@@ -17,17 +17,17 @@
 package org.openqa.selenium.remote.server.handler;
 
 import org.openqa.selenium.remote.server.Session;
-import org.openqa.selenium.remote.server.rest.ResultType;
 
-public class ClickElement extends WebElementHandler {
+public class ClickElement extends WebElementHandler<Void> {
 
   public ClickElement(Session session) {
     super(session);
   }
 
-  public ResultType call() throws Exception {
+  @Override
+  public Void call() throws Exception {
     getElement().click();
-    return ResultType.SUCCESS;
+    return null;
   }
 
   @Override

java/server/src/org/openqa/selenium/remote/server/handler/CloseWindow.java

@@ -19,19 +19,18 @@
 
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.remote.server.Session;
-import org.openqa.selenium.remote.server.rest.ResultType;
 
-public class CloseWindow extends WebDriverHandler {
+public class CloseWindow extends WebDriverHandler<Void> {
 
   public CloseWindow(Session session) {
     super(session);
   }
 
-  public ResultType call() throws Exception {
+  @Override
+  public Void call() throws Exception {
     WebDriver driver = getDriver();
     driver.close();
-
-    return ResultType.SUCCESS;
+    return null;
   }
 
   @Override