[grid] More configuration tweaks

SeleniumHQ · Aug 8, 2018 · a6d4cde · a6d4cde
1 parent 8193e98
commit a6d4cde
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/java/server/src/org/openqa/grid/internal/utils/configuration/GridNodeConfiguration.java b/java/server/src/org/openqa/grid/internal/utils/configuration/GridNodeConfiguration.java
@@ -20,6 +20,7 @@
 import static java.util.Optional.ofNullable;
 
 import com.google.common.annotations.VisibleForTesting;
+import com.google.common.collect.ImmutableList;
 
 import org.openqa.grid.common.RegistrationRequest;
 import org.openqa.grid.common.SeleniumProtocol;
@@ -34,6 +35,7 @@
 
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -166,7 +168,7 @@ public GridNodeConfiguration() {
   public GridNodeConfiguration(NodeJsonConfiguration jsonConfig) {
     super(jsonConfig);
     role = ROLE;
-    capabilities = jsonConfig.getCapabilities();
+    ofNullable(jsonConfig.getCapabilities()).ifPresent(v -> capabilities = new ArrayList<>(v));
     maxSession = jsonConfig.getMaxSession();
     register = jsonConfig.getRegister();
     registerCycle = jsonConfig.getRegisterCycle();
@@ -352,7 +354,9 @@ public static GridNodeConfiguration loadFromJSON(JsonInput jsonInput) {
       GridNodeConfiguration result = new GridNodeConfiguration(); // defaults
       result.merge(fromJson);
       // copy non-mergeable fields
-      result.hub = String.format("http://%s:%s", fromJson.getHubHostPort(), fromJson.getHubPort());
+      if (fromJson.getHubHostPort() != null) {
+        result.hub = String.format("http://%s:%s", fromJson.getHubHostPort(), fromJson.getHubPort());
+      }
       if (fromJson.hub != null) {
         result.hub = fromJson.hub;
       }

diff --git a/java/server/test/org/openqa/grid/internal/utils/configuration/GridNodeConfigurationTest.java b/java/server/test/org/openqa/grid/internal/utils/configuration/GridNodeConfigurationTest.java
@@ -24,7 +24,6 @@
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 import static org.openqa.selenium.json.Json.MAP_TYPE;
-import static org.openqa.selenium.testing.TestUtilities.catchThrowable;
 
 import com.google.common.collect.ImmutableMap;