Inject the NewSessionPipeline far higher

Author: shs96c

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

@@ -52,11 +52,13 @@
 class AllHandlers {
 
   private final Json json;
+  private final NewSessionPipeline pipeline;
   private final ActiveSessions allSessions;
 
   private final Map<HttpMethod, ImmutableList<Function<String, CommandHandler>>> additionalHandlers;
 
-  public AllHandlers(ActiveSessions allSessions) {
+  public AllHandlers(NewSessionPipeline pipeline, ActiveSessions allSessions) {
+    this.pipeline = pipeline;
     this.allSessions = Objects.requireNonNull(allSessions);
     this.json = new Json();
 
@@ -119,6 +121,7 @@ private <H extends CommandHandler> Function<String, CommandHandler> handler(
       }
 
       ImmutableSet.Builder<Object> args = ImmutableSet.builder();
+      args.add(pipeline);
       args.add(allSessions);
       args.add(json);
       if (match.getParameters().containsKey("sessionId")) {

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

@@ -34,17 +34,20 @@
 import org.openqa.selenium.remote.server.log.PerSessionLogHandler;
 import org.openqa.selenium.remote.server.xdrpc.CrossDomainRpc;
 import org.openqa.selenium.remote.server.xdrpc.CrossDomainRpcLoader;
+import org.openqa.selenium.remote.service.DriverService;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.List;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Handler;
 import java.util.logging.Logger;
+import java.util.stream.Stream;
 
 import javax.servlet.ServletException;
 import javax.servlet.ServletInputStream;
@@ -57,6 +60,7 @@ public class WebDriverServlet extends HttpServlet {
 
   private static final Logger LOG = Logger.getLogger(WebDriverServlet.class.getName());
   public static final String ACTIVE_SESSIONS_KEY = WebDriverServlet.class.getName() + ".sessions";
+  public static final String NEW_SESSION_PIPELINE_KEY = WebDriverServlet.class.getName() + ".pipeline";
 
   private static final String CROSS_DOMAIN_RPC_PATH = "/xdrpc";
 
@@ -81,7 +85,42 @@ public void init() throws ServletException {
       getServletContext().setAttribute(ACTIVE_SESSIONS_KEY, allSessions);
     }
 
-    handlers = new AllHandlers(allSessions);
+    NewSessionPipeline pipeline =
+        (NewSessionPipeline) getServletContext().getAttribute(NEW_SESSION_PIPELINE_KEY);
+    if (pipeline == null) {
+      // Set up the pipeline to inject
+      SessionFactory fallback = Stream.of(
+          "org.openqa.selenium.chrome.ChromeDriverService",
+          "org.openqa.selenium.firefox.GeckoDriverService",
+          "org.openqa.selenium.edge.EdgeDriverService",
+          "org.openqa.selenium.ie.InternetExplorerDriverService",
+          "org.openqa.selenium.safari.SafariDriverService")
+          .filter(name -> {
+            try {
+              Class.forName(name).asSubclass(DriverService.class);
+              return true;
+            } catch (ReflectiveOperationException e) {
+              return false;
+            }
+          })
+          .findFirst()
+          .map(serviceName -> {
+            SessionFactory factory = new ServicedSession.Factory(serviceName);
+            return (SessionFactory) (dialects, caps) -> {
+              LOG.info("Using default factory: " + serviceName);
+              return factory.apply(dialects, caps);
+            };
+          })
+          .orElse((dialects, caps) -> Optional.empty());
+
+      pipeline = NewSessionPipeline.builder()
+          .add(new ActiveSessionFactory())
+          .fallback(fallback)
+          .create();
+      getServletContext().setAttribute(NEW_SESSION_PIPELINE_KEY, pipeline);
+    }
+
+    handlers = new AllHandlers(pipeline, allSessions);
   }
 
   private synchronized Logger configureLogging() {

java/server/src/org/openqa/selenium/remote/server/commandhandler/BeginSession.java

@@ -31,23 +31,17 @@
 import org.openqa.selenium.remote.http.HttpRequest;
 import org.openqa.selenium.remote.http.HttpResponse;
 import org.openqa.selenium.remote.server.ActiveSession;
-import org.openqa.selenium.remote.server.ActiveSessionFactory;
 import org.openqa.selenium.remote.server.ActiveSessions;
 import org.openqa.selenium.remote.server.CommandHandler;
 import org.openqa.selenium.remote.server.NewSessionPayload;
 import org.openqa.selenium.remote.server.NewSessionPipeline;
-import org.openqa.selenium.remote.server.ServicedSession;
-import org.openqa.selenium.remote.server.SessionFactory;
 import org.openqa.selenium.remote.server.log.LoggingManager;
-import org.openqa.selenium.remote.service.DriverService;
 
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.Reader;
-import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.stream.Stream;
 
 public class BeginSession implements CommandHandler {
 
@@ -57,38 +51,10 @@ public class BeginSession implements CommandHandler {
   private final ActiveSessions allSessions;
   private final Json json;
 
-  public BeginSession(ActiveSessions allSessions, Json json) {
-    this.json = json;
-
-    SessionFactory fallback = Stream.of(
-        "org.openqa.selenium.chrome.ChromeDriverService",
-        "org.openqa.selenium.firefox.GeckoDriverService",
-        "org.openqa.selenium.edge.EdgeDriverService",
-        "org.openqa.selenium.ie.InternetExplorerDriverService",
-        "org.openqa.selenium.safari.SafariDriverService")
-        .filter(name -> {
-          try {
-            Class.forName(name).asSubclass(DriverService.class);
-            return true;
-          } catch (ReflectiveOperationException e) {
-            return false;
-          }
-        })
-        .findFirst()
-        .map(serviceName -> {
-          SessionFactory factory = new ServicedSession.Factory(serviceName);
-          return (SessionFactory) (dialects, caps) -> {
-            LOG.info("Using default factory: " + serviceName);
-            return factory.apply(dialects, caps);
-          };
-        })
-        .orElse((dialects, caps) -> Optional.empty());
-
+  public BeginSession(NewSessionPipeline pipeline, ActiveSessions allSessions, Json json) {
+    this.pipeline = pipeline;
     this.allSessions = allSessions;
-    this.pipeline = NewSessionPipeline.builder()
-        .add(new ActiveSessionFactory())
-        .fallback(fallback)
-        .create();
+    this.json = json;
   }
 
   @Override

java/server/test/org/openqa/selenium/remote/server/AllHandlersTest.java

@@ -34,7 +34,9 @@
 import java.util.concurrent.TimeUnit;
 
 public class AllHandlersTest {
-  private AllHandlers allHandlers = new AllHandlers(new ActiveSessions(120, SECONDS));
+  private AllHandlers allHandlers = new AllHandlers(
+      NewSessionPipeline.builder().add(new ActiveSessionFactory()).create(),
+      new ActiveSessions(120, SECONDS));
 
   static class NoArgs implements CommandHandler {
     @Override