Simplifications.

4 files changed, 10 insertions, 6 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java
index 2544ac9e07c..eb377718614 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/status/statuspage/VdsClusterHtmlRendrer.java
@@ -316,7 +316,7 @@ public class VdsClusterHtmlRendrer {
         private static void addBucketsPending(HtmlTable.Row row, ContentNodeStats.BucketSpaceStats bucketSpaceStats) {
             if (bucketSpaceStats != null) {
                 long bucketsPending = bucketSpaceStats.getBucketsPending();
-                String cellValue = "" + bucketsPending;
+                String cellValue = String.valueOf(bucketsPending);
                 if (!bucketSpaceStats.valid()) {
                     cellValue += "?";
                 }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java
index 16530b2ceb6..90c9700e001 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ClusterStatsAggregatorTest.java
@@ -174,11 +174,11 @@ public class ClusterStatsAggregatorTest {
     public void aggregator_can_provide_aggregated_stats_per_distributor() {
         Fixture f = new FourNodesFixture();
 
-        f.verify(1, new ContentNodeStatsBuilder(1)
+        f.verify(1, ContentNodeStatsBuilder.forNode(1)
                 .add("default", 10 + 12, 1 + 3)
                 .add("global", 11 + 13, 2 + 4));
 
-        f.verify(2, new ContentNodeStatsBuilder(2)
+        f.verify(2, ContentNodeStatsBuilder.forNode(2)
                 .add("default", 14 + 16, 5 + 7)
                 .add("global", 15 + 17, 6 + 8));
     }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterStatsBuilder.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterStatsBuilder.java
index a1a5fd4a4e1..dd0205658cb 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterStatsBuilder.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterStatsBuilder.java
@@ -26,7 +26,7 @@ public class ContentClusterStatsBuilder {
     public ContentClusterStatsBuilder add(int nodeIndex, String bucketSpace, ContentNodeStats.BucketSpaceStats bucketSpaceStats) {
         ContentNodeStatsBuilder nodeStatsBuilder = stats.get(nodeIndex);
         if (nodeStatsBuilder == null) {
-            nodeStatsBuilder = new ContentNodeStatsBuilder(nodeIndex);
+            nodeStatsBuilder = ContentNodeStatsBuilder.forNode(nodeIndex);
             stats.put(nodeIndex, nodeStatsBuilder);
         }
         nodeStatsBuilder.add(bucketSpace, bucketSpaceStats);
@@ -34,7 +34,7 @@ public class ContentClusterStatsBuilder {
     }
 
     public ContentClusterStatsBuilder add(int nodeIndex) {
-        stats.put(nodeIndex, new ContentNodeStatsBuilder(nodeIndex));
+        stats.put(nodeIndex, ContentNodeStatsBuilder.forNode(nodeIndex));
         return this;
     }
 
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentNodeStatsBuilder.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentNodeStatsBuilder.java
index 088fc018d88..9fb020260e9 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentNodeStatsBuilder.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentNodeStatsBuilder.java
@@ -8,10 +8,14 @@ public class ContentNodeStatsBuilder {
     private final int nodeIndex;
     private final Map<String, ContentNodeStats.BucketSpaceStats> stats = new HashMap<>();
 
-    public ContentNodeStatsBuilder(int nodeIndex) {
+    private ContentNodeStatsBuilder(int nodeIndex) {
         this.nodeIndex = nodeIndex;
     }
 
+    public static ContentNodeStatsBuilder forNode(int nodeIndex) {
+        return new ContentNodeStatsBuilder(nodeIndex);
+    }
+
     public ContentNodeStatsBuilder add(String bucketSpace, long bucketsTotal, long bucketsPending) {
         return add(bucketSpace, ContentNodeStats.BucketSpaceStats.of(bucketsTotal, bucketsPending));
     }