[java] removed use of guava from browser packages

SeleniumHQ · Oct 14, 2023 · 42cc355 · 42cc355
1 parent 2d89118
commit 42cc355
Show file tree

Hide file tree

Showing 22 changed files with 85 additions and 109 deletions.
diff --git a/java/src/org/openqa/selenium/chrome/BUILD.bazel b/java/src/org/openqa/selenium/chrome/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//java:defs.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
@@ -18,6 +17,5 @@ java_export(
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/manager",
         "//java/src/org/openqa/selenium/remote",
-        artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/src/org/openqa/selenium/chrome/ChromeDriver.java b/java/src/org/openqa/selenium/chrome/ChromeDriver.java
@@ -17,8 +17,9 @@
 
 package org.openqa.selenium.chrome;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriver;
@@ -116,10 +117,10 @@ public ChromeDriverCommandExecutor(DriverService service, ClientConfig clientCon
     }
 
     private static Map<String, CommandInfo> getExtraCommands() {
-      return ImmutableMap.<String, CommandInfo>builder()
-          .putAll(new AddHasCasting().getAdditionalCommands())
-          .putAll(new AddHasCdp().getAdditionalCommands())
-          .build();
+      return Stream.of(
+              new AddHasCasting().getAdditionalCommands(), new AddHasCdp().getAdditionalCommands())
+          .flatMap((m) -> m.entrySet().stream())
+          .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
     }
   }
 }
diff --git a/java/src/org/openqa/selenium/chromium/BUILD.bazel b/java/src/org/openqa/selenium/chromium/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//java:defs.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
@@ -17,6 +16,5 @@ java_export(
         "//java:auto-service",
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/remote",
-        artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/src/org/openqa/selenium/chromium/ChromiumDriverCommandExecutor.java b/java/src/org/openqa/selenium/chromium/ChromiumDriverCommandExecutor.java
@@ -17,8 +17,9 @@
 
 package org.openqa.selenium.chromium;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.openqa.selenium.remote.CommandInfo;
 import org.openqa.selenium.remote.http.ClientConfig;
 import org.openqa.selenium.remote.service.DriverCommandExecutor;
@@ -44,11 +45,12 @@ public ChromiumDriverCommandExecutor(
   }
 
   private static Map<String, CommandInfo> getExtraCommands(Map<String, CommandInfo> commands) {
-    return ImmutableMap.<String, CommandInfo>builder()
-        .putAll(commands)
-        .putAll(new AddHasNetworkConditions().getAdditionalCommands())
-        .putAll(new AddHasPermissions().getAdditionalCommands())
-        .putAll(new AddHasLaunchApp().getAdditionalCommands())
-        .build();
+    return Stream.of(
+            commands,
+            new AddHasNetworkConditions().getAdditionalCommands(),
+            new AddHasPermissions().getAdditionalCommands(),
+            new AddHasLaunchApp().getAdditionalCommands())
+        .flatMap((m) -> m.entrySet().stream())
+        .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
   }
 }
diff --git a/java/src/org/openqa/selenium/chromium/ChromiumDriverLogLevel.java b/java/src/org/openqa/selenium/chromium/ChromiumDriverLogLevel.java
@@ -17,7 +17,6 @@
 
 package org.openqa.selenium.chromium;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import java.util.logging.Level;
 
