[grid] Replace Guava set and maps with Java equivalent for remaining Grid packages

pujagani · pujagani · commit 0b3f7ddd6608 · 2025-08-20T15:13:51.000+05:30
diff --git a/java/src/org/openqa/selenium/grid/sessionmap/AddToSessionMap.java b/java/src/org/openqa/selenium/grid/sessionmap/AddToSessionMap.java
@@ -24,7 +24,7 @@
 import static org.openqa.selenium.remote.tracing.HttpTracing.newSpanAsChildOf;
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST;
 
-import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 import java.util.Objects;
 import org.openqa.selenium.grid.data.Session;
 import org.openqa.selenium.internal.Require;
@@ -61,7 +61,7 @@ public HttpResponse execute(HttpRequest req) {
 
       sessions.add(session);
 
-      return new HttpResponse().setContent(asJson(ImmutableMap.of("value", true)));
+      return new HttpResponse().setContent(asJson(Map.of("value", true)));
     }
   }
 }
diff --git a/java/src/org/openqa/selenium/grid/sessionmap/GetFromSessionMap.java b/java/src/org/openqa/selenium/grid/sessionmap/GetFromSessionMap.java
@@ -23,7 +23,7 @@
 import static org.openqa.selenium.remote.tracing.HttpTracing.newSpanAsChildOf;
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST;
 
-import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 import org.openqa.selenium.grid.data.Session;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.SessionId;
@@ -56,7 +56,7 @@ public HttpResponse execute(HttpRequest req) {
       CAPABILITIES.accept(span, session.getCapabilities());
       span.setAttribute("session.uri", session.getUri().toString());
 
-      return new HttpResponse().setContent(asJson(ImmutableMap.of("value", session)));
+      return new HttpResponse().setContent(asJson(Map.of("value", session)));
     }
   }
 }
diff --git a/java/src/org/openqa/selenium/grid/sessionmap/httpd/DefaultSessionMapConfig.java b/java/src/org/openqa/selenium/grid/sessionmap/httpd/DefaultSessionMapConfig.java
@@ -17,21 +17,21 @@
 
 package org.openqa.selenium.grid.sessionmap.httpd;
 
