[java] More conversion of guava-style code to java 8

SeleniumHQ · Apr 20, 2020 · 66d554a · 66d554a
1 parent bf734f8
commit 66d554a
Show file tree

Hide file tree

Showing 11 changed files with 69 additions and 55 deletions.
diff --git a/java/client/src/org/openqa/selenium/edge/BUILD.bazel b/java/client/src/org/openqa/selenium/edge/BUILD.bazel
@@ -27,6 +27,5 @@ java_export(
         "//java/client/src/org/openqa/selenium:core",
         "//java/client/src/org/openqa/selenium/chromium",
         "//java/client/src/org/openqa/selenium/remote",
-        artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/client/src/org/openqa/selenium/edge/ChromiumEdgeDriverService.java b/java/client/src/org/openqa/selenium/edge/ChromiumEdgeDriverService.java
@@ -16,8 +16,9 @@
 // under the License.
 package org.openqa.selenium.edge;
 
+import static java.util.Collections.unmodifiableList;
+
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableList;
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
@@ -27,6 +28,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -161,22 +163,22 @@ protected List<String> createArgs() {
         }
       }
 
-      ImmutableList.Builder<String> argsBuilder = ImmutableList.builder();
-      argsBuilder.add(String.format("--port=%d", getPort()));
+      List<String> args = new ArrayList<>();
+      args.add(String.format("--port=%d", getPort()));
       if (getLogFile() != null) {
-        argsBuilder.add(String.format("--log-path=%s", getLogFile().getAbsolutePath()));
+        args.add(String.format("--log-path=%s", getLogFile().getAbsolutePath()));
       }
       if (verbose) {
-        argsBuilder.add("--verbose");
+        args.add("--verbose");
       }
       if (silent) {
-        argsBuilder.add("--silent");
+        args.add("--silent");
       }
       if (allowedListIps != null) {
-        argsBuilder.add(String.format("--whitelisted-ips=%s", allowedListIps));
+        args.add(String.format("--whitelisted-ips=%s", allowedListIps));
       }
 
-      return argsBuilder.build();
+      return unmodifiableList(args);
     }
 
     @Override

diff --git a/java/client/src/org/openqa/selenium/edge/EdgeDriverService.java b/java/client/src/org/openqa/selenium/edge/EdgeDriverService.java
@@ -16,13 +16,16 @@
 // under the License.
 package org.openqa.selenium.edge;
 
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.ImmutableMap;
+import static java.util.Collections.unmodifiableList;
+import static java.util.Collections.unmodifiableMap;
+
 import org.openqa.selenium.remote.service.DriverService;
 
 import java.io.File;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -62,7 +65,9 @@ public EdgeDriverService(
       Duration timeout,
       List<String> args,
       Map<String, String> environment) throws IOException {
-    super(executable, port, timeout, ImmutableList.copyOf(args), ImmutableMap.copyOf(environment));
+    super(executable, port, timeout,
+          unmodifiableList(new ArrayList<>(args)),
+          unmodifiableMap(new HashMap<>(environment)));
   }
 
   public static abstract class Builder<DS extends EdgeDriverService, B extends EdgeDriverService.Builder<?, ?>>

