[grid] Adding a field to GraphQL to retrieve all sessions

Author: diemol

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

@@ -56,10 +56,10 @@
 import static org.openqa.selenium.remote.http.Contents.utf8String;
 import static org.openqa.selenium.remote.http.HttpMethod.OPTIONS;
 import static org.openqa.selenium.remote.tracing.HttpTracing.newSpanAsChildOf;
-import static org.openqa.selenium.remote.tracing.Tags.HTTP_RESPONSE;
-import static org.openqa.selenium.remote.tracing.Tags.HTTP_RESPONSE_EVENT;
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST;
 import static org.openqa.selenium.remote.tracing.Tags.HTTP_REQUEST_EVENT;
+import static org.openqa.selenium.remote.tracing.Tags.HTTP_RESPONSE;
+import static org.openqa.selenium.remote.tracing.Tags.HTTP_RESPONSE_EVENT;
 
 public class GraphqlHandler implements HttpHandler {
 
@@ -177,12 +177,12 @@ private RuntimeWiring buildRuntimeWiring() {
       .scalar(Types.Uri)
       .scalar(Types.Url)
       .type("GridQuery", typeWiring -> typeWiring
-          .dataFetcher("grid", new GridData(
-            distributor,
-            newSessionQueuer,
-            publicUri,
-            version))
-          .dataFetcher("session", new SessionData(distributor)))
+        .dataFetcher("grid", new GridData(
+          distributor,
+          newSessionQueuer,
+          publicUri,
+          version))
+        .dataFetcher("session", new SessionData(distributor)))
       .build();
   }
 

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

@@ -29,6 +29,7 @@
 import org.openqa.selenium.json.Json;
 
 import java.net.URI;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
@@ -127,4 +128,26 @@ public List<String> getSessionQueueRequests() {
       .collect(Collectors.toList());
   }
 
+  public List<Session> getSessions() {
+    List<Session> sessions = new ArrayList<>();
+    for (NodeStatus status : distributorStatus.get().getNodes()) {
+      for (Slot slot : status.getSlots()) {
+        if (slot.getSession().isPresent()) {
+          org.openqa.selenium.grid.data.Session session = slot.getSession().get();
+          sessions.add(
+            new org.openqa.selenium.grid.graphql.Session(
+              session.getId().toString(),
+              session.getCapabilities(),
+              session.getStartTime(),
+              session.getUri(),
+              status.getId().toString(),
+              status.getUri(),
+              slot)
+          );
+        }
+      }
+    }
+    return sessions;
+  }
+
 }

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

@@ -18,40 +18,24 @@
 package org.openqa.selenium.grid.graphql;
 
 import com.google.common.base.Suppliers;
-
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
-
-import java.util.Optional;
-import java.util.Set;
-import java.util.function.Supplier;
-
 import org.openqa.selenium.grid.data.DistributorStatus;
 import org.openqa.selenium.grid.data.NodeStatus;
 import org.openqa.selenium.grid.data.Slot;
 import org.openqa.selenium.grid.distributor.Distributor;
 import org.openqa.selenium.internal.Require;
 
+import java.util.Optional;
+import java.util.Set;
+import java.util.function.Supplier;
+
 public class SessionData implements DataFetcher {
 
-  private final Distributor distributor;
   private final Supplier<DistributorStatus> distributorStatus;
 
   public SessionData(Distributor distributor) {
-    this.distributor = Require.nonNull("Distributor", distributor);
-    distributorStatus = Suppliers.memoize(distributor::getStatus);
-  }
-
-  private static class SessionInSlot {
-    private final org.openqa.selenium.grid.data.Session session;
-    private final NodeStatus node;
-    private final Slot slot;
-
-    SessionInSlot(org.openqa.selenium.grid.data.Session session, NodeStatus node, Slot slot) {
-      this.session = session;
-      this.node = node;
-      this.slot = slot;
-    }
+    distributorStatus = Suppliers.memoize(Require.nonNull("Distributor", distributor)::getStatus);
   }
 
   @Override
@@ -95,4 +79,16 @@ private SessionInSlot findSession(String sessionId, Set<NodeStatus> nodeStatuses
     }
     return null;
   }
+
+  private static class SessionInSlot {
+    private final org.openqa.selenium.grid.data.Session session;
+    private final NodeStatus node;
+    private final Slot slot;
+
+    SessionInSlot(org.openqa.selenium.grid.data.Session session, NodeStatus node, Slot slot) {
+      this.session = session;
+      this.node = node;
+      this.slot = slot;
+    }
+  }
 }

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

@@ -60,4 +60,5 @@ type Grid {
   version: String!
   sessionQueueSize: Int!
   sessionQueueRequests: [String]!
+  sessions: [Session]!
 }