From 78b7153032900d427b1c864bc71c014d13eff6b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Sautter?= Date: Tue, 26 Mar 2024 17:08:16 +0100 Subject: [PATCH] [java] remove guava from client bindings #12737 --- java/src/org/openqa/selenium/support/ui/BUILD.bazel | 1 - .../selenium/support/ui/ExpectedCondition.java | 5 ++--- .../selenium/support/ui/ExpectedConditions.java | 13 ++++++------- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/java/src/org/openqa/selenium/support/ui/BUILD.bazel b/java/src/org/openqa/selenium/support/ui/BUILD.bazel index 027a1e9a5310e..5b8dd0f75759a 100644 --- a/java/src/org/openqa/selenium/support/ui/BUILD.bazel +++ b/java/src/org/openqa/selenium/support/ui/BUILD.bazel @@ -56,7 +56,6 @@ java_library( ":clock", "//java/src/org/openqa/selenium:core", "//java/src/org/openqa/selenium/remote", - artifact("com.google.guava:guava"), artifact("org.jspecify:jspecify"), ], ) diff --git a/java/src/org/openqa/selenium/support/ui/ExpectedCondition.java b/java/src/org/openqa/selenium/support/ui/ExpectedCondition.java index 64924f661b888..d3409dac21e36 100644 --- 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.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; import org.openqa.selenium.WebDriver; @@ -37,5 +37,4 @@ // such as "com.google.common.base.Function condition = ExpectedConditions.elementFound(By);" // breaking at compile time, we continue to extend Guava's Function interface. @NullMarked -public interface ExpectedCondition - extends Function, java.util.function.Function {} +public interface ExpectedCondition extends Function {} diff --git a/java/src/org/openqa/selenium/support/ui/ExpectedConditions.java b/java/src/org/openqa/selenium/support/ui/ExpectedConditions.java index 4017888567ba6..bdb98c9c42cb5 100644 --- 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.jspecify.annotations.NullMarked; import org.jspecify.annotations.Nullable; import org.openqa.selenium.Alert; @@ -1421,9 +1422,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(" || ")); } }; } @@ -1458,9 +1458,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(" && ")); } }; }