Replace Guava Lists/Sets/Maps/Iterables with plain Java 8

Author: valfirst

java/client/src/com/thoughtworks/selenium/HttpCommandProcessor.java

@@ -19,8 +19,6 @@
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
-import com.google.common.collect.Lists;
-
 import org.openqa.selenium.net.Urls;
 
 import java.io.BufferedWriter;
@@ -32,9 +30,9 @@
 import java.net.ConnectException;
 import java.net.HttpURLConnection;
 import java.net.URL;
-import java.nio.charset.StandardCharsets;
 import java.text.NumberFormat;
 import java.text.ParseException;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
@@ -299,7 +297,7 @@ public String[] getStringArray(String commandName, String[] args) {
    * @return the string array resulting from parsing this string
    */
   public static String[] parseCSV(String input) {
-    List<String> output = Lists.newArrayList();
+    List<String> output = new ArrayList<>();
     StringBuffer sb = new StringBuffer();
     for (int i = 0; i < input.length(); i++) {
       char c = input.charAt(i);

java/client/src/com/thoughtworks/selenium/webdriven/CompoundMutator.java

@@ -17,8 +17,7 @@
 
 package com.thoughtworks.selenium.webdriven;
 
-import com.google.common.collect.Lists;
-
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -28,7 +27,7 @@
  */
 public class CompoundMutator implements ScriptMutator {
   // The ordering of mutators matters
-  private final List<ScriptMutator> mutators = Lists.newArrayList();
+  private final List<ScriptMutator> mutators = new ArrayList<>();
 
   public CompoundMutator(String baseUrl) {
     addMutator(new VariableDeclaration("selenium", "var selenium = {};"));

java/client/src/com/thoughtworks/selenium/webdriven/ElementFinder.java

@@ -18,7 +18,6 @@
 package com.thoughtworks.selenium.webdriven;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Maps;
 
 import com.thoughtworks.selenium.SeleniumException;
 
@@ -29,14 +28,15 @@
 import org.openqa.selenium.WebDriverException;
 import org.openqa.selenium.WebElement;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.logging.Logger;
 
 public class ElementFinder {
   private final static Logger log = Logger.getLogger(ElementFinder.class.getName());
   private final String findElement;
   private final String sizzle;
-  private final Map<String, String> additionalLocators = Maps.newHashMap();
+  private final Map<String, String> additionalLocators = new HashMap<>();
 
   @VisibleForTesting
   protected ElementFinder() {

java/client/src/com/thoughtworks/selenium/webdriven/WebDriverCommandProcessor.java

@@ -20,7 +20,6 @@
 import static org.openqa.selenium.remote.CapabilityType.SUPPORTS_JAVASCRIPT;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Maps;
 
 import com.thoughtworks.selenium.CommandProcessor;
 import com.thoughtworks.selenium.SeleniumException;
@@ -31,6 +30,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.internal.WrapsDriver;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.util.function.Supplier;
 
@@ -40,7 +40,7 @@
  */
 public class WebDriverCommandProcessor implements CommandProcessor, WrapsDriver {
 
-  private final Map<String, SeleneseCommand<?>> seleneseMethods = Maps.newHashMap();
+  private final Map<String, SeleneseCommand<?>> seleneseMethods = new HashMap<>();
   private final String baseUrl;
   private final Timer timer;
   private final CompoundMutator scriptMutator;

java/client/src/com/thoughtworks/selenium/webdriven/Windows.java

@@ -17,8 +17,6 @@
 
 package com.thoughtworks.selenium.webdriven;
 
-import com.google.common.collect.Maps;
-
 import com.thoughtworks.selenium.SeleniumException;
 
 import org.openqa.selenium.JavascriptExecutor;
@@ -27,12 +25,13 @@
 import org.openqa.selenium.WebDriver;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
 public class Windows {
-  private final Map<String, String> lastFrame = Maps.newHashMap();
+  private final Map<String, String> lastFrame = new HashMap<>();
   private final String originalWindowHandle;
 
   public Windows(WebDriver driver) {

java/client/src/com/thoughtworks/selenium/webdriven/commands/SeleniumSelect.java

@@ -17,8 +17,6 @@
 
 package com.thoughtworks.selenium.webdriven.commands;
 
-import com.google.common.collect.Lists;
-
 import com.thoughtworks.selenium.SeleniumException;
 import com.thoughtworks.selenium.webdriven.ElementFinder;
 import com.thoughtworks.selenium.webdriven.JavascriptLibrary;
@@ -28,6 +26,7 @@
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 
+import java.util.ArrayList;
 import java.util.List;
 
 public class SeleniumSelect {
@@ -86,7 +85,7 @@ public void removeSelection(String optionLocator) {
   }
 
   public List<WebElement> getSelectedOptions() {
-    List<WebElement> toReturn = Lists.newArrayList();
+    List<WebElement> toReturn = new ArrayList<>();
 
     for (WebElement option : select.findElements(By.tagName("option"))) {
       if (option.isSelected()) {

java/client/src/org/openqa/selenium/chrome/ChromeOptions.java

@@ -25,8 +25,6 @@
 import static org.openqa.selenium.remote.CapabilityType.UNHANDLED_PROMPT_BEHAVIOUR;
 
 import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import com.google.common.io.Files;
 
 import org.openqa.selenium.Capabilities;
@@ -40,8 +38,10 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Base64;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
@@ -77,10 +77,10 @@ public class ChromeOptions extends MutableCapabilities {
   public static final String CAPABILITY = "goog:chromeOptions";
 
   private String binary;
-  private List<String> args = Lists.newArrayList();
-  private List<File> extensionFiles = Lists.newArrayList();
-  private List<String> extensions = Lists.newArrayList();
-  private Map<String, Object> experimentalOptions = Maps.newHashMap();
+  private List<String> args = new ArrayList<>();
+  private List<File> extensionFiles = new ArrayList<>();
+  private List<String> extensions = new ArrayList<>();
+  private Map<String, Object> experimentalOptions = new HashMap<>();
 
   public ChromeOptions() {
     setCapability(CapabilityType.BROWSER_NAME, BrowserType.CHROME);

java/client/src/org/openqa/selenium/firefox/FirefoxBinary.java

@@ -28,8 +28,6 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Iterables;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 
 import org.openqa.selenium.Platform;
 import org.openqa.selenium.WebDriverException;
@@ -45,7 +43,9 @@
 import java.io.OutputStream;
 import java.nio.file.Files;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
@@ -92,8 +92,8 @@ public static Channel fromString(String name) {
   private static final String PATH_PREFIX = "/" +
       FirefoxBinary.class.getPackage().getName().replace(".", "/") + "/";
 
-  private final Map<String, String> extraEnv = Maps.newHashMap();
-  private final List<String> extraOptions = Lists.newArrayList();
+  private final Map<String, String> extraEnv = new HashMap<>();
+  private final List<String> extraOptions = new ArrayList<>();
   private final Executable executable;
   private CommandLine process;
   private OutputStream stream;
@@ -160,7 +160,7 @@ public void setEnvironmentProperty(String propertyName, String value) {
   }
 
   public void addCommandLineOptions(String... options) {
-    extraOptions.addAll(Lists.newArrayList(options));
+    Collections.addAll(extraOptions, options);
   }
 
   void amendOptions(FirefoxOptions options) {
@@ -183,9 +183,9 @@ public void startProfile(FirefoxProfile profile, File profileDir, String... comm
       modifyLinkLibraryPath(profileDir);
     }
 
-    List<String> cmdArray = Lists.newArrayList();
+    List<String> cmdArray = new ArrayList<>();
     cmdArray.addAll(extraOptions);
-    cmdArray.addAll(Lists.newArrayList(commandLineFlags));
+    Collections.addAll(cmdArray, commandLineFlags);
     CommandLine command = new CommandLine(getPath(), Iterables.toArray(cmdArray, String.class));
     command.setEnvironmentVariables(getExtraEnv());
     command.updateDynamicLibraryPath(getExtraEnv().get(CommandLine.getLibraryPathPropertyName()));

java/client/src/org/openqa/selenium/firefox/FirefoxProfile.java

@@ -18,7 +18,6 @@
 package org.openqa.selenium.firefox;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Maps;
 import com.google.common.io.Resources;
 
 import org.openqa.selenium.Beta;
@@ -37,6 +36,7 @@
 import java.io.Reader;
 import java.io.StringReader;
 import java.net.URL;
+import java.util.HashMap;
 import java.util.Map;
 
 
@@ -48,7 +48,7 @@ public class FirefoxProfile {
 
   private Preferences additionalPrefs;
 
-  private Map<String, Extension> extensions = Maps.newHashMap();
+  private Map<String, Extension> extensions = new HashMap<>();
   private boolean loadNoFocusLib;
   private boolean acceptUntrustedCerts;
   private boolean untrustedCertIssuer;

java/client/src/org/openqa/selenium/firefox/Preferences.java

@@ -21,7 +21,6 @@
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.collect.Maps;
 import com.google.common.io.CharStreams;
 import com.google.common.io.Closeables;
 import com.google.common.io.LineReader;
@@ -34,6 +33,7 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.io.Writer;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -58,8 +58,8 @@ class Preferences {
   private static final Pattern PREFERENCE_PATTERN =
       Pattern.compile("user_pref\\(\"([^\"]+)\", (\"?.+?\"?)\\);");
 
-  private Map<String, Object> immutablePrefs = Maps.newHashMap();
-  private Map<String, Object> allPrefs = Maps.newHashMap();
+  private Map<String, Object> immutablePrefs = new HashMap<>();
+  private Map<String, Object> allPrefs = new HashMap<>();
 
   public Preferences(Reader defaults) {
     readDefaultPreferences(defaults);