diff --git a/java/client/src/org/openqa/selenium/edge/edgehtml/BUILD.bazel b/java/client/src/org/openqa/selenium/edge/edgehtml/BUILD.bazel
@@ -14,6 +14,5 @@ java_export(
         "//java:auto-service",
         "//java/client/src/org/openqa/selenium/edge:edgeium",
         "//java/client/src/org/openqa/selenium/remote",
-        artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/client/src/org/openqa/selenium/edge/edgehtml/EdgeHtmlDriverService.java b/java/client/src/org/openqa/selenium/edge/edgehtml/EdgeHtmlDriverService.java
@@ -16,8 +16,9 @@
 // under the License.
 package org.openqa.selenium.edge.edgehtml;
 
+import static java.util.Collections.unmodifiableList;
+
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableList;
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
@@ -30,6 +31,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -107,14 +109,14 @@ protected File findDefaultExecutable() {
 
     @Override
     protected List<String> createArgs() {
-      ImmutableList.Builder<String> argsBuilder = ImmutableList.builder();
-      argsBuilder.add(String.format("--port=%d", getPort()));
+      List<String> args = new ArrayList<>();
+      args.add(String.format("--port=%d", getPort()));
 
       if (verbose) {
-        argsBuilder.add("--verbose");
+        args.add("--verbose");
       }
 
-      return argsBuilder.build();
+      return unmodifiableList(args);
     }
 
     @Override

diff --git a/java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java b/java/client/src/org/openqa/selenium/firefox/GeckoDriverService.java
@@ -18,10 +18,10 @@
 package org.openqa.selenium.firefox;
 
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Collections.unmodifiableList;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableList;
 import com.google.common.io.ByteStreams;
 
 import org.openqa.selenium.Capabilities;
@@ -34,6 +34,7 @@
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -189,13 +190,13 @@ protected File findDefaultExecutable() {
 
     @Override
     protected List<String> createArgs() {
-      ImmutableList.Builder<String> argsBuilder = ImmutableList.builder();
-      argsBuilder.add(String.format("--port=%d", getPort()));
+      List<String> args = new ArrayList<>();
+      args.add(String.format("--port=%d", getPort()));
       if (firefoxBinary != null) {
-        argsBuilder.add("-b");
-        argsBuilder.add(firefoxBinary.getPath());
+        args.add("-b");
+        args.add(firefoxBinary.getPath());
       } // else GeckoDriver will be responsible for finding Firefox on the PATH or via a capability.
-      return argsBuilder.build();
+      return unmodifiableList(args);
     }
 
     @Override

diff --git a/java/client/src/org/openqa/selenium/ie/InternetExplorerDriverService.java b/java/client/src/org/openqa/selenium/ie/InternetExplorerDriverService.java
@@ -17,8 +17,9 @@
 
 package org.openqa.selenium.ie;
 
+import static java.util.Collections.unmodifiableList;
+
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableList;
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
@@ -28,6 +29,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -204,25 +206,25 @@ protected List<String> createArgs() {
         }
       }
 
-      ImmutableList.Builder<String> argsBuilder = ImmutableList.builder();
-      argsBuilder.add(String.format("--port=%d", getPort()));
+      List<String> args = new ArrayList<>();
+      args.add(String.format("--port=%d", getPort()));
       if (getLogFile() != null) {
-        argsBuilder.add(String.format("--log-file=\"%s\"", getLogFile().getAbsolutePath()));
+        args.add(String.format("--log-file=\"%s\"", getLogFile().getAbsolutePath()));
       }
       if (logLevel != null) {
-        argsBuilder.add(String.format("--log-level=%s", logLevel.toString()));
+        args.add(String.format("--log-level=%s", logLevel.toString()));
       }
       if (host != null) {
-        argsBuilder.add(String.format("--host=%s", host));
+        args.add(String.format("--host=%s", host));
       }
       if (extractPath != null) {
-        argsBuilder.add(String.format("--extract-path=\"%s\"", extractPath.getAbsolutePath()));
+        args.add(String.format("--extract-path=\"%s\"", extractPath.getAbsolutePath()));
       }
       if (silent != null && silent.equals(Boolean.TRUE)) {
-        argsBuilder.add("--silent");
+        args.add("--silent");
       }
 
-      return argsBuilder.build();
+      return unmodifiableList(args);
     }
 
     @Override

diff --git a/java/client/src/org/openqa/selenium/ie/InternetExplorerOptions.java b/java/client/src/org/openqa/selenium/ie/InternetExplorerOptions.java
@@ -17,6 +17,7 @@
 
 package org.openqa.selenium.ie;
 
+import static java.util.stream.Collectors.toUnmodifiableList;
 import static org.openqa.selenium.ie.InternetExplorerDriver.BROWSER_ATTACH_TIMEOUT;
 import static org.openqa.selenium.ie.InternetExplorerDriver.ELEMENT_SCROLL_BEHAVIOR;
 import static org.openqa.selenium.ie.InternetExplorerDriver.ENABLE_PERSISTENT_HOVERING;
@@ -32,7 +33,6 @@
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
 
 import com.google.common.base.Preconditions;
-import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSortedSet;
 import com.google.common.collect.Streams;
 
@@ -163,7 +163,7 @@ public InternetExplorerOptions addCommandSwitches(String... switches) {
         Streams.concat((Stream<?>) List.class.cast(raw).stream(), Stream.of(switches))
             .filter(i -> i instanceof String)
             .map(String.class::cast)
-            .collect(ImmutableList.toImmutableList()));
+            .collect(toUnmodifiableList()));
   }
 
   /**

diff --git a/java/client/src/org/openqa/selenium/opera/OperaDriverService.java b/java/client/src/org/openqa/selenium/opera/OperaDriverService.java
@@ -17,8 +17,9 @@
 
 package org.openqa.selenium.opera;
 
+import static java.util.Collections.unmodifiableList;
+
 import com.google.auto.service.AutoService;
-import com.google.common.collect.ImmutableList;
 
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.WebDriverException;
@@ -28,6 +29,7 @@
 import java.io.File;
 import java.io.IOException;
 import java.time.Duration;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -168,19 +170,19 @@ protected List<String> createArgs() {
         }
       }
 
-      ImmutableList.Builder<String> argsBuilder = ImmutableList.builder();
-      argsBuilder.add(String.format("--port=%d", getPort()));
+      List<String> args = new ArrayList<>();
+      args.add(String.format("--port=%d", getPort()));
       if (getLogFile() != null) {
-        argsBuilder.add(String.format("--log-path=%s", getLogFile().getAbsolutePath()));
+        args.add(String.format("--log-path=%s", getLogFile().getAbsolutePath()));
       }
       if (verbose) {
-        argsBuilder.add("--verbose");
+        args.add("--verbose");
       }
       if (silent) {
-        argsBuilder.add("--silent");
+        args.add("--silent");
       }
 
-      return argsBuilder.build();
+      return unmodifiableList(args);
     }
 
     @Override

diff --git a/java/client/src/org/openqa/selenium/opera/OperaOptions.java b/java/client/src/org/openqa/selenium/opera/OperaOptions.java
@@ -19,10 +19,11 @@
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
+import static java.util.Collections.unmodifiableList;
+import static java.util.Collections.unmodifiableMap;
 import static org.openqa.selenium.remote.BrowserType.OPERA_BLINK;
 import static org.openqa.selenium.remote.CapabilityType.BROWSER_NAME;
 
-import com.google.common.collect.ImmutableList;
 import com.google.common.io.Files;
 
 import org.openqa.selenium.remote.AbstractDriverOptions;
@@ -32,8 +33,8 @@
 import java.io.File;
 import java.io.IOException;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.Base64;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -110,7 +111,7 @@ public OperaOptions setBinary(String path) {
    * @see #addArguments(java.util.List)
    */
   public OperaOptions addArguments(String... arguments) {
-    addArguments(ImmutableList.copyOf(arguments));
+    addArguments(Arrays.asList(arguments));
     return this;
   }
 
