Skip to content

Commit e81bc1d

Browse files
pujaganipujagani
committed
[grid] Replace Guava set and map ins various Grid packages with Java equivalent
1 parent 55f02a9 commit e81bc1d

File tree

6 files changed

+34
-31
lines changed

6 files changed

+34
-31
lines changed

‎java/src/org/openqa/selenium/grid/router/GridStatusHandler.java‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,17 @@
2929
import static org.openqa.selenium.remote.tracing.Tags.HTTP_RESPONSE_EVENT;
3030

3131
import com.google.common.collect.ImmutableMap;
32+
33+
import java.util.Collections;
34+
import java.util.HashMap;
3235
import java.util.List;
3336
import java.util.Map;
3437
import java.util.concurrent.ExecutionException;
3538
import java.util.concurrent.ExecutorService;
3639
import java.util.concurrent.Executors;
3740
import java.util.concurrent.TimeoutException;
41+
import java.util.stream.Collectors;
42+
3843
import org.openqa.selenium.grid.data.DistributorStatus;
3944
import org.openqa.selenium.grid.distributor.Distributor;
4045
import org.openqa.selenium.internal.Require;
@@ -89,9 +94,9 @@ public HttpResponse execute(HttpRequest req) {
8994
new HttpResponse()
9095
.setContent(
9196
asJson(
92-
ImmutableMap.of(
97+
Map.of(
9398
"value",
94-
ImmutableMap.of(
99+
Map.of(
95100
"ready", false, "message", "Unable to read distributor status."))));
96101

97102
HTTP_RESPONSE.accept(span, response);
@@ -111,9 +116,9 @@ public HttpResponse execute(HttpRequest req) {
111116
new HttpResponse()
112117
.setContent(
113118
asJson(
114-
ImmutableMap.of(
119+
Map.of(
115120
"value",
116-
ImmutableMap.of(
121+
Map.of(
117122
"ready",
118123
false,
119124
"message",
@@ -136,19 +141,20 @@ public HttpResponse execute(HttpRequest req) {
136141
List<Map<String, Object>> nodeResults =
137142
status.getNodes().stream()
138143
.map(
139-
node ->
140-
new ImmutableMap.Builder<String, Object>()
141-
.put("id", node.getNodeId())
142-
.put("uri", node.getExternalUri())
143-
.put("maxSessions", node.getMaxSessionCount())
144-
.put("sessionTimeout", node.getSessionTimeout().toMillis())
145-
.put("osInfo", node.getOsInfo())
146-
.put("heartbeatPeriod", node.getHeartbeatPeriod().toMillis())
147-
.put("availability", node.getAvailability())
148-
.put("version", node.getVersion())
149-
.put("slots", node.getSlots())
150-
.build())
151-
.collect(toList());
144+
node -> {
145+
Map<String, Object> nodeMap = new HashMap<>();
146+
nodeMap.put("id", node.getNodeId());
147+
nodeMap.put("uri", node.getExternalUri());
148+
nodeMap.put("maxSessions", node.getMaxSessionCount());
149+
nodeMap.put("sessionTimeout", node.getSessionTimeout().toMillis());
150+
nodeMap.put("osInfo", node.getOsInfo());
151+
nodeMap.put("heartbeatPeriod", node.getHeartbeatPeriod().toMillis());
152+
nodeMap.put("availability", node.getAvailability());
153+
nodeMap.put("version", node.getVersion());
154+
nodeMap.put("slots", node.getSlots());
155+
return Collections.unmodifiableMap(nodeMap);
156+
})
157+
.collect(Collectors.toList());
152158

153159
ImmutableMap.Builder<String, Object> value = ImmutableMap.builder();
154160
value.put("ready", ready);

‎java/src/org/openqa/selenium/grid/router/Router.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
import static org.openqa.selenium.remote.http.Route.get;
2222
import static org.openqa.selenium.remote.http.Route.matching;
2323

24-
import com.google.common.collect.ImmutableSet;
2524
import java.io.Closeable;
25+
import java.util.Set;
26+
2627
import org.openqa.selenium.grid.distributor.Distributor;
2728
import org.openqa.selenium.grid.sessionmap.SessionMap;
2829
import org.openqa.selenium.grid.sessionqueue.NewSessionQueue;
@@ -71,7 +72,7 @@ public Router(
7172
@Override
7273
public boolean isReady() {
7374
try {
74-
return ImmutableSet.of(distributor, sessions, queue).parallelStream()
75+
return Set.of(distributor, sessions, queue).parallelStream()
7576
.map(HasReadyState::isReady)
7677
.reduce(true, Boolean::logicalAnd);
7778
} catch (RuntimeException e) {

‎java/src/org/openqa/selenium/grid/router/httpd/RouterServer.java‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,13 @@
2929
import static org.openqa.selenium.remote.http.Route.get;
3030

3131
import com.google.auto.service.AutoService;
32-
import com.google.common.collect.ImmutableMap;
33-
import com.google.common.collect.ImmutableSet;
3432
import java.io.Closeable;
3533
import java.io.IOException;
3634
import java.io.UncheckedIOException;
3735
import java.net.URL;
3836
import java.time.Duration;
3937
import java.util.Collections;
38+
import java.util.Map;
4039
import java.util.Set;
4140
import java.util.logging.Level;
4241
import java.util.logging.Logger;
@@ -94,7 +93,7 @@ public String getDescription() {
9493

9594
@Override
9695
public Set<Role> getConfigurableRoles() {
97-
return ImmutableSet.of(
96+
return Set.of(
9897
DISTRIBUTOR_ROLE, HTTPD_ROLE, ROUTER_ROLE, SESSION_MAP_ROLE, SESSION_QUEUE_ROLE);
9998
}
10099

@@ -110,7 +109,7 @@ protected String getSystemPropertiesConfigPrefix() {
110109

111110
@Override
112111
protected Config getDefaultConfig() {
113-
return new MapConfig(ImmutableMap.of("server", ImmutableMap.of("port", 4444)));
112+
return new MapConfig(Map.of("server", Map.of("port", 4444)));
114113
}
115114

116115
@Override

‎java/src/org/openqa/selenium/grid/security/RequiresSecretFilter.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
import static org.openqa.selenium.grid.security.AddSecretFilter.HEADER_NAME;
2222
import static org.openqa.selenium.json.Json.JSON_UTF_8;
2323

24-
import com.google.common.collect.ImmutableMap;
2524
import java.util.Collections;
25+
import java.util.Map;
2626
import java.util.logging.Logger;
2727
import org.openqa.selenium.internal.Require;
2828
import org.openqa.selenium.remote.http.Contents;
@@ -53,7 +53,7 @@ public HttpHandler apply(HttpHandler httpHandler) {
5353
Contents.asJson(
5454
Collections.singletonMap(
5555
"value",
56-
ImmutableMap.of(
56+
Map.of(
5757
"error", "unknown error",
5858
"message", "Unauthorized access attempted to ",
5959
"stacktrace", ""))));

‎java/src/org/openqa/selenium/grid/server/EventBusFlags.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
import com.beust.jcommander.Parameter;
2424
import com.google.auto.service.AutoService;
25-
import com.google.common.collect.ImmutableSet;
2625
import java.util.Set;
2726
import org.openqa.selenium.grid.config.ConfigValue;
2827
import org.openqa.selenium.grid.config.HasRoles;
@@ -67,6 +66,6 @@ public class EventBusFlags implements HasRoles {
6766

6867
@Override
6968
public Set<Role> getRoles() {
70-
return ImmutableSet.of(EVENT_BUS_ROLE);
69+
return Set.of(EVENT_BUS_ROLE);
7170
}
7271
}

‎java/src/org/openqa/selenium/grid/server/NetworkOptions.java‎

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

1818
package org.openqa.selenium.grid.server;
1919

20-
import com.google.common.collect.ImmutableList;
21-
import com.google.common.collect.ImmutableSet;
2220
import java.util.List;
2321
import java.util.Optional;
2422
import java.util.Set;
@@ -38,7 +36,7 @@ public class NetworkOptions {
3836

3937
private final Config config;
4038
// These are commonly used by process which can't set various headers.
41-
private final Set<String> SKIP_CHECKS_ON = ImmutableSet.of("/status", "/readyz");
39+
private final Set<String> SKIP_CHECKS_ON = Set.of("/status", "/readyz");
4240

4341
public NetworkOptions(Config config) {
4442
this.config = Require.nonNull("Config", config);
@@ -68,7 +66,7 @@ public Filter getSpecComplianceChecks() {
6866
if (checkOrigin || allowedOrigins.isPresent()) {
6967
toReturn =
7068
toReturn.andThen(
71-
new CheckOriginHeader(allowedOrigins.orElse(ImmutableList.of()), SKIP_CHECKS_ON));
69+
new CheckOriginHeader(allowedOrigins.orElse(List.of()), SKIP_CHECKS_ON));
7270
}
7371

7472
return toReturn;

0 commit comments

Comments
 (0)