-import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 import org.openqa.selenium.grid.config.MapConfig;
 
 class DefaultSessionMapConfig extends MapConfig {
 
   public DefaultSessionMapConfig() {
     super(
-        ImmutableMap.of(
+        Map.of(
             "events",
-                ImmutableMap.of(
+                Map.of(
                     "publish", "tcp://*:4442",
                     "subscribe", "tcp://*:4443"),
             "sessions",
-                ImmutableMap.of(
+                Map.of(
                     "implementation", "org.openqa.selenium.grid.sessionmap.local.LocalSessionMap"),
-            "server", ImmutableMap.of("port", 5556)));
+            "server", Map.of("port", 5556)));
   }
 }
diff --git a/java/src/org/openqa/selenium/grid/sessionmap/httpd/SessionMapServer.java b/java/src/org/openqa/selenium/grid/sessionmap/httpd/SessionMapServer.java
@@ -26,12 +26,11 @@
 import static org.openqa.selenium.remote.http.Route.get;
 
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Collections;
+import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -64,7 +63,7 @@ public String getDescription() {
 
   @Override
   public Set<Role> getConfigurableRoles() {
-    return ImmutableSet.of(EVENT_BUS_ROLE, HTTPD_ROLE, SESSION_MAP_ROLE);
+    return Set.of(EVENT_BUS_ROLE, HTTPD_ROLE, SESSION_MAP_ROLE);
   }
 
   @Override
@@ -100,9 +99,9 @@ protected Handlers createHandlers(Config config) {
                                 .addHeader("Content-Type", JSON_UTF_8)
                                 .setContent(
                                     asJson(
-                                        ImmutableMap.of(
+                                        Map.of(
                                             "value",
-                                            ImmutableMap.of(
+                                            Map.of(
                                                 "ready",
                                                 true,
                                                 "message",
diff --git a/java/src/org/openqa/selenium/grid/sessionmap/redis/RedisBackedSessionMap.java b/java/src/org/openqa/selenium/grid/sessionmap/redis/RedisBackedSessionMap.java
@@ -23,12 +23,12 @@
 import static org.openqa.selenium.remote.RemoteTags.SESSION_ID_EVENT;
 import static org.openqa.selenium.remote.tracing.Tags.EXCEPTION;
 
-import com.google.common.collect.ImmutableMap;
 import io.lettuce.core.KeyValue;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 import java.util.logging.Logger;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
@@ -139,7 +139,7 @@ public boolean add(Session session) {
 
       span.addEvent("Inserted into the database", attributeMap);
       connection.mset(
-          ImmutableMap.of(
+          Map.of(
               uriKey, uriValue,
               stereotypeKey, stereotypeJson,
               capabilitiesKey, capabilitiesJson,
diff --git a/java/src/org/openqa/selenium/grid/sessionqueue/ClearSessionQueue.java b/java/src/org/openqa/selenium/grid/sessionqueue/ClearSessionQueue.java
@@ -23,7 +23,7 @@
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST;
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_RESPONSE;
 
-import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.http.HttpHandler;
 import org.openqa.selenium.remote.http.HttpRequest;
@@ -56,14 +56,14 @@ public HttpResponse execute(HttpRequest req) {
       if (value != 0) {
         response.setContent(
             asJson(
-                ImmutableMap.of(
+                Map.of(
                     "value", value,
                     "message", "Cleared the new session request queue",
                     "cleared_requests", value)));
       } else {
         response.setContent(
             asJson(
-                ImmutableMap.of(
+                Map.of(
                     "value",
                     value,
                     "message",
@@ -81,7 +81,7 @@ public HttpResponse execute(HttpRequest req) {
               .setStatus((HTTP_INTERNAL_ERROR))
               .setContent(
                   asJson(
-                      ImmutableMap.of(
+                      Map.of(
                           "value",
                           0,
                           "message",
diff --git a/java/src/org/openqa/selenium/grid/sessionqueue/httpd/DefaultNewSessionQueueConfig.java b/java/src/org/openqa/selenium/grid/sessionqueue/httpd/DefaultNewSessionQueueConfig.java
@@ -17,12 +17,12 @@
 
 package org.openqa.selenium.grid.sessionqueue.httpd;
 
-import com.google.common.collect.ImmutableMap;
+import java.util.Map;
 import org.openqa.selenium.grid.config.MapConfig;
 
 class DefaultNewSessionQueueConfig extends MapConfig {
 
   DefaultNewSessionQueueConfig() {
-    super(ImmutableMap.of("server", ImmutableMap.of("port", 5559)));
+    super(Map.of("server", Map.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
@@ -25,12 +25,11 @@
 import static org.openqa.selenium.remote.http.Route.get;
 
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.UncheckedIOException;
 import java.util.Collections;
+import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
@@ -65,7 +64,7 @@ public String getDescription() {
 
   @Override
   public Set<Role> getConfigurableRoles() {
-    return ImmutableSet.of(HTTPD_ROLE, SESSION_QUEUE_ROLE);
+    return Set.of(HTTPD_ROLE, SESSION_QUEUE_ROLE);
   }
 
   @Override
@@ -100,9 +99,9 @@ protected Handlers createHandlers(Config config) {
                                 .addHeader("Content-Type", JSON_UTF_8)
                                 .setContent(
                                     asJson(
-                                        ImmutableMap.of(
+                                        Map.of(
                                             "value",
-                                            ImmutableMap.of(
+                                            Map.of(
                                                 "ready",
                                                 true,
                                                 "message",
diff --git a/java/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java b/java/src/org/openqa/selenium/grid/sessionqueue/local/LocalNewSessionQueue.java
@@ -22,8 +22,6 @@
 import static org.openqa.selenium.concurrent.ExecutorServices.shutdownGracefully;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import java.io.Closeable;
 import java.time.Duration;
 import java.time.Instant;
@@ -180,7 +178,7 @@ private void timeoutSessions() {
                                   sessionRequest.getRequestId().equals(entry.getKey())))
               .filter(entry -> isTimedOut(now, entry.getValue()))
               .map(Map.Entry::getKey)
-              .collect(ImmutableSet.toImmutableSet());
+              .collect(Collectors.toSet());
     } finally {
       readLock.unlock();
     }
@@ -258,9 +256,9 @@ public HttpResponse addToQueue(SessionRequest request) {
         res.setStatus(HTTP_INTERNAL_ERROR)
             .setContent(
                 Contents.asJson(
-                    ImmutableMap.of(
+                    Map.of(
                         "value",
-                        ImmutableMap.of(
+                        Map.of(
                             "error", "session not created",
                             "message", result.left().getMessage(),
                             "stacktrace", result.left().getStackTrace()))));
diff --git a/java/src/org/openqa/selenium/grid/web/CheckContentTypeHeader.java b/java/src/org/openqa/selenium/grid/web/CheckContentTypeHeader.java
@@ -19,9 +19,8 @@
 
 import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import com.google.common.net.MediaType;
+import java.util.Map;
 import java.util.Set;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.http.Contents;
@@ -36,18 +35,17 @@ public class CheckContentTypeHeader implements Filter {
           .setStatus(HTTP_INTERNAL_ERROR)
           .setContent(
               Contents.asJson(
-                  ImmutableMap.of(
+                  Map.of(
                       "value",
-                      ImmutableMap.of(
+                      Map.of(
                           "error", "unknown error",
                           "message", "Content-Type header is missing",
                           "stacktrace", ""))));
 
   private final Set<String> skipChecksOn;
 
   public CheckContentTypeHeader(Set<String> skipChecksOn) {
-    this.skipChecksOn =
-        ImmutableSet.copyOf(Require.nonNull("URLs where checks are skipped", skipChecksOn));
+    this.skipChecksOn = Set.copyOf(Require.nonNull("URLs where checks are skipped", skipChecksOn));
   }
 
   @Override
@@ -81,9 +79,9 @@ private HttpResponse badType(String type) {
         .setStatus(HTTP_INTERNAL_ERROR)
         .setContent(
             Contents.asJson(
-                ImmutableMap.of(
+                Map.of(
                     "value",
-                    ImmutableMap.of(
+                    Map.of(
                         "error", "unknown error",
                         "message",
                             "Content-Type header does not indicate utf-8 encoded json: " + type,
diff --git a/java/src/org/openqa/selenium/grid/web/CheckOriginHeader.java b/java/src/org/openqa/selenium/grid/web/CheckOriginHeader.java
@@ -20,9 +20,8 @@
 import static java.net.HttpURLConnection.HTTP_INTERNAL_ERROR;
 import static org.openqa.selenium.json.Json.JSON_UTF_8;
 
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.ImmutableSet;
 import java.util.Collection;
+import java.util.Map;
 import java.util.Set;
 import org.openqa.selenium.internal.Require;
 import org.openqa.selenium.remote.http.Contents;
@@ -37,9 +36,8 @@ public class CheckOriginHeader implements Filter {
 
   public CheckOriginHeader(Collection<String> allowedOriginHosts, Set<String> skipChecksOn) {
     Require.nonNull("Allowed origins list", allowedOriginHosts);
-    allowedHosts = ImmutableSet.copyOf(allowedOriginHosts);
-    this.skipChecksOn =
-        ImmutableSet.copyOf(Require.nonNull("URLs where checks are skipped", skipChecksOn));
+    allowedHosts = Set.copyOf(allowedOriginHosts);
+    this.skipChecksOn = Set.copyOf(Require.nonNull("URLs where checks are skipped", skipChecksOn));
   }
 
   @Override
@@ -58,9 +56,9 @@ public HttpHandler apply(HttpHandler httpHandler) {
             .addHeader("Content-Type", JSON_UTF_8)
             .setContent(
                 Contents.asJson(
-                    ImmutableMap.of(
+                    Map.of(
                         "value",
-                        ImmutableMap.of(
+                        Map.of(
                             "error", "unknown error",
                             "message", "Origin not allowed: " + origin,
                             "stacktrace", ""))));
diff --git a/java/src/org/openqa/selenium/grid/web/JarFileResource.java b/java/src/org/openqa/selenium/grid/web/JarFileResource.java
@@ -17,14 +17,14 @@
 
 package org.openqa.selenium.grid.web;
 
-import com.google.common.collect.ImmutableSet;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.UncheckedIOException;
 import java.util.Optional;
 import java.util.Set;
 import java.util.jar.JarFile;
+import java.util.stream.Collectors;
 import java.util.zip.ZipEntry;
 import org.openqa.selenium.internal.Require;
 
@@ -88,7 +88,7 @@ public boolean isDirectory() {
   @Override
   public Set<Resource> list() {
     if (!isDirectory()) {
-      return ImmutableSet.of();
+      return Set.of();
     }
 
     String prefix = entryName.endsWith("/") ? entryName : entryName + "/";
@@ -100,7 +100,7 @@ public Set<Resource> list() {
         .filter(e -> !e.getName().equals(prefix))
         .filter(e -> e.getName().split("/").length == count)
         .map(e -> new JarFileResource(jarFile, e.getName(), prefix))
-        .collect(ImmutableSet.toImmutableSet());
+        .collect(Collectors.toUnmodifiableSet());
   }
 
   @Override
diff --git a/java/src/org/openqa/selenium/grid/web/MergedResource.java b/java/src/org/openqa/selenium/grid/web/MergedResource.java
@@ -17,7 +17,8 @@
 
 package org.openqa.selenium.grid.web;
 
-import com.google.common.collect.ImmutableSet;
+import java.util.Collections;
+import java.util.HashSet;
 import java.util.Optional;
 import java.util.Set;
 import org.openqa.selenium.internal.Require;
@@ -66,10 +67,9 @@ public boolean isDirectory() {
 
   @Override
   public Set<Resource> list() {
-    ImmutableSet.Builder<Resource> resources = ImmutableSet.builder();
-    resources.addAll(base.list());
+    Set<Resource> resources = new HashSet<>(base.list());
     next.ifPresent(res -> resources.addAll(res.list()));
-    return resources.build();
+    return Collections.unmodifiableSet(resources);
   }
 
   @Override
diff --git a/java/src/org/openqa/selenium/grid/web/NoHandler.java b/java/src/org/openqa/selenium/grid/web/NoHandler.java
@@ -22,7 +22,6 @@
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.openqa.selenium.remote.http.Contents.bytes;
 
-import com.google.common.collect.ImmutableMap;
 import java.io.UncheckedIOException;
 import java.util.Collections;
 import java.util.HashMap;
@@ -48,7 +47,7 @@ public HttpResponse execute(HttpRequest req) throws UncheckedIOException {
     responseMap.put("sessionId", null);
     responseMap.put(
         "value",
-        ImmutableMap.of(
+        Map.of(
             "error", "unknown command",
             "message",
                 String.format(
diff --git a/java/src/org/openqa/selenium/grid/web/PathResource.java b/java/src/org/openqa/selenium/grid/web/PathResource.java
diff --git a/java/src/org/openqa/selenium/grid/web/ReverseProxyHandler.java b/java/src/org/openqa/selenium/grid/web/ReverseProxyHandler.java
diff --git a/java/src/org/openqa/selenium/grid/web/RoutableHttpClientFactory.java b/java/src/org/openqa/selenium/grid/web/RoutableHttpClientFactory.java

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@`
`24`	`24`	`import static org.openqa.selenium.remote.tracing.HttpTracing.newSpanAsChildOf;`
`25`	`25`	`import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST;`
`26`	`26`
`27`		`-import com.google.common.collect.ImmutableMap;`
	`27`	`+import java.util.Map;`
`28`	`28`	`import java.util.Objects;`
`29`	`29`	`import org.openqa.selenium.grid.data.Session;`
`30`	`30`	`import org.openqa.selenium.internal.Require;`
`@@ -61,7 +61,7 @@ public HttpResponse execute(HttpRequest req) {`
`61`	`61`
`62`	`62`	`sessions.add(session);`
`63`	`63`
`64`		`- return new HttpResponse().setContent(asJson(ImmutableMap.of("value", true)));`
	`64`	`+ return new HttpResponse().setContent(asJson(Map.of("value", true)));`
`65`	`65`	`}`
`66`	`66`	`}`
`67`	`67`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@`
`23`	`23`	`import static org.openqa.selenium.remote.tracing.HttpTracing.newSpanAsChildOf;`
`24`	`24`	`import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST;`
`25`	`25`
`26`		`-import com.google.common.collect.ImmutableMap;`
	`26`	`+import java.util.Map;`
`27`	`27`	`import org.openqa.selenium.grid.data.Session;`
`28`	`28`	`import org.openqa.selenium.internal.Require;`
`29`	`29`	`import org.openqa.selenium.remote.SessionId;`
`@@ -56,7 +56,7 @@ public HttpResponse execute(HttpRequest req) {`
`56`	`56`	`CAPABILITIES.accept(span, session.getCapabilities());`
`57`	`57`	`span.setAttribute("session.uri", session.getUri().toString());`
`58`	`58`
`59`		`- return new HttpResponse().setContent(asJson(ImmutableMap.of("value", session)));`
	`59`	`+ return new HttpResponse().setContent(asJson(Map.of("value", session)));`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,12 +17,12 @@`
`17`	`17`
`18`	`18`	`package org.openqa.selenium.grid.sessionqueue.httpd;`
`19`	`19`
`20`		`-import com.google.common.collect.ImmutableMap;`
	`20`	`+import java.util.Map;`
`21`	`21`	`import org.openqa.selenium.grid.config.MapConfig;`
`22`	`22`
`23`	`23`	`class DefaultNewSessionQueueConfig extends MapConfig {`
`24`	`24`
`25`	`25`	`DefaultNewSessionQueueConfig() {`
`26`		`- super(ImmutableMap.of("server", ImmutableMap.of("port", 5559)));`
	`26`	`+ super(Map.of("server", Map.of("port", 5559)));`
`27`	`27`	`}`
`28`	`28`	`}`