[grid] Avoid memoizing Distributor status for GraphQL queries

Fixes #9421

Author: pujagani

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

@@ -17,7 +17,6 @@
 
 package org.openqa.selenium.grid.graphql;
 
-import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
 import org.openqa.selenium.Capabilities;
 import org.openqa.selenium.ImmutableCapabilities;
@@ -37,14 +36,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
 public class Grid {
 
   private static final Json JSON = new Json();
   private final URI uri;
-  private final Supplier<DistributorStatus> distributorStatus;
+  private final DistributorStatus distributorStatus;
   private final List<Set<Capabilities>> queueInfoList;
   private final String version;
 
@@ -61,7 +59,7 @@ public Grid(
       .stream()
       .map(SessionRequestCapability::getDesiredCapabilities)
       .collect(Collectors.toList());
-    this.distributorStatus = Suppliers.memoize(distributor::getStatus);
+    this.distributorStatus = distributor.getStatus();
     this.version = Require.nonNull("Grid's version", version);
   }
 
@@ -76,7 +74,7 @@ public String getVersion() {
   public List<Node> getNodes() {
     ImmutableList.Builder<Node> toReturn = ImmutableList.builder();
 
-    for (NodeStatus status : distributorStatus.get().getNodes()) {
+    for (NodeStatus status : distributorStatus.getNodes()) {
       Map<Capabilities, Integer> stereotypes = new HashMap<>();
       Map<org.openqa.selenium.grid.data.Session, Slot> sessions = new HashMap<>();
 
@@ -112,11 +110,11 @@ public List<Node> getNodes() {
   }
 
   public int getNodeCount() {
-    return distributorStatus.get().getNodes().size();
+    return distributorStatus.getNodes().size();
   }
 
   public int getSessionCount() {
-    return distributorStatus.get().getNodes().stream()
+    return distributorStatus.getNodes().stream()
       .map(NodeStatus::getSlots)
       .flatMap(Collection::stream)
       .filter(slot -> slot.getSession()!=null)
@@ -125,13 +123,13 @@ public int getSessionCount() {
   }
 
   public int getTotalSlots() {
-    return distributorStatus.get().getNodes().stream()
+    return distributorStatus.getNodes().stream()
       .mapToInt(status -> status.getSlots().size())
       .sum();
   }
 
   public int getMaxSession() {
-    return distributorStatus.get().getNodes().stream()
+    return distributorStatus.getNodes().stream()
       .mapToInt(NodeStatus::getMaxSessionCount)
       .sum();
   }
@@ -150,7 +148,7 @@ public List<String> getSessionQueueRequests() {
 
   public List<Session> getSessions() {
     List<Session> sessions = new ArrayList<>();
-    for (NodeStatus status : distributorStatus.get().getNodes()) {
+    for (NodeStatus status : distributorStatus.getNodes()) {
       for (Slot slot : status.getSlots()) {
         if (slot.getSession()!=null) {
           org.openqa.selenium.grid.data.Session session = slot.getSession();

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

@@ -17,24 +17,21 @@
 
 package org.openqa.selenium.grid.graphql;
 
-import com.google.common.base.Suppliers;
 import graphql.schema.DataFetcher;
 import graphql.schema.DataFetchingEnvironment;
-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.Set;
-import java.util.function.Supplier;
 
 public class SessionData implements DataFetcher {
 
-  private final Supplier<DistributorStatus> distributorStatus;
+  private final Distributor distributor;
 
   public SessionData(Distributor distributor) {
-    distributorStatus = Suppliers.memoize(Require.nonNull("Distributor", distributor)::getStatus);
+    this.distributor = Require.nonNull("Distributor", distributor);
   }
 
   @Override
@@ -45,7 +42,7 @@ public Object get(DataFetchingEnvironment environment) {
       throw new SessionNotFoundException("Session id is empty. A valid session id is required.");
     }
 
-    Set<NodeStatus> nodeStatuses = distributorStatus.get().getNodes();
+    Set<NodeStatus> nodeStatuses = distributor.getStatus().getNodes();
 
     SessionInSlot currentSession = findSession(sessionId, nodeStatuses);
 
@@ -62,7 +59,7 @@ public Object get(DataFetchingEnvironment environment) {
         currentSession.slot);
     } else {
       throw new SessionNotFoundException("No ongoing session found with the requested session id.",
-                                         sessionId);
+        sessionId);
     }
   }