Remove methods and constants no longer in use

2 files changed, 0 insertions, 35 deletions

diff --git a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
index af6f67040cb..bb6cd7c7a77 100644
--- a/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
+++ b/config-provisioning/src/main/java/com/yahoo/config/provision/ApplicationId.java
@@ -62,29 +62,6 @@ public final class ApplicationId implements Comparable<ApplicationId> {
         this.serializedForm = toSerializedForm();
     }
 
-    // TODO: Remove code between lines with ----------- when oldest config model used is 6.49.
-    /* ------------------- */
-    public static final TenantName HOSTED_VESPA_TENANT = TenantName.from("hosted-vespa");
-    // TODO: Remove references to routing application, or rename them to zone
-    // application, once everything (like Chef recipes) refers to the zone
-    // application name.
-    public static final ApplicationName ROUTING_APPLICATION = ApplicationName.from("routing");
-    public static final ApplicationName ZONE_APPLICATION = ApplicationName.from("zone");
-    public static final ApplicationId HOSTED_ZONE_APPLICATION_ID =
-        new ApplicationId.Builder()
-        .tenant(HOSTED_VESPA_TENANT)
-        .applicationName(ROUTING_APPLICATION)
-        .build();
-
-
-    // TODO: Remove this abhorrent layer violation
-    public boolean isHostedVespaRoutingApplication() {
-        return HOSTED_VESPA_TENANT.equals(tenant) &&
-	    (ROUTING_APPLICATION.equals(application) ||
-	     ZONE_APPLICATION.equals(application));
-    }
-    /* ------------------- */
-
     public static ApplicationId from(TenantName tenant, ApplicationName application, InstanceName instanceName) {
         return new ApplicationId(tenant, application, instanceName);
     }
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 d72ef5372b7..9fe836d0cfc 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
@@ -36,18 +36,6 @@ public interface Provisioner {
     void activate(NestedTransaction transaction, ApplicationId application, Collection<HostSpec> hosts);
 
     /**
-     * Notifies provisioner that an application has been removed.
-     *
-     * @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");
-    }
-
-    /**
      * Transactionally remove this application.
      *
      * @param transaction Transaction with operations to commit together with any operations done within the provisioner.