@@ -139,7 +140,7 @@ public OperaOptions addArguments(List<String> arguments) {
    * @see #addExtensions(java.util.List)
    */
   public OperaOptions addExtensions(File... paths) {
-    addExtensions(ImmutableList.copyOf(paths));
+    addExtensions(Arrays.asList(paths));
     return this;
   }
 
@@ -165,7 +166,7 @@ public OperaOptions addExtensions(List<File> paths) {
    * @see #addEncodedExtensions(java.util.List)
    */
   public OperaOptions addEncodedExtensions(String... encoded) {
-    addEncodedExtensions(ImmutableList.copyOf(encoded));
+    addEncodedExtensions(Arrays.asList(encoded));
     return this;
   }
 
@@ -220,7 +221,7 @@ public Map<String, Object> asMap() {
       options.put("binary", binary);
     }
 
-    options.put("args", ImmutableList.copyOf(args));
+    options.put("args", unmodifiableList(new ArrayList<>(args)));
 
     List<String> encoded_extensions = new ArrayList<>(
         extensionFiles.size() + extensions.size());
@@ -234,10 +235,10 @@ public Map<String, Object> asMap() {
       }
     }
     encoded_extensions.addAll(extensions);
-    options.put("extensions", encoded_extensions);
+    options.put("extensions", unmodifiableList(encoded_extensions));
 
     toReturn.put(CAPABILITY, options);
 
-    return Collections.unmodifiableMap(toReturn);
+    return unmodifiableMap(toReturn);
   }
 }