Remove unused methods and class

3 files changed, 5 insertions, 46 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
index 6a397d0e17a..19e83da6be7 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ClusterSpec.java
@@ -80,19 +80,6 @@ public final class ClusterSpec {
         return true;
     }
 
-    // TODO: Remove when no version older than 6.41 is used
-    /** Returns whether this is equal, disregarding the group value */
-    @Deprecated
-    public boolean equalsIgnoringGroup(Object o) {
-        if (o == this) return true;
-        if ( ! (o instanceof ClusterSpec)) return false;
-        ClusterSpec other = (ClusterSpec)o;
-        if ( ! other.type.equals(this.type)) return false;
-        if ( ! other.id.equals(this.id)) return false;
-        if ( ! other.dockerImage.equals(this.dockerImage)) return false;
-        return true;
-    }
-
     /** A cluster type */
     public enum 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 bf8773858a2..d72ef5372b7 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
@@ -41,6 +41,7 @@ public interface Provisioner {
      * @param application The {@link ApplicationId} that was removed.
      * @deprecated use remove(transaction, application) instead
      */
+    // TODO: Remove when no version older than 6.51 is in use
     @Deprecated
     default void removed(ApplicationId application) {
         throw new IllegalStateException("Unexpected use of deprecated method");
@@ -48,16 +49,12 @@ public interface Provisioner {
 
     /**
      * Transactionally remove this application.
-     * This default implementation delegates to removed(application), i.e performs the removal non-transactional.
-     * 
-     * @param application
+     *
+     * @param transaction Transaction with operations to commit together with any operations done within the provisioner.
+     * @param application the application to remove
      */
-    // TODO: Remove the default implementation in this when
-    //       no applications are on a version before 5.17
     @SuppressWarnings("deprecation")
-    default void remove(NestedTransaction transaction, ApplicationId application) {
-        removed(application);
-    }
+    void remove(NestedTransaction transaction, ApplicationId application);
 
     /**
      * Requests a restart of the services of the given application
diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/Quota.java b/config-provisioning/src/main/java/com/yahoo/config/provision/Quota.java
deleted file mode 100644
index 72323e995aa..00000000000
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/Quota.java
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-package com.yahoo.config.provision;
-
-/**
- * @author hmusum
- */
-// TODO: Remove when there is no release older than 6.33 in use
-@SuppressWarnings("unused")
-public class Quota {
-
-    private final int numberOfHosts;
-
-    public Quota() {
-        this(Integer.MAX_VALUE);
-    }
-
-    public Quota(int numberOfHosts) {
-        this.numberOfHosts = numberOfHosts;
-    }
-
-    public int getNumberOfHosts() {
-        return numberOfHosts;
-    }
-
-}