Remove Provisioner

2 files changed, 2 insertions, 36 deletions

diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
index 43b8cd08989..36a38e7f771 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/NodeRepositoryProvisioner.java
@@ -53,7 +53,7 @@ public class NodeRepositoryProvisioner implements Provisioner {
     private final AllocationOptimizer allocationOptimizer;
     private final CapacityPolicies capacityPolicies;
     private final Zone zone;
-    private final Preparer preparer;
+    private final GroupPreparer preparer;
     private final Activator activator;
     private final Optional<LoadBalancerProvisioner> loadBalancerProvisioner;
     private final NodeResourceLimits nodeResourceLimits;
@@ -69,7 +69,7 @@ public class NodeRepositoryProvisioner implements Provisioner {
         this.loadBalancerProvisioner = provisionServiceProvider.getLoadBalancerService()
                                                                .map(lbService -> new LoadBalancerProvisioner(nodeRepository, lbService));
         this.nodeResourceLimits = new NodeResourceLimits(nodeRepository);
-        this.preparer = new Preparer(nodeRepository,
+        this.preparer = new GroupPreparer(nodeRepository,
                                      provisionServiceProvider.getHostProvisioner(),
                                      loadBalancerProvisioner);
         this.activator = new Activator(nodeRepository, loadBalancerProvisioner);
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
deleted file mode 100644
index 1002f428b06..00000000000
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/provisioning/Preparer.java
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.vespa.hosted.provision.provisioning;
-
-import com.yahoo.config.provision.ApplicationId;
-import com.yahoo.config.provision.ClusterSpec;
-import com.yahoo.config.provision.NodeAllocationException;
-import com.yahoo.vespa.hosted.provision.LockedNodeList;
-import com.yahoo.vespa.hosted.provision.Node;
-import com.yahoo.vespa.hosted.provision.NodeList;
-import com.yahoo.vespa.hosted.provision.NodeRepository;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-/**
- * Performs preparation of node activation changes for an application.
- *
- * @author bratseth
- */
-class Preparer {
-
-    private final GroupPreparer groupPreparer;
-
-    public Preparer(NodeRepository nodeRepository, Optional<HostProvisioner> hostProvisioner,
-                    Optional<LoadBalancerProvisioner> loadBalancerProvisioner) {
-        this.groupPreparer = new GroupPreparer(nodeRepository, hostProvisioner, loadBalancerProvisioner);
-    }
-
-    public List<Node> prepare(ApplicationId application, ClusterSpec cluster, NodeSpec requested) {
-        return groupPreparer.prepare(application, cluster, requested);
-    }
-
-}