Merge remote-tracking branch 'origin/trunk' into grid-ui-delete-session

Author: VietND96

java/src/org/openqa/selenium/grid/commands/Hub.java

@@ -31,7 +31,6 @@
 import java.net.MalformedURLException;
 import java.net.URL;
 import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -49,8 +48,6 @@
 import org.openqa.selenium.grid.log.LoggingOptions;
 import org.openqa.selenium.grid.router.ProxyWebsocketsIntoGrid;
 import org.openqa.selenium.grid.router.Router;
-import org.openqa.selenium.grid.router.httpd.BlockedRoute;
-import org.openqa.selenium.grid.router.httpd.BlockedRoutesFilter;
 import org.openqa.selenium.grid.router.httpd.RouterOptions;
 import org.openqa.selenium.grid.security.BasicAuthenticationFilter;
 import org.openqa.selenium.grid.security.Secret;
@@ -210,13 +207,6 @@ protected Handlers createHandlers(Config config) {
       httpHandler = httpHandler.with(new BasicAuthenticationFilter(uap.username(), uap.password()));
     }
 
-    // Apply blocked routes filter
-    List<BlockedRoute> blockedRoutes = routerOptions.getBlockedRoutes();
-    if (!blockedRoutes.isEmpty()) {
-      LOG.info("Blocking " + blockedRoutes.size() + " route(s): " + blockedRoutes);
-      httpHandler = BlockedRoutesFilter.with(httpHandler, blockedRoutes);
-    }
-
     // Allow the liveness endpoint to be reached, since k8s doesn't make it easy to authenticate
     // these checks
     httpHandler = combine(httpHandler, Route.get("/readyz").to(() -> readinessCheck));

java/src/org/openqa/selenium/grid/commands/Standalone.java

@@ -32,7 +32,6 @@
 import java.net.URI;
 import java.net.URL;
 import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -54,8 +53,6 @@
 import org.openqa.selenium.grid.node.ProxyNodeWebsockets;
 import org.openqa.selenium.grid.node.config.NodeOptions;
 import org.openqa.selenium.grid.router.Router;
-import org.openqa.selenium.grid.router.httpd.BlockedRoute;
-import org.openqa.selenium.grid.router.httpd.BlockedRoutesFilter;
 import org.openqa.selenium.grid.router.httpd.RouterOptions;
 import org.openqa.selenium.grid.security.BasicAuthenticationFilter;
 import org.openqa.selenium.grid.security.Secret;
@@ -216,13 +213,6 @@ protected Handlers createHandlers(Config config) {
       httpHandler = httpHandler.with(new BasicAuthenticationFilter(uap.username(), uap.password()));
     }
 
-    // Apply blocked routes filter
-    List<BlockedRoute> blockedRoutes = routerOptions.getBlockedRoutes();
-    if (!blockedRoutes.isEmpty()) {
-      LOG.info("Blocking " + blockedRoutes.size() + " route(s): " + blockedRoutes);
-      httpHandler = BlockedRoutesFilter.with(httpHandler, blockedRoutes);
-    }
-
     // Allow the liveness endpoint to be reached, since k8s doesn't make it easy to authenticate
     // these checks
     httpHandler = combine(httpHandler, Route.get("/readyz").to(() -> readinessCheck));