Avoid null optional

2 files changed, 3 insertions, 3 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
index 4c5ace3d51a..1e4a11fdea2 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterModel.java
@@ -72,7 +72,7 @@ public class ClusterModel {
     // Lazily initialized members
     private Double queryFractionOfMax = null;
     private Double maxQueryGrowthRate = null;
-    private OptionalDouble averageQueryRate = null;
+    private OptionalDouble averageQueryRate = OptionalDouble.empty();
 
     public ClusterModel(NodeRepository nodeRepository,
                         Application application,
@@ -307,7 +307,7 @@ public class ClusterModel {
 
     /** Returns the average query rate in the scaling window. */
     private OptionalDouble averageQueryRate() {
-        if (averageQueryRate != null) return averageQueryRate;
+        if (averageQueryRate.isPresent()) return averageQueryRate;
         return averageQueryRate = clusterTimeseries().queryRate(scalingDuration(), clock);
     }
 
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java
index 5ae184c50ca..e1ef21ebd13 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/ClusterNodesTimeseries.java
@@ -51,7 +51,7 @@ public class ClusterNodesTimeseries {
 
     /** Returns the average number of measurements per node */
     public double measurementsPerNode() {
-        if (clusterNodes.size() == 0) return 0;
+        if (clusterNodes.isEmpty()) return 0;
         return (double) totalMeasurementsIn(timeseries) / clusterNodes.size();
     }