[grid] Adding stereotypes to the Node schema

Author: diemol

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

@@ -66,23 +66,23 @@ public List<Node> getNodes() {
     ImmutableList.Builder<Node> toReturn = ImmutableList.builder();
 
     for (NodeStatus status : distributorStatus.get().getNodes()) {
-      Map<Capabilities, Integer> capabilities = new HashMap<>();
+      Map<Capabilities, Integer> stereotypes = new HashMap<>();
       Map<org.openqa.selenium.grid.data.Session, Slot> sessions = new HashMap<>();
 
       for (Slot slot : status.getSlots()) {
         slot.getSession().ifPresent(session -> sessions.put(session, slot));
 
-        int count = capabilities.getOrDefault(slot.getStereotype(), 0);
+        int count = stereotypes.getOrDefault(slot.getStereotype(), 0);
         count++;
-        capabilities.put(slot.getStereotype(), count);
+        stereotypes.put(slot.getStereotype(), count);
       }
 
       toReturn.add(new Node(
         status.getId(),
         status.getUri(),
         status.getAvailability(),
         status.getMaxSessionCount(),
-        capabilities,
+        stereotypes,
         sessions,
         status.getVersion()));
     }

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

@@ -39,7 +39,7 @@ public class Node {
   private final URI uri;
   private final Availability status;
   private final int maxSession;
-  private final Map<Capabilities, Integer> capabilities;
+  private final Map<Capabilities, Integer> stereotypes;
   private final Map<Session, Slot> activeSessions;
   private final String version;
 
@@ -48,22 +48,26 @@ public Node(NodeId id,
               URI uri,
               Availability status,
               int maxSession,
-              Map<Capabilities, Integer> capabilities,
+              Map<Capabilities, Integer> stereotypes,
               Map<Session, Slot> activeSessions,
               String version) {
     this.id = Require.nonNull("Node id", id);
     this.uri = Require.nonNull("Node uri", uri);
     this.status = status;
     this.maxSession = maxSession;
-    this.capabilities = Require.nonNull("Node capabilities", capabilities);
+    this.stereotypes = Require.nonNull("Node stereotypes", stereotypes);
     this.activeSessions = Require.nonNull("Active sessions", activeSessions);
     this.version = Require.nonNull("Grid Node version", version);
   }
 
   public List<org.openqa.selenium.grid.graphql.Session> getSessions() {
     return activeSessions.entrySet().stream()
-        .map(this::createGraphqlSession)
-        .collect(ImmutableList.toImmutableList());
+      .map(this::createGraphqlSession)
+      .collect(ImmutableList.toImmutableList());
+  }
+
+  public int getSessionCount() {
+    return activeSessions.size();
   }
 
   public NodeId getId() {
@@ -80,15 +84,15 @@ public int getMaxSession() {
 
   public List<String> getActiveSessionIds() {
     return activeSessions.keySet().stream().map(session -> session.getId().toString())
-        .collect(ImmutableList.toImmutableList());
+      .collect(ImmutableList.toImmutableList());
   }
 
-  public String getCapabilities() {
-    List<Map<String, Object> > toReturn = new ArrayList<>();
+  public String getStereotypes() {
+    List<Map<String, Object>> toReturn = new ArrayList<>();
 
-    for (Map.Entry<Capabilities, Integer> entry : capabilities.entrySet()) {
-      Map<String, Object> details  = new HashMap<>();
-      details.put("browserName", entry.getKey().getBrowserName());
+    for (Map.Entry<Capabilities, Integer> entry : stereotypes.entrySet()) {
+      Map<String, Object> details = new HashMap<>();
+      details.put("stereotype", entry.getKey());
       details.put("slots", entry.getValue());
       toReturn.add(details);
     }
@@ -105,18 +109,18 @@ public String getVersion() {
   }
 
   private org.openqa.selenium.grid.graphql.Session createGraphqlSession(
-      Map.Entry<Session, Slot> entry) {
+    Map.Entry<Session, Slot> entry) {
     Session session = entry.getKey();
     Slot slot = entry.getValue();
 
     return new org.openqa.selenium.grid.graphql.Session(
-        session.getId().toString(),
-        session.getCapabilities(),
-        session.getStartTime(),
-        session.getUri(),
-        id.toString(),
-        uri,
-        slot
+      session.getId().toString(),
+      session.getCapabilities(),
+      session.getStartTime(),
+      session.getUri(),
+      id.toString(),
+      uri,
+      slot
     );
   }
 }

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

@@ -33,7 +33,8 @@ type Node {
   status: Status!
   maxSession: Int!
   sessions: [Session]!
-  capabilities: String!
+  sessionCount: Int!
+  stereotypes: String!
   version: String!
 }
 
@@ -51,4 +52,4 @@ type Grid {
   version: String!
   sessionQueueSize: Int!
   sessionQueueRequests: [String]!
-  }
+}