From 01145564f95c7850a135b42ea03f1bfcb1bd7e54 Mon Sep 17 00:00:00 2001 From: Harald Musum Date: Thu, 22 Dec 2016 08:08:18 +0100 Subject: Remove methods and constants no longer in use --- .../com/yahoo/config/provision/ApplicationId.java | 23 ---------------------- .../com/yahoo/config/provision/Provisioner.java | 12 ----------- 2 files changed, 35 deletions(-) (limited to 'config-provisioning') 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 { 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 @@ -35,18 +35,6 @@ public interface Provisioner { */ void activate(NestedTransaction transaction, ApplicationId application, Collection 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. * -- cgit v1.2.3