Immutable attributes. Fixed case

2 files changed, 9 insertions, 28 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java
index 29c0948e828..e3a2781142a 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/integration/resource/ResourceSnapshot.java
@@ -14,11 +14,11 @@ import java.util.stream.Collectors;
  */
 public class ResourceSnapshot {
 
-    private ApplicationId applicationId;
-    private double cpuCores;
-    private double memoryGb;
-    private double diskGb;
-    private Instant timestamp;
+    private final ApplicationId applicationId;
+    private final double cpuCores;
+    private final double memoryGb;
+    private final double diskGb;
+    private final Instant timestamp;
 
     public ResourceSnapshot(ApplicationId applicationId, double cpuCores, double memoryGb, double diskGb, Instant timestamp) {
         this.applicationId = applicationId;
@@ -64,23 +64,4 @@ public class ResourceSnapshot {
         return timestamp;
     }
 
-    public void setApplicationId(ApplicationId applicationId) {
-        this.applicationId = applicationId;
-    }
-
-    public void setCpuCores(double cpuCores) {
-        this.cpuCores = cpuCores;
-    }
-
-    public void setMemoryGb(double memoryGb) {
-        this.memoryGb = memoryGb;
-    }
-
-    public void setDiskGb(double diskGb) {
-        this.diskGb = diskGb;
-    }
-
-    public void setTimestamp(Instant timestamp) {
-        this.timestamp = timestamp;
-    }
 }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
index 6b9fdf475e0..41460cd9fdc 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/ResourceMeterMaintainer.java
@@ -31,8 +31,8 @@ public class ResourceMeterMaintainer extends Maintainer {
     private final NodeRepository nodeRepository;
     private final ResourceSnapshotConsumer resourceSnapshotConsumer;
 
-    private static final String metering_last_reported = "metering_last_reported";
-    private static final String metering_total_reported = "metering_total_reported";
+    private static final String METERING_LAST_REPORTED = "metering_last_reported";
+    private static final String METERING_TOTAL_REPORTED = "metering_total_reported";
 
     @SuppressWarnings("WeakerAccess")
     public ResourceMeterMaintainer(Controller controller,
@@ -56,8 +56,8 @@ public class ResourceMeterMaintainer extends Maintainer {
 
         resourceSnapshotConsumer.consume(resourceSnapshots);
 
-        metric.set(metering_last_reported, clock.millis() / 1000, metric.createContext(Collections.emptyMap()));
-        metric.set(metering_total_reported, resourceSnapshots.stream()
+        metric.set(METERING_LAST_REPORTED, clock.millis() / 1000, metric.createContext(Collections.emptyMap()));
+        metric.set(METERING_TOTAL_REPORTED, resourceSnapshots.stream()
                         .mapToDouble(r -> r.getCpuCores() + r.getMemoryGb() + r.getDiskGb()) // total metered resource usage, for alerting on drastic changes
                         .sum()
                 , metric.createContext(Collections.emptyMap()));