[java] remove guava from client bindings #12737

SeleniumHQ · Mar 26, 2024 · b2f4ae5 · b2f4ae5
1 parent 907b219
commit b2f4ae5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/java/src/org/openqa/selenium/support/ui/BUILD.bazel b/java/src/org/openqa/selenium/support/ui/BUILD.bazel
@@ -1,4 +1,3 @@
-load("@rules_jvm_external//:defs.bzl", "artifact")
 load("//java:defs.bzl", "java_library")
 
 java_library(
@@ -57,6 +56,5 @@ java_library(
         ":clock",
         "//java/src/org/openqa/selenium:core",
         "//java/src/org/openqa/selenium/remote",
-        artifact("com.google.guava:guava"),
     ],
 )
diff --git a/java/src/org/openqa/selenium/support/ui/ExpectedCondition.java b/java/src/org/openqa/selenium/support/ui/ExpectedCondition.java
@@ -17,7 +17,7 @@
 
 package org.openqa.selenium.support.ui;
 
-import com.google.common.base.Function;
+import java.util.function.Function;
 import org.openqa.selenium.WebDriver;
 
 /**
@@ -31,8 +31,4 @@
  *
  * @param <T> The return type
  */
-// NB: this originally extended Guava's Function interface since Java didn't have one. To avoid code
-// such as "com.google.common.base.Function condition = ExpectedConditions.elementFound(By);"
-// breaking at compile time, we continue to extend Guava's Function interface.
-public interface ExpectedCondition<T>
-    extends Function<WebDriver, T>, java.util.function.Function<WebDriver, T> {}
+public interface ExpectedCondition<T> extends Function<WebDriver, T> {}
diff --git a/java/src/org/openqa/selenium/support/ui/ExpectedConditions.java b/java/src/org/openqa/selenium/support/ui/ExpectedConditions.java
@@ -17,11 +17,12 @@
 
 package org.openqa.selenium.support.ui;
 
-import com.google.common.base.Joiner;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import org.openqa.selenium.Alert;
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
@@ -1415,9 +1416,8 @@ public Boolean apply(WebDriver driver) {
 
       @Override
       public String toString() {
-        StringBuilder message = new StringBuilder("at least one condition to be valid: ");
-        Joiner.on(" || ").appendTo(message, conditions);
-        return message.toString();
+        return "at least one condition to be valid: "
+            + Arrays.stream(conditions).map(Objects::toString).collect(Collectors.joining(" || "));
       }
     };
   }
@@ -1452,9 +1452,8 @@ public Boolean apply(WebDriver driver) {
 
       @Override
       public String toString() {
-        StringBuilder message = new StringBuilder("all conditions to be valid: ");
-        Joiner.on(" && ").appendTo(message, conditions);
-        return message.toString();
+        return "all conditions to be valid: "
+            + Arrays.stream(conditions).map(Objects::toString).collect(Collectors.joining(" && "));
       }
     };
   }