Cleanup

5 files changed, 4 insertions, 13 deletions

diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeMembership.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeMembership.java
index 3d89b3a991a..93541b03537 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeMembership.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/configserver/noderepository/NodeMembership.java
@@ -25,11 +25,6 @@ public class NodeMembership {
         return clusterType;
     }
 
-    /** DEPRECATED: Use {@link #type()} instead */
-    public String clusterType() {
-        return clusterType.value();
-    }
-
     public String clusterId() {
         return clusterId;
     }
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
index 9c718955c0e..184858ab747 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/StorageMaintainer.java
@@ -73,11 +73,6 @@ public class StorageMaintainer {
         this.clock = clock;
     }
 
-    // TODO: Remove, use diskUsageFor() instead
-    public Optional<Long> getDiskUsageFor(NodeAgentContext context) {
-        return diskUsageFor(context).map(DiskSize::bytes);
-    }
-
     public Optional<DiskSize> diskUsageFor(NodeAgentContext context) {
         try {
             DiskSize cachedDiskUsage = diskUsage.getIfPresent(context.containerName());
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/DiskCleanup.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/DiskCleanup.java
index c9a35d09bff..0ce6f1e6b45 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/DiskCleanup.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/maintenance/disk/DiskCleanup.java
@@ -20,7 +20,6 @@ import static com.yahoo.yolean.Exceptions.uncheck;
 public class DiskCleanup {
 
     private static final Logger logger = Logger.getLogger(DiskCleanup.class.getName());
-    private static final char[] UNITS = "kMGTPE".toCharArray();
     private static final Comparator<PrioritizedFileAttributes> PRIORITIZED_FILE_ATTRIBUTES_COMPARATOR = Comparator
             .comparing(PrioritizedFileAttributes::priority)
             .thenComparingLong(f -> f.fileAttributes().size())
diff --git a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/DiskSize.java b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/DiskSize.java
index e6d8835ef9c..40a11f61d3f 100644
--- a/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/DiskSize.java
+++ b/node-admin/src/main/java/com/yahoo/vespa/hosted/node/admin/task/util/file/DiskSize.java
@@ -1,5 +1,7 @@
+// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.node.admin.task.util.file;
 
+import java.util.Locale;
 import java.util.Objects;
 
 /**
@@ -40,7 +42,7 @@ public class DiskSize {
         int unit = -1;
         double remaining = bytes;
         for (; remaining >= 1000; unit++) remaining /= 1000;
-        return String.format("%." + decimals + "f %sB", remaining, UNITS[unit]);
+        return String.format(Locale.ENGLISH, "%." + decimals + "f %sB", remaining, UNITS[unit]);
     }
 
     @Override
diff --git a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
index 9b509829ba2..a1ea3558504 100644
--- a/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
+++ b/node-admin/src/test/java/com/yahoo/vespa/hosted/node/admin/integrationTests/DockerTester.java
@@ -66,7 +66,7 @@ public class DockerTester implements AutoCloseable {
 
 
     DockerTester() {
-        when(storageMaintainer.getDiskUsageFor(any())).thenReturn(Optional.empty());
+        when(storageMaintainer.diskUsageFor(any())).thenReturn(Optional.empty());
 
         IPAddressesMock ipAddresses = new IPAddressesMock();
         ipAddresses.addAddress(HOST_HOSTNAME.value(), "1.1.1.1");