Skip to content

[java] [refactor] replace most of Guava collections by Java built-in collections #16776

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
asolntsev merged 6 commits into from
Dec 25, 2025
Merged

[java] [refactor] replace most of Guava collections by Java built-in collections #16776

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
77265e4
[refactor] replace `Arrays.asList` by `List.of`
asolntsev Dec 21, 2025
3881023
[refactor] replace `ImmutableMap.of` by `Map.of`
asolntsev Dec 22, 2025
209972c
[refactor] replace `ImmutableList.of` by `List.of`
asolntsev Dec 22, 2025
e0bbd66
[refactor] replace `ImmutableSet.of` by `Set.of`
asolntsev Dec 22, 2025
496a2a6
use single imports instead of `import x.y.*`
asolntsev Dec 24, 2025
2cb00f7
Merge branch 'trunk' into refactor/old-java-collections
asolntsev Dec 25, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions java/src/org/openqa/selenium/Keys.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.openqa.selenium;

import java.util.Arrays;
import java.util.List;
import org.jspecify.annotations.NullMarked;
import org.jspecify.annotations.Nullable;

Expand Down Expand Up @@ -176,7 +176,7 @@ public String toString() {
* @return String representation of the char sequence
*/
public static String chord(CharSequence... value) {
return chord(Arrays.asList(value));
return chord(List.of(value));
}

/**
Expand Down
3 changes: 1 addition & 2 deletions java/src/org/openqa/selenium/Proxy.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

package org.openqa.selenium;

import java.util.Arrays;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
Expand Down Expand Up @@ -142,7 +141,7 @@ public Map<String, Object> toJson() {
m.put(HTTP_PROXY, httpProxy);
}
if (noProxy != null) {
m.put(NO_PROXY, Arrays.asList(noProxy.split(",\\s*")));
m.put(NO_PROXY, List.of(noProxy.split(",\\s*")));
}
if (sslProxy != null) {
m.put(SSL_PROXY, sslProxy);
Expand Down
16 changes: 12 additions & 4 deletions java/src/org/openqa/selenium/chromium/ChromiumOptions.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,15 @@
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.util.*;
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.Optional;
import java.util.Set;
import java.util.TreeMap;
import java.util.stream.Stream;
import org.openqa.selenium.Capabilities;
import org.openqa.selenium.SessionNotCreatedException;
Expand Down Expand Up @@ -98,7 +106,7 @@ public T setBinary(String path) {
* @see #addArguments(List)
*/
public T addArguments(String... arguments) {
addArguments(Arrays.asList(arguments));
addArguments(List.of(arguments));
return (T) this;
}

Expand Down Expand Up @@ -126,7 +134,7 @@ public T addArguments(List<String> arguments) {
* @see #addExtensions(List)
*/
public T addExtensions(File... paths) {
addExtensions(Arrays.asList(paths));
addExtensions(List.of(paths));
return (T) this;
}

Expand All @@ -147,7 +155,7 @@ public T addExtensions(List<File> paths) {
* @see #addEncodedExtensions(List)
*/
public T addEncodedExtensions(String... encoded) {
addEncodedExtensions(Arrays.asList(encoded));
addEncodedExtensions(List.of(encoded));
return (T) this;
}

Expand Down
Loading