[grid] Removing event bus role from session queue

diemol · diemol · commit 4b19fa416be0 · 2022-08-30T09:13:23.000+02:00
It is not using the bus since a few releases ago
diff --git a/java/src/org/openqa/selenium/grid/sessionqueue/httpd/DefaultNewSessionQueueConfig.java b/java/src/org/openqa/selenium/grid/sessionqueue/httpd/DefaultNewSessionQueueConfig.java
@@ -25,9 +25,6 @@ class DefaultNewSessionQueueConfig extends MapConfig {
 
   DefaultNewSessionQueueConfig() {
     super(ImmutableMap.of(
-        "events", ImmutableMap.of(
-            "publish", "tcp://*:4442",
-            "subscribe", "tcp://*:4443"),
         "server", ImmutableMap.of(
             "port", 5559)));
   }
diff --git a/java/src/org/openqa/selenium/grid/sessionqueue/httpd/NewSessionQueueServer.java b/java/src/org/openqa/selenium/grid/sessionqueue/httpd/NewSessionQueueServer.java
@@ -38,7 +38,6 @@
 import java.util.logging.Logger;
 
 import static java.net.HttpURLConnection.HTTP_NO_CONTENT;
-import static org.openqa.selenium.grid.config.StandardGridRoles.EVENT_BUS_ROLE;
 import static org.openqa.selenium.grid.config.StandardGridRoles.HTTPD_ROLE;
 import static org.openqa.selenium.grid.config.StandardGridRoles.SESSION_QUEUE_ROLE;
 import static org.openqa.selenium.json.Json.JSON_UTF_8;
@@ -49,7 +48,7 @@
 public class NewSessionQueueServer extends TemplateGridServerCommand {
 
   private static final Logger LOG = Logger.getLogger(NewSessionQueueServer.class.getName());
-  private static final String LOCAL_NEWSESSION_QUEUE =
+  private static final String LOCAL_NEW_SESSION_QUEUE =
     "org.openqa.selenium.grid.sessionqueue.local.LocalNewSessionQueue";
 
   @Override
@@ -64,7 +63,7 @@ public String getDescription() {
 
   @Override
   public Set<Role> getConfigurableRoles() {
-    return ImmutableSet.of(EVENT_BUS_ROLE, HTTPD_ROLE, SESSION_QUEUE_ROLE, SESSION_QUEUE_ROLE);
+    return ImmutableSet.of(HTTPD_ROLE, SESSION_QUEUE_ROLE);
   }
 
   @Override
@@ -86,7 +85,7 @@ protected Config getDefaultConfig() {
   protected Handlers createHandlers(Config config) {
     NewSessionQueueOptions queueOptions = new NewSessionQueueOptions(config);
 
-    NewSessionQueue sessionQueue = queueOptions.getSessionQueue(LOCAL_NEWSESSION_QUEUE);
+    NewSessionQueue sessionQueue = queueOptions.getSessionQueue(LOCAL_NEW_SESSION_QUEUE);
 
     return new Handlers(
       Route.combine(

Original file line number	Diff line number	Diff line change
`@@ -25,9 +25,6 @@ class DefaultNewSessionQueueConfig extends MapConfig {`
`25`	`25`
`26`	`26`	`DefaultNewSessionQueueConfig() {`
`27`	`27`	`super(ImmutableMap.of(`
`28`		`- "events", ImmutableMap.of(`
`29`		`- "publish", "tcp://*:4442",`
`30`		`- "subscribe", "tcp://*:4443"),`
`31`	`28`	`"server", ImmutableMap.of(`
`32`	`29`	`"port", 5559)));`
`33`	`30`	`}`