Remove methods and constants no longer in use

* Move hosted vespa tenant name

8 files changed, 13 insertions, 66 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..5c066f8f7b7 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
@@ -216,21 +216,10 @@ public interface ApplicationPackage {
     default File getFileReference(Path pathRelativeToAppDir) {
         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/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java
index 4f0459cad4d..d3330bb267f 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/model/RoutingProducer.java
@@ -7,6 +7,7 @@ import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.vespa.config.server.application.Application;
+import com.yahoo.vespa.config.server.tenant.Tenants;
 
 import java.util.Map;
 
@@ -17,8 +18,7 @@ import java.util.Map;
  * @since 5.60
  */
 public class RoutingProducer implements RoutingConfig.Producer {
-    private static final TenantName HOSTED_VESPA_TENANT = TenantName.from("hosted-vespa");
-    private static final ApplicationName ROUTING_APPLICATION = ApplicationName.from("routing");
+    static final ApplicationName ROUTING_APPLICATION = ApplicationName.from("routing");
 
     private final Map<TenantName, Map<ApplicationId, Application>> models;
 
@@ -38,7 +38,7 @@ public class RoutingProducer implements RoutingConfig.Producer {
     }
 
     private boolean isHostedVespaRoutingApplication(ApplicationId applicationId) {
-        return HOSTED_VESPA_TENANT.equals(applicationId.tenant()) &&
+        return Tenants.HOSTED_VESPA_TENANT.equals(applicationId.tenant()) &&
                 (ROUTING_APPLICATION.equals(applicationId.application()));
     }
 
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java
index 42fce5e4d3b..478bf957fe8 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/tenant/Tenants.java
@@ -54,16 +54,17 @@ import java.util.logging.Logger;
  */
 //TODO Rename to TenantRepository
 public class Tenants implements ConnectionStateListener, PathChildrenCacheListener {
-
-    private static final Logger log = Logger.getLogger(Tenants.class.getName());
-
+    public static final TenantName HOSTED_VESPA_TENANT = TenantName.from("hosted-vespa");
     private static final TenantName DEFAULT_TENANT = TenantName.defaultName();
     private static final List<TenantName> SYSTEM_TENANT_NAMES = Arrays.asList(
             DEFAULT_TENANT,
-            ApplicationId.HOSTED_VESPA_TENANT);
+            HOSTED_VESPA_TENANT);
+
     private static final Path tenantsPath = Path.fromString("/config/v2/tenants/");
     private static final Path vespaPath = Path.fromString("/vespa");
 
+    private static final Logger log = Logger.getLogger(Tenants.class.getName());
+
     private final Map<TenantName, Tenant> tenants = new LinkedHashMap<>();
     private final GlobalComponentRegistry globalComponentRegistry;
     private final List<TenantListener> tenantListeners = Collections.synchronizedList(new ArrayList<>());
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListTenantsTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListTenantsTest.java
index f8048cfc253..70a3b61674d 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListTenantsTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/v2/ListTenantsTest.java
@@ -1,8 +1,8 @@
 // Copyright 2016 Yahoo Inc. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.http.v2;
 
-import com.yahoo.config.provision.ApplicationId;
 import com.yahoo.config.provision.TenantName;
+import com.yahoo.vespa.config.server.tenant.Tenants;
 import org.junit.Test;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.jdisc.http.HttpRequest.Method;
@@ -34,7 +34,7 @@ public class ListTenantsTest extends TenantTest {
 
     private static void assertContainsSystemTenants(final Collection<TenantName> tenantNames) {
         assertTrue(tenantNames.contains(TenantName.defaultName()));
-        assertTrue(tenantNames.contains(ApplicationId.HOSTED_VESPA_TENANT));
+        assertTrue(tenantNames.contains(Tenants.HOSTED_VESPA_TENANT));
     }
 
     @Test
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java
index a8263cd361a..e403004c2c4 100755
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/model/RoutingProducerTest.java
@@ -13,6 +13,7 @@ import com.yahoo.config.provision.Version;
 import com.yahoo.vespa.config.server.ServerCache;
 import com.yahoo.vespa.config.server.application.Application;
 import com.yahoo.vespa.config.server.monitoring.MetricUpdater;
+import com.yahoo.vespa.config.server.tenant.Tenants;
 import com.yahoo.vespa.model.VespaModel;
 import org.junit.Test;
 import org.xml.sax.SAXException;
@@ -44,7 +45,7 @@ public class RoutingProducerTest {
         Map<TenantName, Map<ApplicationId, Application>> tMap = new LinkedHashMap<>();
         TenantName foo = TenantName.from("foo");
         TenantName bar = TenantName.from("bar");
-        TenantName routing = TenantName.from(ApplicationId.HOSTED_VESPA_TENANT.value());
+        TenantName routing = TenantName.from(Tenants.HOSTED_VESPA_TENANT.value());
         tMap.put(foo, createTestApplications(foo, deployStateBuilder));
         tMap.put(bar, createTestApplications(bar, deployStateBuilder));
         tMap.put(routing, createTestApplications(routing, deployStateBuilder));
@@ -55,7 +56,7 @@ public class RoutingProducerTest {
         Map<ApplicationId, Application> aMap = new LinkedHashMap<>();
         ApplicationId fooApp = new ApplicationId.Builder().tenant(tenant).applicationName("foo").build();
         ApplicationId barApp = new ApplicationId.Builder().tenant(tenant).applicationName("bar").build();
-        ApplicationId routingApp = new ApplicationId.Builder().tenant(tenant).applicationName(ApplicationId.ROUTING_APPLICATION.value()).build();
+        ApplicationId routingApp = new ApplicationId.Builder().tenant(tenant).applicationName(RoutingProducer.ROUTING_APPLICATION.value()).build();
         aMap.put(fooApp, createApplication(fooApp, deploystateBuilder));
         aMap.put(barApp, createApplication(barApp, deploystateBuilder));
         aMap.put(routingApp, createApplication(routingApp, deploystateBuilder));