Skip to content

Commit d3a167e

Browse files
joerg1985joerg1985
committed
[java] remove most usages of guava from the support package
1 parent 7e0f0c1 commit d3a167e

8 files changed

Lines changed: 44 additions & 32 deletions

File tree

‎java/src/org/openqa/selenium/support/events/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("@rules_jvm_external//:defs.bzl", "artifact")
21
load("//java:defs.bzl", "java_library")
32

43
java_library(
@@ -10,6 +9,5 @@ java_library(
109
deps = [
1110
"//java/src/org/openqa/selenium:core",
1211
"//java/src/org/openqa/selenium/support/decorators",
13-
artifact("com.google.guava:guava"),
1412
],
1513
)

‎java/src/org/openqa/selenium/support/events/EventFiringDecorator.java‎

Lines changed: 23 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
package org.openqa.selenium.support.events;
1919

20-
import com.google.common.primitives.Primitives;
2120
import java.lang.reflect.InvocationTargetException;
2221
import java.lang.reflect.Method;
2322
import java.util.Arrays;
@@ -316,7 +315,29 @@ private boolean parametersMatch(Method m, Object[] args) {
316315
return false;
317316
}
318317
for (int i = 0; i < params.length; i++) {
319-
if (args[i] != null && !Primitives.wrap(params[i]).isAssignableFrom(args[i].getClass())) {
318+
Class<?> param = params[i];
319+
if (param.isPrimitive()) {
320+
if (boolean.class.equals(param)) {
321+
param = Boolean.class;
322+
} else if (byte.class.equals(param)) {
323+
param = Byte.class;
324+
} else if (char.class.equals(param)) {
325+
param = Character.class;
326+
} else if (double.class.equals(param)) {
327+
param = Double.class;
328+
} else if (float.class.equals(param)) {
329+
param = Float.class;
330+
} else if (int.class.equals(param)) {
331+
param = Integer.class;
332+
} else if (long.class.equals(param)) {
333+
param = Long.class;
334+
} else if (short.class.equals(param)) {
335+
param = Short.class;
336+
} else if (void.class.equals(param)) {
337+
param = Void.class;
338+
}
339+
}
340+
if (args[i] != null && !param.isAssignableFrom(args[i].getClass())) {
320341
return false;
321342
}
322343
}

‎java/src/org/openqa/selenium/support/locators/BUILD.bazel‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
load("@rules_jvm_external//:defs.bzl", "artifact")
21
load("//common:defs.bzl", "copy_file")
32
load("//java:defs.bzl", "java_library")
43

@@ -16,7 +15,6 @@ java_library(
1615
"//java:auto-service",
1716
"//java/src/org/openqa/selenium/json",
1817
"//java/src/org/openqa/selenium/remote",
19-
artifact("com.google.guava:guava"),
2018
],
2119
)
2220

‎java/src/org/openqa/selenium/support/locators/RelativeLocator.java‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
import static org.openqa.selenium.json.Json.MAP_TYPE;
2121
import static org.openqa.selenium.support.locators.RelativeLocatorScript.FIND_ELEMENTS;
2222

23-
import com.google.common.collect.ImmutableList;
24-
import com.google.common.collect.ImmutableMap;
2523
import java.util.List;
2624
import java.util.Map;
25+
import java.util.stream.Collectors;
26+
import java.util.stream.Stream;
2727
import org.openqa.selenium.By;
2828
import org.openqa.selenium.JavascriptExecutor;
2929
import org.openqa.selenium.SearchContext;
@@ -82,7 +82,7 @@ public static class RelativeBy extends By implements By.Remotable {
8282
private final List<Map<String, Object>> filters;
8383

8484
private RelativeBy(Object rootLocator) {
85-
this(rootLocator, ImmutableList.of());
85+
this(rootLocator, List.of());
8686
}
8787

8888
private RelativeBy(Object rootLocator, List<Map<String, Object>> filters) {
@@ -100,7 +100,7 @@ private RelativeBy(Object rootLocator, List<Map<String, Object>> filters) {
100100
}
101101

102102
this.root = Require.nonNull("Root locator", rootLocator);
103-
this.filters = ImmutableList.copyOf(Require.nonNull("Filters", filters));
103+
this.filters = List.copyOf(Require.nonNull("Filters", filters));
104104
}
105105

106106
public RelativeBy above(WebElement element) {
@@ -178,11 +178,11 @@ private RelativeBy near(Object locator, int atMostDistanceInPixels) {
178178
return new RelativeBy(
179179
root,
180180
amend(
181-
ImmutableMap.of(
181+
Map.of(
182182
"kind",
183183
"near",
184184
"args",
185-
ImmutableList.of(asAtomLocatorParameter(locator), atMostDistanceInPixels))));
185+
List.of(asAtomLocatorParameter(locator), atMostDistanceInPixels))));
186186
}
187187

188188
@Override
@@ -200,24 +200,21 @@ private RelativeBy simpleDirection(String direction, Object locator) {
200200
Require.nonNull("Locator", locator);
201201

202202
return new RelativeBy(
203-
root,
204-
amend(
205-
ImmutableMap.of(
206-
"kind", direction, "args", ImmutableList.of(asAtomLocatorParameter(locator)))));
203+
root, amend(Map.of("kind", direction, "args", List.of(asAtomLocatorParameter(locator)))));
207204
}
208205