@@ -35,16 +34,15 @@ public enum ChromiumDriverLogLevel {
   OFF;
 
   private static final Map<Level, ChromiumDriverLogLevel> logLevelToChromeLevelMap =
-      new ImmutableMap.Builder<Level, ChromiumDriverLogLevel>()
-          .put(Level.ALL, ALL)
-          .put(Level.FINEST, DEBUG)
-          .put(Level.FINER, DEBUG)
-          .put(Level.FINE, DEBUG)
-          .put(Level.INFO, INFO)
-          .put(Level.WARNING, WARNING)
-          .put(Level.SEVERE, SEVERE)
-          .put(Level.OFF, OFF)
-          .build();
+      Map.of(
+          Level.ALL, ALL,
+          Level.FINEST, DEBUG,
+          Level.FINER, DEBUG,
+          Level.FINE, DEBUG,
+          Level.INFO, INFO,
+          Level.WARNING, WARNING,
+          Level.SEVERE, SEVERE,
+          Level.OFF, OFF);
 
   @Override
   public String toString() {

diff --git a/java/src/org/openqa/selenium/edge/AddHasCasting.java b/java/src/org/openqa/selenium/edge/AddHasCasting.java
@@ -20,7 +20,6 @@
 import static org.openqa.selenium.remote.Browser.EDGE;
 
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import java.util.function.Predicate;
 import org.openqa.selenium.Capabilities;
@@ -34,7 +33,7 @@
 public class AddHasCasting extends org.openqa.selenium.chromium.AddHasCasting {
 
   private static final Map<String, CommandInfo> COMMANDS =
-      ImmutableMap.of(
+      Map.of(
           GET_CAST_SINKS, new CommandInfo("session/:sessionId/ms/cast/get_sinks", HttpMethod.GET),
           SET_CAST_SINK_TO_USE,
               new CommandInfo("session/:sessionId/ms/cast/set_sink_to_use", HttpMethod.POST),

diff --git a/java/src/org/openqa/selenium/edge/AddHasCdp.java b/java/src/org/openqa/selenium/edge/AddHasCdp.java
@@ -20,7 +20,6 @@
 import static org.openqa.selenium.remote.Browser.EDGE;
 
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import java.util.function.Predicate;
 import org.openqa.selenium.Capabilities;
@@ -34,8 +33,7 @@
 public class AddHasCdp extends org.openqa.selenium.chromium.AddHasCdp {
 
   private static final Map<String, CommandInfo> COMMANDS =
-      ImmutableMap.of(
-          EXECUTE_CDP, new CommandInfo("session/:sessionId/ms/cdp/execute", HttpMethod.POST));
+      Map.of(EXECUTE_CDP, new CommandInfo("session/:sessionId/ms/cdp/execute", HttpMethod.POST));
 
   @Override
   public Map<String, CommandInfo> getAdditionalCommands() {

diff --git a/java/src/org/openqa/selenium/edge/BUILD.bazel b/java/src/org/openqa/selenium/edge/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//java:defs.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
@@ -19,6 +18,5 @@ java_export(
         "//java/src/org/openqa/selenium/chromium",
         "//java/src/org/openqa/selenium/manager",
         "//java/src/org/openqa/selenium/remote",
-        artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriver.java b/java/src/org/openqa/selenium/edge/EdgeDriver.java
@@ -16,8 +16,9 @@
 // under the License.
 package org.openqa.selenium.edge;
 
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.chromium.ChromiumDriver;
@@ -88,10 +89,10 @@ public EdgeDriverCommandExecutor(DriverService service, ClientConfig clientConfi
     }
 
     private static Map<String, CommandInfo> getExtraCommands() {
-      return ImmutableMap.<String, CommandInfo>builder()
-          .putAll(new AddHasCasting().getAdditionalCommands())
-          .putAll(new AddHasCdp().getAdditionalCommands())
-          .build();
+      return Stream.of(
+              new AddHasCasting().getAdditionalCommands(), new AddHasCdp().getAdditionalCommands())
+          .flatMap((m) -> m.entrySet().stream())
+          .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
     }
   }
 }
diff --git a/java/src/org/openqa/selenium/edge/EdgeDriverService.java b/java/src/org/openqa/selenium/edge/EdgeDriverService.java
@@ -17,8 +17,6 @@
 
 package org.openqa.selenium.edge;
 
-import static java.util.Collections.unmodifiableList;
-import static java.util.Collections.unmodifiableMap;
 import static org.openqa.selenium.edge.EdgeOptions.WEBVIEW2_BROWSER_NAME;
 import static org.openqa.selenium.remote.Browser.EDGE;
 
@@ -28,7 +26,6 @@
 import java.io.OutputStream;
 import java.time.Duration;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import org.openqa.selenium.Capabilities;
@@ -101,12 +98,7 @@ public EdgeDriverService(
       List<String> args,
       Map<String, String> environment)
       throws IOException {
-    super(
-        executable,
-        port,
-        timeout,
-        unmodifiableList(new ArrayList<>(args)),
-        unmodifiableMap(new HashMap<>(environment)));
+    super(executable, port, timeout, List.copyOf(args), Map.copyOf(environment));
   }
 
   public String getDriverName() {
@@ -316,7 +308,7 @@ protected List<String> createArgs() {
         args.add("--disable-build-check");
       }
 
-      return unmodifiableList(args);
+      return List.copyOf(args);
     }
 
     @Override

diff --git a/java/src/org/openqa/selenium/firefox/AddHasContext.java b/java/src/org/openqa/selenium/firefox/AddHasContext.java
@@ -20,7 +20,6 @@
 import static org.openqa.selenium.remote.Browser.FIREFOX;
 
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import java.util.function.Predicate;
 import org.openqa.selenium.Capabilities;
@@ -39,7 +38,7 @@ public class AddHasContext implements AugmenterProvider<HasContext>, AdditionalH
   public static final String GET_CONTEXT = "getContext";
 
   private static final Map<String, CommandInfo> COMMANDS =
-      ImmutableMap.of(
+      Map.of(
           SET_CONTEXT, new CommandInfo("/session/:sessionId/moz/context", HttpMethod.POST),
           GET_CONTEXT, new CommandInfo("/session/:sessionId/moz/context", HttpMethod.GET));
 
@@ -65,7 +64,7 @@ public HasContext getImplementation(Capabilities capabilities, ExecuteMethod exe
       public void setContext(FirefoxCommandContext context) {
         Require.nonNull("Firefox Command Context", context);
 
-        executeMethod.execute(SET_CONTEXT, ImmutableMap.of("context", context));
+        executeMethod.execute(SET_CONTEXT, Map.of("context", context));
       }
 
       @Override

diff --git a/java/src/org/openqa/selenium/firefox/AddHasExtensions.java b/java/src/org/openqa/selenium/firefox/AddHasExtensions.java
@@ -20,7 +20,6 @@
 import static org.openqa.selenium.remote.Browser.FIREFOX;
 
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableMap;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.FileVisitResult;
@@ -51,7 +50,7 @@ public class AddHasExtensions implements AugmenterProvider<HasExtensions>, Addit
   public static final String UNINSTALL_EXTENSION = "uninstallExtension";
 
   private static final Map<String, CommandInfo> COMMANDS =
-      ImmutableMap.of(
+      Map.of(
           INSTALL_EXTENSION,
               new CommandInfo("/session/:sessionId/moz/addon/install", HttpMethod.POST),
           UNINSTALL_EXTENSION,
@@ -98,7 +97,7 @@ public String installExtension(Path path, Boolean temporary) {
 
         return (String)
             executeMethod.execute(
-                INSTALL_EXTENSION, ImmutableMap.of("addon", encoded, "temporary", temporary));
+                INSTALL_EXTENSION, Map.of("addon", encoded, "temporary", temporary));
       }
 
       private Path zipDirectory(Path path) throws IOException {
@@ -124,7 +123,7 @@ public FileVisitResult visitFile(Path file, BasicFileAttributes attrs)
       public void uninstallExtension(String extensionId) {
         Require.nonNull("Extension ID", extensionId);
 
-        executeMethod.execute(UNINSTALL_EXTENSION, ImmutableMap.of("id", extensionId));
+        executeMethod.execute(UNINSTALL_EXTENSION, Map.of("id", extensionId));
       }
     };
   }

diff --git a/java/src/org/openqa/selenium/firefox/AddHasFullPageScreenshot.java b/java/src/org/openqa/selenium/firefox/AddHasFullPageScreenshot.java
@@ -20,7 +20,6 @@
 import static org.openqa.selenium.remote.Browser.FIREFOX;
 
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableMap;
 import java.util.Map;
 import java.util.function.Predicate;
 import org.openqa.selenium.Capabilities;
@@ -40,7 +39,7 @@ public class AddHasFullPageScreenshot<X>
   public static final String FULL_PAGE_SCREENSHOT = "fullPageScreenshot";
 
   private static final Map<String, CommandInfo> COMMANDS =
-      ImmutableMap.of(
+      Map.of(
           FULL_PAGE_SCREENSHOT,
           new CommandInfo("/session/:sessionId/moz/screenshot/full", HttpMethod.GET));
 

diff --git a/java/src/org/openqa/selenium/firefox/BUILD.bazel b/java/src/org/openqa/selenium/firefox/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//java:defs.bzl", "java_export")
 load("//java:version.bzl", "SE_VERSION")
 
@@ -15,6 +14,5 @@ java_export(
         "//java/src/org/openqa/selenium/json",
         "//java/src/org/openqa/selenium/manager",
         "//java/src/org/openqa/selenium/remote",
-        artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/src/org/openqa/selenium/firefox/ClasspathExtension.java b/java/src/org/openqa/selenium/firefox/ClasspathExtension.java
@@ -17,12 +17,11 @@
 
 package org.openqa.selenium.firefox;
 
-import com.google.common.io.Resources;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
-import java.net.URL;
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.io.FileHandler;
 
@@ -52,10 +51,14 @@ public void writeTo(File extensionsDir) throws IOException {
       }
     }
 
-    URL resourceUrl = Resources.getResource(loadResourcesUsing, loadFrom);
-
-    try (OutputStream stream = new FileOutputStream(extractedXpi)) {
-      Resources.copy(resourceUrl, stream);
+    try (InputStream resource = loadResourcesUsing.getResourceAsStream(loadFrom)) {
+      if (resource == null) {
+        throw new IllegalArgumentException(
+            "missing resource '" + loadFrom + "' in " + loadResourcesUsing.getName());
+      }
+      try (OutputStream stream = new FileOutputStream(extractedXpi)) {
+        resource.transferTo(stream);
+      }
     }
     new FileExtension(extractedXpi).writeTo(extensionsDir);
   }

diff --git a/java/src/org/openqa/selenium/firefox/FirefoxDriver.java b/java/src/org/openqa/selenium/firefox/FirefoxDriver.java
@@ -19,14 +19,15 @@
 
 import static org.openqa.selenium.remote.CapabilityType.PROXY;
 
-import com.google.common.collect.ImmutableMap;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.nio.file.Path;
 import java.util.Map;
 import java.util.Optional;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 import org.openqa.selenium.Beta;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
@@ -416,11 +417,12 @@ public FirefoxDriverCommandExecutor(DriverService service, ClientConfig clientCo
     }
 
     private static Map<String, CommandInfo> getExtraCommands() {
-      return ImmutableMap.<String, CommandInfo>builder()
-          .putAll(new AddHasContext().getAdditionalCommands())
-          .putAll(new AddHasExtensions().getAdditionalCommands())
-          .putAll(new AddHasFullPageScreenshot().getAdditionalCommands())
-          .build();
+      return Stream.of(
+              new AddHasContext().getAdditionalCommands(),
+              new AddHasExtensions().getAdditionalCommands(),
+              new AddHasFullPageScreenshot<>().getAdditionalCommands())
+          .flatMap((m) -> m.entrySet().stream())
+          .collect(Collectors.toUnmodifiableMap(Map.Entry::getKey, Map.Entry::getValue));
     }
   }
 }