update code as suggestions

Signed-off-by: Viet Nguyen Duc <nguyenducviet4496@gmail.com>
SeleniumHQ · Apr 11, 2024 · 08787b9 · 08787b9
1 parent a73ba2f
commit 08787b9
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/java/src/org/openqa/selenium/docker/ContainerConfig.java b/java/src/org/openqa/selenium/docker/ContainerConfig.java
@@ -21,7 +21,6 @@
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Multimap;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -53,7 +52,15 @@ public ContainerConfig(
       List<Device> devices,
       String networkName,
       long shmSize) {
-    this(image, portBindings, envVars, volumeBinds, devices, networkName, shmSize, new HashMap<>());
+    this(
+        image,
+        portBindings,
+        envVars,
+        volumeBinds,
+        devices,
+        networkName,
+        shmSize,
+        ImmutableMap.of());
   }
 
   public ContainerConfig(
@@ -73,7 +80,7 @@ public ContainerConfig(
     this.networkName = networkName;
     this.autoRemove = true;
     this.shmSize = shmSize;
-    this.hostConfig = hostConfig;
+    this.hostConfig = hostConfig != null ? hostConfig : ImmutableMap.of();
   }
 
   public static ContainerConfig image(Image image) {
@@ -138,7 +145,7 @@ public ContainerConfig devices(List<Device> devices) {
         image, portBindings, envVars, volumeBinds, devices, networkName, shmSize);
   }
 
-  public ContainerConfig getHostConfig(Map<String, Object> hostConfig, List<String> configKeys) {
+  public ContainerConfig applyHostConfig(Map<String, Object> hostConfig, List<String> configKeys) {
     Map<String, Object> setHostConfig =
         configKeys.stream()
             .filter(hostConfig::containsKey)
@@ -204,9 +211,7 @@ private Map<String, Object> toJson() {
             "Devices", devicesMapping);
 
     if (this.hostConfig != null && !this.hostConfig.isEmpty()) {
-      Map<String, Object> copyMap = new HashMap<>(hostConfig);
-      copyMap.putAll(this.hostConfig);
-      hostConfig = ImmutableMap.copyOf(copyMap);
+      hostConfig = ImmutableMap.copyOf(this.hostConfig);
     }
 
     return ImmutableMap.of(

diff --git a/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java b/java/src/org/openqa/selenium/grid/node/docker/DockerSessionFactory.java
@@ -294,7 +294,7 @@ private Container createBrowserContainer(
             .shmMemorySize(browserContainerShmMemorySize)
             .network(networkName)
             .devices(devices)
-            .getHostConfig(hostConfig, hostConfigKeys);
+            .applyHostConfig(hostConfig, hostConfigKeys);
     if (!runningInDocker) {
       containerConfig = containerConfig.map(Port.tcp(4444), Port.tcp(port));
     }