Wrap all the commands with a w3c handler to format exceptions

SeleniumHQ · Oct 16, 2018 · 27c5cc0 · 27c5cc0
1 parent 7a03253
commit 27c5cc0
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/java/server/src/org/openqa/selenium/grid/commands/Standalone.java b/java/server/src/org/openqa/selenium/grid/commands/Standalone.java
@@ -39,6 +39,7 @@
 import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.server.HelpFlags;
 import org.openqa.selenium.grid.server.Server;
+import org.openqa.selenium.grid.server.W3CCommandHandler;
 import org.openqa.selenium.grid.sessionmap.SessionMap;
 import org.openqa.selenium.grid.sessionmap.local.LocalSessionMap;
 import org.openqa.selenium.net.NetworkUtils;
@@ -118,7 +119,7 @@ public Executable configure(String... args) {
       distributor.add(node.build());
 
       Server<?> server = new BaseServer<>(new BaseServerOptions(config));
-      server.addHandler(router, (inj, req) -> router);
+      server.addHandler(router, (inj, req) -> new W3CCommandHandler(router));
       server.start();
     };
   }

diff --git a/java/server/src/org/openqa/selenium/grid/distributor/httpd/DistributorServer.java b/java/server/src/org/openqa/selenium/grid/distributor/httpd/DistributorServer.java
@@ -35,6 +35,7 @@
 import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.server.HelpFlags;
 import org.openqa.selenium.grid.server.Server;
+import org.openqa.selenium.grid.server.W3CCommandHandler;
 
 @AutoService(CliCommand.class)
 public class DistributorServer implements CliCommand {
@@ -85,7 +86,7 @@ public Executable configure(String... args) {
       BaseServerOptions serverOptions = new BaseServerOptions(config);
 
       Server<?> server = new BaseServer<>(serverOptions);
-      server.addHandler(distributor, (inj, req) -> distributor);
+      server.addHandler(distributor, (inj, req) -> new W3CCommandHandler(distributor));
       server.start();
     };
   }

diff --git a/java/server/src/org/openqa/selenium/grid/node/httpd/NodeServer.java b/java/server/src/org/openqa/selenium/grid/node/httpd/NodeServer.java
@@ -38,6 +38,7 @@
 import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.server.HelpFlags;
 import org.openqa.selenium.grid.server.Server;
+import org.openqa.selenium.grid.server.W3CCommandHandler;
 import org.openqa.selenium.grid.sessionmap.SessionMap;
 import org.openqa.selenium.grid.sessionmap.SessionMapOptions;
 import org.openqa.selenium.grid.sessionmap.remote.RemoteSessionMap;
@@ -109,11 +110,10 @@ public Executable configure(String... args) {
           HttpClient.Factory.createDefault().createClient(distributorUrl));
 
       Server<?> server = new BaseServer<>(serverOptions);
-      server.addHandler(node, (inj, req) -> node);
+      server.addHandler(node, (inj, req) -> new W3CCommandHandler(node));
       server.start();
 
       distributor.add(node);
-      System.out.println("Added node");
     };
   }
 }
diff --git a/java/server/src/org/openqa/selenium/grid/router/httpd/RouterServer.java b/java/server/src/org/openqa/selenium/grid/router/httpd/RouterServer.java
@@ -39,6 +39,7 @@
 import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.server.HelpFlags;
 import org.openqa.selenium.grid.server.Server;
+import org.openqa.selenium.grid.server.W3CCommandHandler;
 import org.openqa.selenium.grid.sessionmap.SessionMap;
 import org.openqa.selenium.grid.sessionmap.SessionMapOptions;
 import org.openqa.selenium.grid.sessionmap.remote.RemoteSessionMap;
@@ -108,7 +109,7 @@ public Executable configure(String... args) {
       Router router = new Router(sessions, distributor);
 
       Server<?> server = new BaseServer<>(serverOptions);
-      server.addHandler(router, (inj, req) -> router);
+      server.addHandler(router, (inj, req) -> new W3CCommandHandler(router));
       server.start();
     };
   }

diff --git a/java/server/src/org/openqa/selenium/grid/sessionmap/httpd/SessionMapServer.java b/java/server/src/org/openqa/selenium/grid/sessionmap/httpd/SessionMapServer.java
@@ -33,6 +33,7 @@
 import org.openqa.selenium.grid.server.BaseServerOptions;
 import org.openqa.selenium.grid.server.HelpFlags;
 import org.openqa.selenium.grid.server.Server;
+import org.openqa.selenium.grid.server.W3CCommandHandler;
 import org.openqa.selenium.grid.sessionmap.SessionMap;
 import org.openqa.selenium.grid.sessionmap.local.LocalSessionMap;
 
@@ -85,7 +86,7 @@ public Executable configure(String... args) {
       BaseServerOptions serverOptions = new BaseServerOptions(config);
 
       Server<?> server = new BaseServer<>(serverOptions);
-      server.addHandler(sessions, (inj, req) -> sessions);
+      server.addHandler(sessions, (inj, req) -> new W3CCommandHandler(sessions));
       server.start();
     };
   }