Skip to content

Commit 8ea8077

Browse files
authored
[graphql] Add Node capabilities to Grid (#8449)
1 parent fab2f11 commit 8ea8077

3 files changed

Lines changed: 18 additions & 2 deletions

File tree

java/server/src/org/openqa/selenium/grid/graphql/Grid.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,11 @@ public URI getUri() {
4545

4646
public List<Node> getNodes() {
4747
return distributorStatus.get().getNodes().stream()
48-
.map(summary -> new Node(summary.getNodeId(), summary.getUri(), summary.isUp(), summary.getMaxSessionCount()))
48+
.map(summary -> new Node(summary.getNodeId(),
49+
summary.getUri(),
50+
summary.isUp(),
51+
summary.getMaxSessionCount(),
52+
summary.getStereotypes()))
4953
.collect(ImmutableList.toImmutableList());
5054
}
5155

java/server/src/org/openqa/selenium/grid/graphql/Node.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,12 @@
1717

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

20+
import org.openqa.selenium.Capabilities;
2021
import org.openqa.selenium.internal.Require;
22+
import org.openqa.selenium.json.Json;
2123

2224
import java.net.URI;
25+
import java.util.Map;
2326
import java.util.UUID;
2427

2528
public class Node {
@@ -28,12 +31,20 @@ public class Node {
2831
private final URI uri;
2932
private final boolean isUp;
3033
private final int maxSession;
34+
private final String capabilities;
35+
private static final Json JSON = new Json();
3136

32-
public Node(UUID id, URI uri, boolean isUp , int maxSession) {
37+
38+
public Node(UUID id,
39+
URI uri,
40+
boolean isUp,
41+
int maxSession,
42+
Map<Capabilities, Integer> capabilities) {
3343
this.id = Require.nonNull("Node id", id);
3444
this.uri = Require.nonNull("Node uri", uri);
3545
this.isUp = isUp;
3646
this.maxSession = Require.nonNull("Node maxSession", maxSession);
47+
this.capabilities = Require.nonNull("Node capabilities", JSON.toJson(capabilities));
3748
}
3849

3950
public UUID getId() {

java/server/src/org/openqa/selenium/grid/graphql/selenium-grid-schema.graphqls

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ type Node {
1515
uri: Uri!
1616
status: Status!
1717
maxSession: Int!
18+
capabilities: String!
1819
}
1920

2021
type GridQuery {

0 commit comments

Comments
 (0)