Merge pull request #13012 from vespa-engine/bratseth/remove-dead-code

Gc dead code

7 files changed, 0 insertions, 87 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
index 09ee25fb437..3c7a14b9496 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Capacity.java
@@ -40,37 +40,6 @@ public final class Capacity {
                                                ") must be divisible by the number of groups (" + resources.groups() + ")");
     }
 
-    /** Returns the number of nodes requested */
-    @Deprecated // TODO: Remove after April 2020
-    public int nodeCount() { return min.nodes(); }
-
-    /** Returns the number of nodes requested (across all groups), or 0 if not specified */
-    @Deprecated // TODO: Remove after April 2020
-    public int nodes() { return min.nodes(); }
-
-    /** Returns the number of groups requested, or 0 if not specified */
-    @Deprecated // TODO: Remove after April 2020
-    public int groups() { return min.groups(); }
-
-    /**
-     * The node flavor requested, or empty if no legacy flavor name has been used.
-     * This may be satisfied by the requested flavor or a suitable replacement.
-     *
-     * @deprecated use nodeResources instead
-     */
-    @Deprecated // TODO: Remove after March 2020
-    public Optional<String> flavor() {
-        if (nodeResources().isEmpty()) return Optional.empty();
-        return Optional.of(min.nodeResources().toString());
-    }
-
-    /** Returns the resources requested for each node, or empty to leave this decision to provisioning */
-    @Deprecated // TODO: Remove after March 2020
-    public Optional<NodeResources> nodeResources() {
-        if (min.nodeResources() == NodeResources.unspecified) return Optional.empty();
-        return Optional.of(min.nodeResources());
-    }
-
     public ClusterResources minResources() { return min; }
     public ClusterResources maxResources() { return max; }
 
@@ -114,23 +83,6 @@ public final class Capacity {
         return new Capacity(min, max, required, canFail, NodeType.tenant);
     }
 
-    /** Create a non-required, failable capacity request */
-    @Deprecated // TODO: Remove after April 2020
-    public static Capacity fromCount(int nodes, NodeResources resources) {
-        return fromCount(nodes, resources, false, true);
-    }
-
-    @Deprecated // TODO: Remove after April 2020
-    public static Capacity fromCount(int nodes, NodeResources resources, boolean required, boolean canFail) {
-        return fromCount(nodes, Optional.of(resources), required, canFail);
-    }
-
-    @Deprecated // TODO: Remove after April 2020
-    public static Capacity fromCount(int nodes, Optional<NodeResources> resources, boolean required, boolean canFail) {
-        return from(new ClusterResources(nodes, 0, resources.orElse(NodeResources.unspecified)),
-                    required, canFail, NodeType.tenant);
-    }
-
     /** Creates this from a node type */
     public static Capacity fromRequiredNodeType(NodeType type) {
         return from(new ClusterResources(0, 0, NodeResources.unspecified), true, false, type);
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Provisioner.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Provisioner.java
index e308d631442..2a1528f5368 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Provisioner.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/Provisioner.java
@@ -24,9 +24,6 @@ public interface Provisioner {
      */
     List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, ProvisionLogger logger);
 
-    @Deprecated // TODO: Remove after April 2020
-    List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger);
-
     /**
      * Activates the allocation of nodes to this application captured in the hosts argument.
      *
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
index 84987bce32e..06db7018727 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/deploy/DeployTester.java
@@ -299,12 +299,6 @@ public class DeployTester {
         }
 
         @Override
-        @Deprecated // TODO: Remove after April 2020
-        public List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) {
-            return hostProvisioner.prepare(cluster, capacity.withGroups(groups), logger);
-        }
-
-        @Override
         public List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) {
             return hostProvisioner.prepare(cluster, capacity, logger);
         }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
index 5b0bb7885d8..fa0bbac05c8 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/SessionHandlerTest.java
@@ -237,12 +237,6 @@ public class SessionHandlerTest {
         public Collection<HostSpec> lastHosts;
 
         @Override
-        @Deprecated // TODO: Remove after April 2020
-        public List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) {
-            throw new UnsupportedOperationException();
-        }
-
-        @Override
         public List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) {
             throw new UnsupportedOperationException();
         }
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
index a3b0f3ec44a..66891e54fb9 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/session/SessionPreparerTest.java
@@ -342,12 +342,6 @@ public class SessionPreparerTest {
     private static class FailWithTransientExceptionProvisioner implements Provisioner {
 
         @Override
-        @Deprecated // TODO: Remove after April 2020
-        public List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) {
-            throw new LoadBalancerServiceException("Unable to create load balancer", new Exception("some internal exception"));
-        }
-
-        @Override
         public List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) {
             throw new LoadBalancerServiceException("Unable to create load balancer", new Exception("some internal exception"));
         }
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 5f1139fec2d..1d0ed788b41 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
@@ -73,18 +73,6 @@ public class NodeRepositoryProvisioner implements Provisioner {
         this.activator = new Activator(nodeRepository, loadBalancerProvisioner);
     }
 
-
-    /**
-     * Returns a list of nodes in the prepared or active state, matching the given constraints.
-     * The nodes are ordered by increasing index number.
-     */
-    @Deprecated // TODO: Remove after April 2020
-    @Override
-    public List<HostSpec> prepare(ApplicationId application, ClusterSpec cluster, Capacity requestedCapacity,
-                                  int wantedGroups, ProvisionLogger logger) {
-        return prepare(application, cluster, requestedCapacity.withGroups(wantedGroups), logger);
-    }
-
     /**
      * Returns a list of nodes in the prepared or active state, matching the given constraints.
      * The nodes are ordered by increasing index number.
diff --git a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisioner.java b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisioner.java
index 045d0cad1ad..12731e30f46 100644
--- a/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisioner.java
+++ b/node-repository/src/main/java/com/yahoo/vespa/hosted/provision/testutils/MockProvisioner.java
@@ -20,12 +20,6 @@ import java.util.List;
 public class MockProvisioner implements Provisioner {
 
     @Override
-    @Deprecated // TODO: Remove after April 2020
-    public List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, int groups, ProvisionLogger logger) {
-        return Collections.emptyList();
-    }
-
-    @Override
     public List<HostSpec> prepare(ApplicationId applicationId, ClusterSpec cluster, Capacity capacity, ProvisionLogger logger) {
         return Collections.emptyList();
     }