Finishing removing duplicate accessor method

Author: shs96c

java/server/src/org/openqa/selenium/grid/data/NodeStatus.java

@@ -242,18 +242,10 @@ public long getLastSessionCreated() {
       .orElse(0);
   }
 
-  public Duration heartbeatPeriod() {
-    return heartbeatPeriod;
-  }
-
   public void touch() {
     touched = System.currentTimeMillis();
   }
 
-  public long touched() {
-    return touched;
-  }
-
   @Override
   public boolean equals(Object o) {
     if (!(o instanceof NodeStatus)) {

java/server/src/org/openqa/selenium/grid/distributor/gridmodel/local/LocalGridModel.java

@@ -168,13 +168,13 @@ public void purgeDeadNodes() {
     writeLock.lock();
     try {
       Set<NodeStatus> lost = nodes(UP).stream()
-        .filter(status -> now - status.touched() > status.getHeartbeatPeriod().toMillis() * 2)
+        .filter(status -> now - status.getTouched() > status.getHeartbeatPeriod().toMillis() * 2)
         .collect(toSet());
       Set<NodeStatus> resurrected = nodes(DOWN).stream()
-        .filter(status -> now - status.touched() <= status.getHeartbeatPeriod().toMillis())
+        .filter(status -> now - status.getTouched() <= status.getHeartbeatPeriod().toMillis())
         .collect(toSet());
       Set<NodeStatus> dead = nodes(DOWN).stream()
-        .filter(status -> now - status.touched() > status.getHeartbeatPeriod().toMillis() * 4)
+        .filter(status -> now - status.getTouched() > status.getHeartbeatPeriod().toMillis() * 4)
         .collect(toSet());
       if (lost.size() > 0) {
         LOG.info(String.format(

java/server/src/org/openqa/selenium/grid/distributor/gridmodel/redis/RedisGridModel.java

@@ -153,17 +153,17 @@ public void purgeDeadNodes() {
       Set<NodeId> up = redisClient.getNodesByAvailability(UP);
       Set<NodeStatus> upNodes = redisClient.getNodes(up);
       Set<NodeStatus> lost = upNodes.stream()
-        .filter(status -> now - status.touched() > status.heartbeatPeriod().toMillis() * 2)
+        .filter(status -> now - status.getTouched() > status.getHeartbeatPeriod().toMillis() * 2)
         .collect(toSet());
 
       Set<NodeId> down = redisClient.getNodesByAvailability(DOWN);
       Set<NodeStatus> downNodes = redisClient.getNodes(down);
       Set<NodeStatus> resurrected = downNodes.stream()
-        .filter(status -> now - status.touched() <= status.heartbeatPeriod().toMillis())
+        .filter(status -> now - status.getTouched() <= status.getHeartbeatPeriod().toMillis())
         .collect(toSet());
 
       Set<NodeStatus> dead = downNodes.stream()
-        .filter(status -> now - status.touched() > status.heartbeatPeriod().toMillis() * 4)
+        .filter(status -> now - status.getTouched() > status.getHeartbeatPeriod().toMillis() * 4)
         .collect(toSet());
 
       if (lost.size() > 0) {
@@ -425,7 +425,7 @@ public void amend(Availability availability, NodeStatus status, Slot slot) {
       status.getMaxSessionCount(),
       newSlots,
       status.getAvailability(),
-      status.heartbeatPeriod(),
+      status.getHeartbeatPeriod(),
       status.getVersion(),
       status.getOsInfo());
     redisClient.addNode(updatedStatus);
@@ -440,7 +440,7 @@ public NodeStatus rewrite(NodeStatus status, Availability availability) {
       status.getMaxSessionCount(),
       status.getSlots(),
       availability,
-      status.heartbeatPeriod(),
+      status.getHeartbeatPeriod(),
       status.getVersion(),
       status.getOsInfo());
   }

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

@@ -131,7 +131,7 @@ public HttpResponse execute(HttpRequest req) {
           .put("uri", node.getExternalUri())
           .put("maxSessions", node.getMaxSessionCount())
           .put("osInfo", node.getOsInfo())
-          .put("heartbeatPeriod", node.heartbeatPeriod().toMillis())
+          .put("heartbeatPeriod", node.getHeartbeatPeriod().toMillis())
           .put("availability", node.getAvailability())
           .put("version", node.getVersion())
           .put("slots", node.getSlots())