From 9976abf35e26a59cf0a9b7528b3f09e4b1d1dd58 Mon Sep 17 00:00:00 2001
From: gjoranv <gv@verizonmedia.com>
Date: Sun, 11 Jul 2021 21:33:24 +0200
Subject: Remove the 'rest-api' element from xml schema.

---
 .../model/container/xml/ContainerModelBuilder.java      |  7 -------
 .../src/main/resources/schema/containercluster.rnc      | 17 -----------------
 config-model/src/test/schema-test-files/services.xml    | 12 ------------
 .../src/test/schema-test-files/standalone-container.xml | 15 ---------------
 4 files changed, 51 deletions(-)

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 5bf8aa5228e..4b45979c698 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
@@ -184,7 +184,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         addConfiguredComponents(deployState, cluster, spec);
         addSecretStore(cluster, spec, deployState);
 
-        throwUponRestApi(spec);  // TODO: remove
         addServlets(deployState, spec, cluster);
         addModelEvaluation(spec, cluster, context);
         addModelEvaluationBundles(cluster);
@@ -517,12 +516,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> {
         return http;
     }
 
-    private void throwUponRestApi(Element spec) {
-        if(! XML.getChildren(spec, "rest-api").isEmpty()) {
-            throw new IllegalArgumentException("The 'rest-api' element is no longer allowed in services.xml.");
-        }
-    }
-
     private void addServlets(DeployState deployState, Element spec, ApplicationContainerCluster cluster) {
         for (Element servletElem : XML.getChildren(spec, "servlet"))
             cluster.addServlet(new ServletBuilder().build(deployState, cluster, servletElem));
diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc
index 3679e53e257..992689a2189 100644
--- a/config-model/src/main/resources/schema/containercluster.rnc
+++ b/config-model/src/main/resources/schema/containercluster.rnc
@@ -12,7 +12,6 @@ ContainerCluster = element container | jdisc {
 }
 
 ContainerServices =
-    RestApi* &
     Servlet* &
     SearchInContainer? &
     DocprocInContainer? &
@@ -128,22 +127,6 @@ Threadpool = element threadpool {
     element queue-size { xsd:nonNegativeInteger }
 }
 
-# REST-API:
-
-RestApi = element rest-api {
-    attribute path { xsd:string { pattern = "\w[\w_/\-\.]*" } } &
-    attribute jersey2 { xsd:boolean }? &
-    element components {
-      attribute bundle { xsd:Name } &
-      element package { xsd:NCName }*
-    }*
-
-#    element inject {
-#        attribute component { xsd:Name } &
-#        attribute for-name { xsd:Name }
-#    }*
-}
-
 # Servlet:
 
 Servlet = element servlet {
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index 4ad7865c93b..8477f8fcbea 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -58,18 +58,6 @@
       <group name="foo" environment="aws_stage" />
     </secret-store>
 
-    <rest-api path="jersey1">
-      <components bundle="my-bundle" />
-      <components bundle="other-bundle">
-        <package>com.yahoo.foo</package>
-        <package>com.yahoo.bar</package>
-      </components>
-
-    </rest-api>
-    <rest-api path="jersey/2">
-      <components bundle="my-bundle" />
-    </rest-api>
-
     <servlet id="my-servlet" class="com.yahoo.MyServlet" bundle="my-bundle">
       <path>p/a/t/h</path>
     </servlet>
diff --git a/config-model/src/test/schema-test-files/standalone-container.xml b/config-model/src/test/schema-test-files/standalone-container.xml
index b77654521ee..a7769a2f57b 100644
--- a/config-model/src/test/schema-test-files/standalone-container.xml
+++ b/config-model/src/test/schema-test-files/standalone-container.xml
@@ -1,21 +1,6 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <!-- Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. -->
 <container id='qrsCluster_1' version='1.0'>
-  <rest-api path="jersey1">
-    <components bundle="my-bundle" />
-    <components bundle="other-bundle" />
-<!--
-    <inject component="foo-component" for-name="com.yahoo.Foo" />
-    <inject component="bar-component" for-name="com.yahoo.Bar" />
--->
-  </rest-api>
-  <rest-api path="jersey/2">
-    <components bundle="my-bundle" />
-    <components bundle="other-bundle">
-      <package>com.yahoo.foo</package>
-      <package>com.yahoo.bar</package>
-    </components>
-  </rest-api>
 
   <servlet id="my-servlet" class="com.yahoo.MyServlet" bundle="my-bundle">
     <path>p/a/t/h</path>
-- 
cgit v1.2.3