Remove the enablePassThrough flag

SeleniumHQ · Jan 19, 2018 · 7bbf8c5 · 7bbf8c5
1 parent a731205
commit 7bbf8c5
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 22 deletions.
diff --git a/java/server/src/org/openqa/grid/internal/utils/configuration/StandaloneConfiguration.java b/java/server/src/org/openqa/grid/internal/utils/configuration/StandaloneConfiguration.java
@@ -41,7 +41,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.function.Function;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -133,10 +132,8 @@ public class StandaloneConfiguration {
     hidden = true,
     description = "Displays this help."
   )
-  /**
-   * Whether help or usage() is requested. Default {@code false}.
-   */
-  // initially defaults to false from boolean primitive type
+
+  // Initially defaults to false from boolean primitive type
   public boolean help;
 
   /*
@@ -213,19 +210,6 @@ 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",
-      arity = 1,
-      hidden = true,
-      description = "<Boolean> (deprecated): Always true, and value is ignored."
-  )
-  public boolean enablePassThrough = true;
-
-
   /**
    * Creates a new configuration using the default values.
    */
@@ -257,7 +241,6 @@ public static StandaloneConfiguration loadFromJSON(JsonObject json) {
 
   /**
    * copy another configuration's values into this one if they are set.
-   * @param other
    */
   public void merge(StandaloneConfiguration other) {
     if (other == null) {
@@ -325,7 +308,6 @@ 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();
   }
 
@@ -354,7 +336,6 @@ public StringBuilder toString(String format, String name, Object value) {
 
   /**
    * Return a JsonElement representation of the configuration. Does not serialize nulls.
-   * @return
    */
   public JsonElement toJson() {
     GsonBuilder builder = new GsonBuilder();

diff --git a/java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java b/java/server/src/org/openqa/selenium/remote/server/SeleniumServer.java
@@ -144,7 +144,6 @@ public boolean boot() {
     handler.setAttribute(NEW_SESSION_PIPELINE_KEY, pipeline);
 
     handler.setContextPath("/");
-    LOG.info("Using passthrough mode handler");
     handler.addServlet(WebDriverServlet.class, "/wd/hub/*");
     handler.addServlet(WebDriverServlet.class, "/webdriver/*");
     handler.setInitParameter(ConsoleServlet.CONSOLE_PATH_PARAMETER, "/wd/hub");