Simplify

3 files changed, 16 insertions, 13 deletions

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 f2ee626b60f..9c9e1042c79 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
@@ -124,8 +124,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
                            SystemStateBroadcaster systemStateBroadcaster,
                            MasterElectionHandler masterElectionHandler,
                            MetricUpdater metricUpdater,
-                           FleetControllerOptions options) throws Exception
-    {
+                           FleetControllerOptions options) {
         log.info("Starting up cluster controller " + options.fleetControllerIndex + " for cluster " + cluster.getName());
         this.timer = timer;
         this.monitor = timer;
@@ -452,7 +451,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
     }
 
     /** This is called when the options field has been set to a new set of options */
-    private void propagateOptions() throws java.io.IOException, ListenFailedException {
+    private void propagateOptions() {
         verifyInControllerThread();
 
         if (changesConfiguredNodeSet(options.nodes)) {
@@ -530,7 +529,7 @@ public class FleetController implements NodeStateOrHostInfoChangeHandler, NodeAd
         } catch (Exception e) {
             responseCode = StatusPageResponse.ResponseCode.INTERNAL_SERVER_ERROR;
             message = "Internal Server Error";
-            hiddenMessage = ExceptionUtils.getStackTraceAsString(e);;
+            hiddenMessage = ExceptionUtils.getStackTraceAsString(e);
             log.log(Level.FINE, "Unknown exception thrown for request " + httpRequest.getRequest() +
                     ": " + hiddenMessage);
         }
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java
index 553b3332ee8..2044eb1eab0 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/FleetControllerOptions.java
@@ -1,16 +1,20 @@
-// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Verizone Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.core;
 
 import com.yahoo.jrt.slobrok.api.BackOffPolicy;
 import com.yahoo.vdslib.distribution.ConfiguredNode;
 import com.yahoo.vdslib.distribution.Distribution;
 import com.yahoo.vdslib.state.NodeType;
-import com.yahoo.vespa.clustercontroller.core.status.statuspage.StatusPageServer;
 
-import java.time.Duration;
-import java.util.*;
 import java.text.DecimalFormat;
 import java.text.DecimalFormatSymbols;
+import java.time.Duration;
+import java.util.Collection;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TreeMap;
+import java.util.TreeSet;
 
 /**
  * This class represents all the options that can be set in the fleetcontroller.
@@ -30,7 +34,7 @@ public class FleetControllerOptions implements Cloneable {
     public int stateGatherCount = 2;
 
     // TODO: This cannot be null but nonnull is not verified
-    public String slobrokConnectionSpecs[];
+    public String[] slobrokConnectionSpecs;
     public int rpcPort = 0;
     public int httpPort = 0;
     public int distributionBits = 16;
@@ -189,7 +193,7 @@ public class FleetControllerOptions implements Cloneable {
 
     static DecimalFormat DecimalDot2 = new DecimalFormat("0.00", new DecimalFormatSymbols(Locale.ENGLISH));
 
-    public void writeHtmlState(StringBuilder sb, StatusPageServer.HttpRequest request) {
+    public void writeHtmlState(StringBuilder sb) {
         String slobrokspecs = "";
         for (int i=0; i<slobrokConnectionSpecs.length; ++i) {
             if (i != 0) slobrokspecs += "<br>";
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
index f799492d164..9d5e5e46f08 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/LegacyIndexPageRequestHandler.java
@@ -22,7 +22,7 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa
     private final EventLog eventLog;
     private final long startedTime;
     private final RunDataExtractor data;
-    private boolean showLocalSystemStatesInLog = true;
+    private final boolean showLocalSystemStatesInLog;
 
     public LegacyIndexPageRequestHandler(Timer timer, boolean showLocalSystemStatesInLog, ContentCluster cluster,
                                          MasterElectionHandler masterElectionHandler,
@@ -72,12 +72,12 @@ public class LegacyIndexPageRequestHandler implements StatusPageServer.RequestHa
                     eventLog
             );
             // Overview of current config
-            data.getOptions().writeHtmlState(content, request);
+            data.getOptions().writeHtmlState(content);
             // Current cluster state and cluster state history
             writeHtmlState(stateVersionTracker, content, request);
         } else {
             // Overview of current config
-            data.getOptions().writeHtmlState(content, request);
+            data.getOptions().writeHtmlState(content);
         }
         // Event log
         eventLog.writeHtmlState(content, null);