209206
private List<Map<String, Object>> amend(Map<String, Object> toAdd) {
210-
return ImmutableList.<Map<String, Object>>builder().addAll(filters).add(toAdd).build();
207+
return Stream.concat(filters.stream(), Stream.of(toAdd))
208+
.collect(Collectors.toUnmodifiableList());
211209
}
212210

213211
@Override
214212
public Parameters getRemoteParameters() {
215-
return new Parameters("relative", ImmutableMap.of("root", root, "filters", filters));
213+
return new Parameters("relative", Map.of("root", root, "filters", filters));
216214
}
217215

218216
private Map<String, Object> toJson() {
219-
return ImmutableMap.of(
220-
"using", "relative", "value", ImmutableMap.of("root", root, "filters", filters));
217+
return Map.of("using", "relative", "value", Map.of("root", root, "filters", filters));
221218
}
222219
}
223220

@@ -244,7 +241,7 @@ private static Object asAtomLocatorParameter(Object object) {
244241
"Expected JSON encoded form of locator to have a 'value' field: " + raw);
245242
}
246243

247-
return ImmutableMap.of((String) raw.get("using"), raw.get("value"));
244+
return Map.of((String) raw.get("using"), raw.get("value"));
248245
}
249246

250247
private static void assertLocatorCanBeSerialized(Object locator) {

‎java/src/org/openqa/selenium/support/locators/RelativeLocatorScript.java‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,9 @@
1717

1818
package org.openqa.selenium.support.locators;
1919

20-
import com.google.common.io.Resources;
2120
import java.io.IOException;
21+
import java.io.InputStream;
2222
import java.io.UncheckedIOException;
23-
import java.net.URL;
2423
import java.nio.charset.StandardCharsets;
2524

2625
class RelativeLocatorScript {
@@ -34,9 +33,11 @@ class RelativeLocatorScript {
3433
"/%s/%s",
3534
RelativeLocator.class.getPackage().getName().replace(".", "/"), "findElements.js");
3635

37-
URL url = RelativeLocator.class.getResource(location);
36+
String rawFunction;
37+
try (InputStream stream = RelativeLocator.class.getResourceAsStream(location)) {
38+
rawFunction = new String(stream.readAllBytes(), StandardCharsets.UTF_8);
39+
}
3840

39-
String rawFunction = Resources.toString(url, StandardCharsets.UTF_8);
4041
FIND_ELEMENTS =
4142
String.format("/* findElements */return (%s).apply(null, arguments);", rawFunction);
4243
} catch (IOException e) {

‎java/src/org/openqa/selenium/support/locators/RelativeLocatorServerSide.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
import static org.openqa.selenium.support.locators.RelativeLocatorScript.FIND_ELEMENTS;
2121

2222
import com.google.auto.service.AutoService;
23-
import com.google.common.collect.ImmutableMap;
2423
import java.util.List;
24+
import java.util.Map;
2525
import org.openqa.selenium.By;
2626
import org.openqa.selenium.InvalidArgumentException;
2727
import org.openqa.selenium.JavascriptExecutor;
@@ -64,8 +64,7 @@ public List<WebElement> findElements(SearchContext context) {
6464

6565
@SuppressWarnings("unchecked")
6666
List<WebElement> elements =
67-
(List<WebElement>)
68-
js.executeScript(FIND_ELEMENTS, ImmutableMap.of("relative", converted));
67+
(List<WebElement>) js.executeScript(FIND_ELEMENTS, Map.of("relative", converted));
6968
return elements;
7069
}
7170

‎java/src/org/openqa/selenium/support/ui/BUILD.bazel‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ java_library(
1111
"//java/test/org/openqa/selenium/support:__subpackages__",
1212
],
1313
deps = [
14-
artifact("com.google.guava:guava"),
1514
],
1615
)
1716

‎java/src/org/openqa/selenium/support/ui/FluentWait.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
package org.openqa.selenium.support.ui;
1919

2020
import com.google.common.base.Throwables;
21-
import com.google.common.collect.ImmutableList;
2221
import java.time.Clock;
2322
import java.time.Duration;
2423
import java.time.Instant;
@@ -163,7 +162,7 @@ public <K extends Throwable> FluentWait<T> ignoreAll(Collection<Class<? extends
163162
* @see #ignoreAll(Collection)
164163
*/
165164
public FluentWait<T> ignoring(Class<? extends Throwable> exceptionType) {
166-
return this.ignoreAll(ImmutableList.<Class<? extends Throwable>>of(exceptionType));
165+
return this.ignoreAll(List.<Class<? extends Throwable>>of(exceptionType));
167166
}
168167

169168
/**
@@ -175,7 +174,7 @@ public FluentWait<T> ignoring(Class<? extends Throwable> exceptionType) {
175174
public FluentWait<T> ignoring(
176175
Class<? extends Throwable> firstType, Class<? extends Throwable> secondType) {
177176

178-
return this.ignoreAll(ImmutableList.of(firstType, secondType));
177+
return this.ignoreAll(List.of(firstType, secondType));
179178
}
180179

181180
/**

0 commit comments

Comments
 (0)