diff options
7 files changed, 0 insertions, 72 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 084124e0ecb..0b8598f05f7 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 @@ -41,7 +41,6 @@ import com.yahoo.vespa.defaults.Defaults; import com.yahoo.vespa.model.AbstractService; import com.yahoo.vespa.model.HostResource; import com.yahoo.vespa.model.HostSystem; -import com.yahoo.vespa.model.builder.xml.dom.DomClientProviderBuilder; import com.yahoo.vespa.model.builder.xml.dom.DomComponentBuilder; import com.yahoo.vespa.model.builder.xml.dom.DomHandlerBuilder; import com.yahoo.vespa.model.builder.xml.dom.ModelElement; @@ -208,7 +207,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { addAccessLogs(deployState, cluster, spec); addNodes(cluster, spec, context); - addClientProviders(deployState, spec, cluster); addServerProviders(deployState, spec, cluster); // Must be added after nodes: @@ -386,17 +384,6 @@ public class ContainerModelBuilder extends ConfigModelBuilder<ContainerModel> { } } - private void addClientProviders(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { - List<Element> clientElements = XML.getChildren(spec, "client"); - if (! clientElements.isEmpty()) { - log.logApplicationPackage( - Level.WARNING, "The 'client' element is deprecated for removal in Vespa 8, with no replacement"); - } - for (Element clientSpec : clientElements) { - cluster.addComponent(new DomClientProviderBuilder(cluster).build(deployState, cluster, clientSpec)); - } - } - private void addServerProviders(DeployState deployState, Element spec, ApplicationContainerCluster cluster) { addConfiguredComponents(deployState, cluster, spec, "server"); } diff --git a/config-model/src/main/resources/schema/container.rnc b/config-model/src/main/resources/schema/container.rnc index 0786233dafd..71ce5df62d9 100644 --- a/config-model/src/main/resources/schema/container.rnc +++ b/config-model/src/main/resources/schema/container.rnc @@ -11,12 +11,6 @@ Handler = element handler { Binding = element binding {text} ServerBindings = Binding* -Client = element client { - ComponentDefinition & - element binding {text}* & - element serverBinding {text}* -} - Server = element server { ComponentDefinition } diff --git a/config-model/src/main/resources/schema/containercluster.rnc b/config-model/src/main/resources/schema/containercluster.rnc index aee003d7339..207324f8d18 100644 --- a/config-model/src/main/resources/schema/containercluster.rnc +++ b/config-model/src/main/resources/schema/containercluster.rnc @@ -19,7 +19,6 @@ ContainerServices = Component* & Embedder* & Handler* & - Client* & Server* & Http? & AccessLog* & 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> diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java index 2a723c3fa43..94499ce8230 100755 --- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java +++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java @@ -718,7 +718,6 @@ public class MessageBusVisitorSessionTestCase { } @Test - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public void testMessageParameters() { MockSender sender = new MockSender(); MockReceiver receiver = new MockReceiver(); |