diff options
5 files changed, 0 insertions, 56 deletions
diff --git a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java index a5fb7a152d8..c1865059795 100644 --- a/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java +++ b/config-model-api/src/main/java/com/yahoo/config/application/api/ApplicationPackage.java @@ -217,20 +217,10 @@ public interface ApplicationPackage { throw new UnsupportedOperationException("This application package cannot return file references"); } - // TODO: Remove when no version older than 6.33 is in use - default void validateXML(DeployLogger logger) throws IOException { - throw new UnsupportedOperationException("This application package cannot validate XML"); - } - default void validateXML() throws IOException { throw new UnsupportedOperationException("This application package cannot validate XML"); } - // TODO: Remove when no version older than 6.33 is in use - default void validateXML(DeployLogger logger, Optional<Version> vespaVersion) throws IOException { - throw new UnsupportedOperationException("This application package cannot validate XML"); - } - default void validateXML(Optional<Version> vespaVersion) throws IOException { throw new UnsupportedOperationException("This application package cannot validate XML"); } diff --git a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java index c30c62b44bc..f95f75c5af3 100644 --- a/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java +++ b/config-model/src/main/java/com/yahoo/config/model/test/MockApplicationPackage.java @@ -2,7 +2,6 @@ package com.yahoo.config.model.test; import com.yahoo.config.application.api.ComponentInfo; -import com.yahoo.config.application.api.DeployLogger; import com.yahoo.config.application.api.UnparsedConfigDefinition; import com.yahoo.config.application.api.ApplicationFile; import com.yahoo.config.provision.Version; @@ -242,12 +241,4 @@ public class MockApplicationPackage implements ApplicationPackage { } } - @Override - public void validateXML(DeployLogger logger) throws IOException { - if (failOnValidateXml) { - throw new IllegalArgumentException("Error in application package"); - } else { - throw new UnsupportedOperationException("This application package cannot validate XML"); - } - } } 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. 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 67886aa9b2c..14f31c6d049 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 @@ -22,11 +22,9 @@ import com.yahoo.vespa.hosted.provision.node.filter.NodeHostFilter; import java.time.Clock; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collection; import java.util.Comparator; import java.util.List; -import java.util.Optional; import java.util.logging.Level; import java.util.logging.Logger; |