Check args

2 files changed, 9 insertions, 3 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java
index e3f3a98a560..f0f53161d9b 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/AllocationOptimizer.java
@@ -40,8 +40,8 @@ public class AllocationOptimizer {
                                                                     AllocatableClusterResources current,
                                                                     Limits limits) {
         if (limits.isEmpty())
-            limits = new Limits(new ClusterResources(minimumNodes, 1, NodeResources.unspecified),
-                                new ClusterResources(maximumNodes, maximumNodes, NodeResources.unspecified));
+            limits = Limits.of(new ClusterResources(minimumNodes,    1, NodeResources.unspecified),
+                               new ClusterResources(maximumNodes, maximumNodes, NodeResources.unspecified));
         Optional<AllocatableClusterResources> bestAllocation = Optional.empty();
         for (int groups = limits.min().groups(); groups <= limits.max().groups(); groups++) {
             for (int nodes = limits.min().nodes(); nodes <= limits.max().nodes(); nodes++) {
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Limits.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Limits.java
index 111ded22c0d..15bf4427346 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Limits.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/autoscale/Limits.java
@@ -6,6 +6,8 @@ import com.yahoo.config.provision.ClusterResources;
 import com.yahoo.config.provision.NodeResources;
 import com.yahoo.vespa.hosted.provision.applications.Cluster;
 
+import java.util.Objects;
+
 /**
  * Optional allocation limits
  *
@@ -17,7 +19,7 @@ public class Limits {
 
     private final ClusterResources min, max;
 
-    public Limits(ClusterResources min, ClusterResources max) {
+    private Limits(ClusterResources min, ClusterResources max) {
         this.min = min;
         this.max = max;
     }
@@ -60,6 +62,10 @@ public class Limits {
         return new Limits(capacity.minResources(), capacity.maxResources());
     }
 
+    public static Limits of(ClusterResources min, ClusterResources max) {
+        return new Limits(Objects.requireNonNull(min, "min"), Objects.requireNonNull(max, "max"));
+    }
+
     @Override
     public String toString() {
         if (isEmpty()) return "no limits";