[grid] Unifying hub parameter name.

So it is the same one on the cli and
when used in the toml config. This
makes documenting it easier, and also
easier to understand for users.

Author: diemol

java/src/org/openqa/selenium/events/zeromq/ZeroMqEventBus.java

@@ -17,6 +17,8 @@
 
 package org.openqa.selenium.events.zeromq;
 
+import static org.openqa.selenium.events.zeromq.UnboundZmqEventBus.REJECTED_EVENT;
+
 import org.openqa.selenium.events.EventBus;
 import org.openqa.selenium.events.EventListener;
 import org.openqa.selenium.events.EventName;
@@ -33,8 +35,6 @@
 import java.net.URISyntaxException;
 import java.util.function.Consumer;
 
-import static org.openqa.selenium.events.zeromq.UnboundZmqEventBus.REJECTED_EVENT;
-
 /**
  * An {@link EventBus} backed by ZeroMQ.
  */
@@ -56,7 +56,7 @@ public static EventBus create(ZContext context, String publish, String subscribe
   public static EventBus create(Config config) {
     String publish = config.get(EVENTS_SECTION, "publish")
       .orElseGet(() -> {
-        URI uri = config.get("node", "hub-address")
+        URI uri = config.get("node", "hub")
           .map(Urls::from)
           .orElseThrow(() -> new IllegalArgumentException(
             "Unable to find address to publish events to."));
@@ -65,7 +65,7 @@ public static EventBus create(Config config) {
 
     String subscribe = config.get(EVENTS_SECTION, "subscribe")
       .orElseGet(() -> {
-        URI uri = config.get("node", "hub-address")
+        URI uri = config.get("node", "hub")
           .map(Urls::from)
           .orElseThrow(() -> new IllegalArgumentException(
             "Unable to find address to subscribe for events from."));
@@ -109,14 +109,6 @@ public static class RejectedEvent {
       this.data = data;
     }
 
-    public EventName getName() {
-      return name;
-    }
-
-    public Object getData() {
-      return data;
-    }
-
     private static RejectedEvent fromJson(JsonInput input) {
       EventName name = null;
       Object data = null;
@@ -141,5 +133,13 @@ private static RejectedEvent fromJson(JsonInput input) {
 
       return new RejectedEvent(name, data);
     }
+
+    public EventName getName() {
+      return name;
+    }
+
+    public Object getData() {
+      return data;
+    }
   }
 }

java/src/org/openqa/selenium/grid/node/config/NodeFlags.java

@@ -113,14 +113,15 @@ public class NodeFlags implements HasRoles {
   @Parameter(
     names = {"--hub"},
     description = "The address of the Hub in a Hub-and-Node configuration. This can " +
-      "be a plain hostname or IP address (`hostname`), in which case the Hub will be " +
-      "assumed to be `http://hostname:4444`, the `--grid-url` will be the same, " +
-      "`--publish-events` will be `tcp://hostname:4442` and `--subscribe-events` will " +
-      "be `tcp://hostname:4443`. If `hostname` contains a port number, that will be used " +
-      "for `--grid-url` but the URIs for the event bus will remain the same. Any of these " +
-      "default values may be overridden but setting the correct flags. If the hostname has " +
-      "a protocol (such as `https`) that will be used too.")
-  @ConfigValue(section = NODE_SECTION, name = "hub-address", example = "hub.grid.example.com")
+                  "be a plain hostname or IP address (`hostname`), in which case the Hub will be " +
+                  "assumed to be `http://hostname:4444`, the `--grid-url` will be the same, " +
+                  "`--publish-events` will be `tcp://hostname:4442` and `--subscribe-events` " +
+                  "will be `tcp://hostname:4443`. If `hostname` contains a port number, that " +
+                  "will be used for `--grid-url` but the URIs for the event bus will remain " +
+                  "the same. Any of these default values may be overridden but setting the " +
+                  "correct flags. If the hostname has  a protocol (such as `https`) that will " +
+                  "be used too.")
+  @ConfigValue(section = NODE_SECTION, name = "hub", example = "hub.grid.example.com")
   public String hub;
 
   @Parameter(

java/src/org/openqa/selenium/grid/node/config/NodeOptions.java

@@ -102,7 +102,7 @@ public Optional<URI> getPublicGridUri() {
       return gridUri;
     }
 
-    Optional<String> hubAddress = config.get(NODE_SECTION, "hub-address");
+    Optional<String> hubAddress = config.get(NODE_SECTION, "hub");
     if (!hubAddress.isPresent()) {
       return Optional.empty();
     }

java/src/org/openqa/selenium/grid/node/httpd/DefaultNodeConfig.java

@@ -29,7 +29,7 @@ class DefaultNodeConfig extends MapConfig {
         // We use this instead of setting the default ports for
         // the publish and subscribe ports of the event bus so
         // that people can use the `--hub` flag safely.
-        "hub-address", "http://0.0.0.0:4444"
+        "hub", "http://0.0.0.0:4444"
       ),
       "server", ImmutableMap.of(
         "port", 5555)));

java/test/org/openqa/selenium/grid/node/config/NodeOptionsTest.java

@@ -463,12 +463,13 @@ public void canOverrideMaxSessionsWithFlag() {
   public void settingTheHubFlagSetsTheGridUrlAndEventBusFlags() {
     String[] rawConfig = new String[]{
       "[node]",
-      "hub-address = \"cheese.com\"",
-    };
+      "hub = \"cheese.com\"",
+      };
     Config config = new TomlConfig(new StringReader(String.join("\n", rawConfig)));
 
     NodeOptions nodeOptions = new NodeOptions(config);
-    assertThat(nodeOptions.getPublicGridUri()).isEqualTo(Optional.of(URI.create("http://cheese.com:4444")));
+    assertThat(nodeOptions.getPublicGridUri())
+      .isEqualTo(Optional.of(URI.create("http://cheese.com:4444")));
   }
 
   private Condition<? super List<? extends Capabilities>> supporting(String name) {