Cleanup

1 files changed, 8 insertions, 8 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
index a0f9452ef9f..e7a6014816e 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
@@ -14,7 +14,6 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.ListIterator;
 import java.util.Optional;
-import java.util.function.BiConsumer;
 
 /**
  * Performs preparation of node activation changes for an application.
@@ -26,13 +25,13 @@ class Preparer {
     private final NodeRepository nodeRepository;
     private final Clock clock;
     private final GroupPreparer groupPreparer;
-    private final int nofSpares;
+    private final int spareCount;
 
-    public Preparer(NodeRepository nodeRepository, Clock clock, int nofSpares) {
+    public Preparer(NodeRepository nodeRepository, Clock clock, int spareCount) {
         this.nodeRepository = nodeRepository;
         this.clock = clock;
-        this.nofSpares = nofSpares;
-        groupPreparer = new GroupPreparer(nodeRepository, clock);
+        this.spareCount = spareCount;
+        this.groupPreparer = new GroupPreparer(nodeRepository, clock);
     }
 
     /**
@@ -43,15 +42,16 @@ class Preparer {
      // Note: This operation may make persisted changes to the set of reserved and inactive nodes,
      // but it may not change the set of active nodes, as the active nodes must stay in sync with the
      // active config model which is changed on activate
-    public List<Node> prepare(ApplicationId application, ClusterSpec cluster, NodeSpec requestedNodes, int wantedGroups, BiConsumer<List<Node>, String> debugRecorder) {
+    public List<Node> prepare(ApplicationId application, ClusterSpec cluster, NodeSpec requestedNodes, int wantedGroups) {
         List<Node> surplusNodes = findNodesInRemovableGroups(application, cluster, wantedGroups);
 
         MutableInteger highestIndex = new MutableInteger(findHighestIndex(application, cluster));
         List<Node> acceptedNodes = new ArrayList<>();
         for (int groupIndex = 0; groupIndex < wantedGroups; groupIndex++) {
             ClusterSpec clusterGroup = cluster.changeGroup(Optional.of(ClusterSpec.Group.from(groupIndex)));
-            List<Node> accepted = groupPreparer.prepare(application, clusterGroup, 
-                                                        requestedNodes.fraction(wantedGroups), surplusNodes, highestIndex, nofSpares, debugRecorder);
+            List<Node> accepted = groupPreparer.prepare(application, clusterGroup,
+                                                        requestedNodes.fraction(wantedGroups), surplusNodes,
+                                                        highestIndex, spareCount);
             replace(acceptedNodes, accepted);
         }
         moveToActiveGroup(surplusNodes, wantedGroups, cluster.group());