Remove <client> on Vespa 8

3 files changed, 0 insertions, 51 deletions

diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
index f6103854cda..e76d89a6854 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTest.java
@@ -291,7 +291,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
     public void handler_bindings_are_included_in_discBindings_config() {
         createClusterWithJDiscHandler();
         String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
-        assertThat(discBindingsConfig, containsString("{discHandler}"));
         assertThat(discBindingsConfig, containsString(".serverBindings[0] \"http://*/binding0\""));
         assertThat(discBindingsConfig, containsString(".serverBindings[1] \"http://*/binding1\""));
     }
@@ -333,35 +332,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
     }
 
     @Test
-    public void clientProvider_bindings_are_included_in_discBindings_config() {
-        createModelWithClientProvider();
-        String discBindingsConfig = root.getConfig(JdiscBindingsConfig.class, "default").toString();
-        assertThat(discBindingsConfig, containsString("{discClient}"));
-        assertThat(discBindingsConfig, containsString(".clientBindings[0] \"http://*/binding0\""));
-        assertThat(discBindingsConfig, containsString(".clientBindings[1] \"http://*/binding1\""));
-        assertThat(discBindingsConfig, containsString(".serverBindings[0] \"http://*/serverBinding\""));
-    }
-
-    @Test
-    public void clientProviders_are_included_in_components_config() {
-        createModelWithClientProvider();
-        assertThat(componentsConfig().toString(), containsString(".id \"discClient\""));
-    }
-
-    private void createModelWithClientProvider() {
-        Element clusterElem = DomBuilderTest.parse(
-                "<container id='default' version='1.0'>" +
-                "  <client id='discClient'>" +
-                "    <binding>http://*/binding0</binding>" +
-                "    <binding>http://*/binding1</binding>" +
-                "    <serverBinding>http://*/serverBinding</serverBinding>" +
-                "  </client>" +
-                "</container>" );
-
-        createModel(root, clusterElem);
-    }
-
-    @Test
     public void serverProviders_are_included_in_components_config() {
         Element clusterElem = DomBuilderTest.parse(
                 "<container id='default' version='1.0'>" +
@@ -447,17 +417,11 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase {
                 "  <handler id='myHandler'>",
                 "    <component id='injected' />",
                 "  </handler>",
-                "  <client id='myClient'>",  // remember, a client is also a request handler
-                "    <component id='injected' />",
-                "  </client>",
                 "</container>");
 
         createModel(root, clusterElem);
         Component<?,?> handler = getContainerComponent("default", "myHandler");
         assertThat(handler.getInjectedComponentIds(), hasItem("injected@myHandler"));
-
-        Component<?,?> client = getContainerComponent("default", "myClient");
-        assertThat(client.getInjectedComponentIds(), hasItem("injected@myClient"));
     }
 
     @Test
diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml
index 4cc8918cf85..4fb81963152 100644
--- a/config-model/src/test/schema-test-files/services.xml
+++ b/config-model/src/test/schema-test-files/services.xml
@@ -195,13 +195,6 @@
       <binding>http://*:*/Status</binding>
     </handler>
 
-    <client id="client-provider">
-      <binding>http://*:*/HelloWorld</binding>
-      <binding>http://*:*/Status</binding>
-      <serverBinding>http://*:*/foo</serverBinding>
-      <serverBinding>http://*:*/bar</serverBinding>
-    </client>
-
     <server id="server-provider">
 
     </server>
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 a777f11f207..67793df880b 100644
--- a/config-model/src/test/schema-test-files/standalone-container.xml
+++ b/config-model/src/test/schema-test-files/standalone-container.xml
@@ -95,14 +95,6 @@
     <binding>http://*:*/Status</binding>
   </handler>
 
-  <client id="client-provider">
-    <binding>http://*:*/HelloWorld</binding>
-    <binding>http://*:*/Status</binding>
-    <serverBinding>http://*:*/foo</serverBinding>
-    <serverBinding>http://*:*/bar</serverBinding>
-  </client>
-
   <server id="server-provider" />
 
-
 </container>