From 9a425520c25c02a2101870d15ad32b42cf3d2900 Mon Sep 17 00:00:00 2001
From: Harald Musum <musum@yahooinc.com>
Date: Wed, 5 Jul 2023 13:01:30 +0200
Subject: Simplify

---
 .../yahoo/vespa/clustercontroller/core/EventLog.java  | 19 +++++++------------
 .../clustercontroller/core/EventLogInterface.java     |  2 +-
 .../vespa/clustercontroller/core/FleetController.java |  1 -
 .../clustercontroller/core/status/StatusHandler.java  |  1 -
 .../clustercontroller/core/mocks/TestEventLog.java    |  2 +-
 5 files changed, 9 insertions(+), 16 deletions(-)

(limited to 'clustercontroller-core')

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java
index 0203ae060d8..368b76ac8b5 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLog.java
@@ -34,15 +34,15 @@ public class EventLog implements EventLogInterface {
         this.metricUpdater = Objects.requireNonNull(metricUpdater, "metricUpdater must be non-null");
     }
 
-    public void setMaxSize(int size, int nodesize) {
-        if (size < 1 || nodesize < 1) {
+    public void setMaxSize(int size, int nodeSize) {
+        if (size < 1 || nodeSize < 1) {
             throw new IllegalArgumentException("Max size must be at least 1");
         }
         maxSize = size;
         while (eventLog.size() > maxSize) {
             eventLog.remove(0);
         }
-        maxNodeSize = nodesize;
+        maxNodeSize = nodeSize;
         for (List<NodeEvent> list : nodeLog.values()) {
             while (list.size() > maxNodeSize) {
                 list.remove(0);
@@ -71,11 +71,7 @@ public class EventLog implements EventLogInterface {
     public void addNodeOnlyEvent(NodeEvent e, java.util.logging.Level level) {
         log.log(level, "Added node only event: " + e.toString());
         metricUpdater.recordNewNodeEvent();
-        LinkedList<NodeEvent> nodeList = nodeLog.get(e.getNode().getNode());
-        if (nodeList == null) {
-            nodeList = new LinkedList<>();
-            nodeLog.put(e.getNode().getNode(), nodeList);
-        }
+        LinkedList<NodeEvent> nodeList = nodeLog.computeIfAbsent(e.getNode().getNode(), k -> new LinkedList<>());
         nodeList.add(e);
         if (nodeList.size() > maxNodeSize) {
             nodeList.remove(0);
@@ -125,8 +121,8 @@ public class EventLog implements EventLogInterface {
           .append("<tr><td>Date (").append(tz.getDisplayName(false, TimeZone.SHORT))
                 .append(")</td><td>Type</td><td>Node</td><td>Bucket space</td><td>Event</td></tr>\n");
         int nr = 0;
-        Iterator<Event> eventIterator = (events == null ? null : events.descendingIterator());
-        if (eventIterator != null) while (eventIterator.hasNext()) {
+        Iterator<Event> eventIterator = events.descendingIterator();
+        while (eventIterator.hasNext()) {
             Event e = eventIterator.next();
             String colStart = "<font color=\"" + (++nr > recentNodeEvents ? "grey" : "black") + "\">";
             String colEnd = "</font>";
@@ -134,8 +130,7 @@ public class EventLog implements EventLogInterface {
 
             addNobrTableCell(sb, colStart, colEnd, RealTimer.printDate(e.getTimeMs(), tz));
             addNobrTableCell(sb, colStart, colEnd, e.getCategory());
-            if (e instanceof NodeEvent) {
-                NodeEvent nodeEvent = (NodeEvent)e;
+            if (e instanceof NodeEvent nodeEvent) {
                 addNobrTableCell(sb, colStart, colEnd, nodeEvent.getNode().toString());
                 addNobrTableCell(sb, colStart, colEnd, nodeEvent.getBucketSpace().orElse(" - "));
             } else {
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLogInterface.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLogInterface.java
index e4538162f64..56644e711ed 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLogInterface.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/EventLogInterface.java
@@ -11,6 +11,6 @@ public interface EventLogInterface {
     int getNodeEventsSince(Node n, long time);
     long getRecentTimePeriod();
     void writeHtmlState(StringBuilder sb, Node node);
-    void setMaxSize(int size, int nodesize);
+    void setMaxSize(int size, int nodeSize);
 
 }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
index a5fa0d08bb8..715387fac01 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetController.java
@@ -253,7 +253,6 @@ public class FleetController implements NodeListener, SlobrokListener, SystemSta
         controllerThreadId = Thread.currentThread().getId();
         database.shutdown(databaseContext);
 
-        statusPageServer.shutdown();
         if (rpcServer != null) {
             rpcServer.shutdown();
         }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/StatusHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/StatusHandler.java
index 6ed121284b6..ba09a3f0f7a 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/StatusHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/StatusHandler.java
@@ -40,7 +40,6 @@ public class StatusHandler implements HttpRequestHandler {
         private final Object answerMonitor = new Object();
 
         public int getPort() { return 0; }
-        public void shutdown() {}
         public StatusPageServer.HttpRequest getCurrentHttpRequest() {
             synchronized (answerMonitor) {
                 StatusPageServer.HttpRequest r = request;
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/mocks/TestEventLog.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/mocks/TestEventLog.java
index e076c4af1e7..adbc53a583b 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/mocks/TestEventLog.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/mocks/TestEventLog.java
@@ -45,7 +45,7 @@ public class TestEventLog implements EventLogInterface {
     }
 
     @Override
-    public void setMaxSize(int size, int nodesize) {
+    public void setMaxSize(int size, int nodeSize) {
         throw new IllegalStateException("Should never be called.");
     }
 }
-- 
cgit v1.2.3