Remove support for jdisc tag in services.xml

4 files changed, 6 insertions, 21 deletions

diff --git a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
index 5a6a8e86e6a..acad7532404 100644
--- a/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
+++ b/config-model/src/main/java/com/yahoo/config/model/provision/HostsXmlProvisioner.java
@@ -27,7 +27,7 @@ public class HostsXmlProvisioner implements HostProvisioner {
 
     @Override
     public HostSpec allocateHost(String alias) {
-        // Some special rules to allow no admin elements as well as jdisc element without nodes.
+        // Some special rules to allow no admin elements as well as container element without nodes.
         if (alias.equals(IMPLICIT_ADMIN_HOSTALIAS)) {
             if (hosts.asCollection().size() > 1) {
                 throw new IllegalArgumentException("More than 1 host specified (" + hosts.asCollection().size() + ") and <admin> not specified");
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
index 67b2e4b81b5..472e15add98 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/NodesSpecification.java
@@ -391,12 +391,8 @@ public class NodesSpecification {
     /** Returns the ID of the parent container element of nodesElement, if any  */
     private static Optional<String> containerIdOf(ModelElement nodesElement) {
         var element = nodesElement.getXml();
-        for (var containerTag : List.of("container", "jdisc")) {
-            var container = findParentByTag(containerTag, element);
-            if (container.isEmpty()) continue;
-            return container.map(el -> el.getAttribute("id"));
-        }
-        return Optional.empty();
+        var container = findParentByTag("container", element);
+        return container.map(el -> el.getAttribute("id"));
     }
 
     /** Returns the ID of the container element referencing nodesElement, if any */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java b/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java
index 71446438b06..e77099a0598 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/component/HttpFilter.java
@@ -10,7 +10,7 @@ import com.yahoo.osgi.provider.model.ComponentModel;
 /**
  * This is only for the legacy certificate filter setup, outside http.
  *
- * TODO: Remove when 'filter' directly under 'jdisc' can be removed from services.xml
+ * TODO: Remove when 'filter' directly under 'container' can be removed from services.xml
  *
  * @author Tony Vaagenes
  */
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
index 0b8598f05f7..552ada756b6 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilder.java
@@ -88,7 +88,6 @@ import com.yahoo.vespa.model.container.xml.embedder.EmbedderConfig;
 import com.yahoo.vespa.model.content.StorageGroup;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
-
 import java.net.URI;
 import java.security.cert.X509Certificate;
 import java.util.ArrayList;
@@ -120,7 +119,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
     private static final String HOSTED_VESPA_STATUS_FILE_SETTING = "VESPA_LB_STATUS_FILE";
 
     private static final String CONTAINER_TAG = "container";
-    private static final String DEPRECATED_CONTAINER_TAG = "jdisc";
     private static final String ENVIRONMENT_VARIABLES_ELEMENT = "environment-variables";
 
     // The node count to enforce in a cluster running ZooKeeper
@@ -136,8 +134,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
     private final boolean httpServerEnabled;
     protected DeployLogger log;
 
-    public static final List<ConfigModelId> configModelIds =  
-            ImmutableList.of(ConfigModelId.fromName(CONTAINER_TAG), ConfigModelId.fromName(DEPRECATED_CONTAINER_TAG));
+    public static final List<ConfigModelId> configModelIds = ImmutableList.of(ConfigModelId.fromName(CONTAINER_TAG));
 
     private static final String xmlRendererId = RendererRegistry.xmlRendererId.getName();
     private static final String jsonRendererId = RendererRegistry.jsonRendererId.getName();
@@ -162,7 +159,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         app = modelContext.getApplicationPackage();
 
         checkVersion(spec);
-        checkTagName(spec, log);
 
         ApplicationContainerCluster cluster = createContainerCluster(spec, modelContext);
         addClusterContent(cluster, spec, modelContext);
@@ -637,13 +633,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
             throw new IllegalArgumentException("Expected container version to be 1.0, but got " + version);
     }
 
-    private void checkTagName(Element spec, DeployLogger logger) {
-        if (spec.getTagName().equals(DEPRECATED_CONTAINER_TAG)) {
-            logger.logApplicationPackage(WARNING, "'" + DEPRECATED_CONTAINER_TAG +
-                                                  "' is deprecated as tag name. Use '" + CONTAINER_TAG + "' instead.");
-        }
-    }
-
     private void addNodes(ApplicationContainerCluster cluster, Element spec, ConfigModelContext context) {
         if (standaloneBuilder)
             addStandaloneNode(cluster, context.getDeployState());
@@ -1046,7 +1035,7 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
     }
 
     public static boolean isContainerTag(Element element) {
-        return CONTAINER_TAG.equals(element.getTagName()) || DEPRECATED_CONTAINER_TAG.equals(element.getTagName());
+        return CONTAINER_TAG.equals(element.getTagName());
     }
 
     /**