Fix code consistency for experimental -enablePassThrough config option

Author: mach6

java/server/src/org/openqa/grid/common/defaults/DefaultStandalone.json

@@ -3,5 +3,6 @@
   "role": "standalone",
   "debug": false,
   "browserTimeout": 0,
-  "timeout": 1800
+  "timeout": 1800,
+  "enablePassThrough": false
 }

java/server/src/org/openqa/grid/internal/utils/configuration/StandaloneConfiguration.java

@@ -71,6 +71,7 @@ public class StandaloneConfiguration {
   @VisibleForTesting
   static final Boolean DEFAULT_DEBUG_TOGGLE = false;
 
+
   /*
    * config parameters which do not serialize or deserialize to/from json
    */
@@ -200,12 +201,16 @@ public class StandaloneConfiguration {
   )
   public Integer timeout = DEFAULT_TIMEOUT;
 
+  /**
+   * Whether or not to use experimental passthrough mode on a hub or a standalone
+   */
   @Expose
   @Parameter(
       names = "-enablePassThrough",
       description = "<Boolean>: Whether or not to use the experimental passthrough mode. Defaults to false."
   )
-  public boolean newHandler = false;
+  // initially defaults to false from boolean primitive type
+  public boolean enablePassThrough;
 
 
   /**
@@ -255,7 +260,8 @@ public void merge(StandaloneConfiguration other) {
     if (isMergeAble(other.timeout, timeout)) {
       timeout = other.timeout;
     }
-    // role, port, log, debug, version, and help are not merged, they are only consumed by the immediately running node and can't affect a remote
+    // role, port, log, debug, version, enablePassThrough, and help are not merged, they are only consumed by the
+    // immediately running process and should never affect a remote
   }
 
   /**
@@ -306,6 +312,7 @@ public String toString(String format) {
     sb.append(toString(format, "port", port));
     sb.append(toString(format, "role", role));
     sb.append(toString(format, "timeout", timeout));
+    sb.append(toString(format, "enablePassThrough", enablePassThrough));
     return sb.toString();
   }
 

java/server/src/org/openqa/grid/web/Hub.java

@@ -104,7 +104,7 @@ private void addDefaultServlets(ServletContextHandler handler) {
     // add mandatory default servlets
     handler.addServlet(RegistrationServlet.class.getName(), "/grid/register/*");
 
-    if (config.newHandler) {
+    if (config.enablePassThrough) {
       log.info("Using the experimental passthrough mode");
       handler.addServlet(DriverServlet.class.getName(), "/wd/hub/*");
       handler.addServlet(DriverServlet.class.getName(), "/selenium-server/driver/*");

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

@@ -128,7 +128,7 @@ public void boot() {
         new SystemClock());
     handler.setAttribute(DriverServlet.SESSIONS_KEY, driverSessions);
     handler.setContextPath("/");
-    if (configuration.newHandler) {
+    if (configuration.enablePassThrough) {
       LOG.info("Using the experimental passthrough mode handler");
       handler.addServlet(WebDriverServlet.class, "/wd/hub/*");
       handler.addServlet(WebDriverServlet.class, "/webdriver/*");

java/server/test/org/openqa/grid/internal/utils/configuration/GridNodeConfigurationTest.java

@@ -186,7 +186,7 @@ public void testAsJson() {
                  + "\"port\":5555,"
                  + "\"role\":\"node\","
                  + "\"timeout\":1800,"
-                 + "\"newHandler\":false}", gnc.toJson().toString());
+                 + "\"enablePassThrough\":false}", gnc.toJson().toString());
   }
 
   @Test