diff options
7 files changed, 5 insertions, 19 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java index bbc18ab2254..025a6377b04 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java @@ -51,14 +51,6 @@ public class DomHandlerBuilder extends VespaDomBuilder.DomConfigProducerBuilder< for (Element binding : XML.getChildren(handlerElement, "binding")) addServerBinding(handler, UserBindingPattern.fromPattern(XML.getValue(binding)), deployState.getDeployLogger()); - List<Element> clientBindingsElements = XML.getChildren(handlerElement, "clientBinding"); - if (! clientBindingsElements.isEmpty()) { - deployState.getDeployLogger().logApplicationPackage( - Level.WARNING, "The 'clientBindings' element is deprecated for removal in Vespa 8, with no replacement"); - } - for (Element clientBinding : clientBindingsElements) - handler.addClientBindings(UserBindingPattern.fromPattern(XML.getValue(clientBinding))); - DomComponentBuilder.addChildren(deployState, parent, handlerElement, handler); return handler; diff --git a/config-model/src/main/resources/schema/container.rnc b/config-model/src/main/resources/schema/container.rnc index 4284dccc7c5..0786233dafd 100644 --- a/config-model/src/main/resources/schema/container.rnc +++ b/config-model/src/main/resources/schema/container.rnc @@ -5,8 +5,7 @@ include "processing.rnc" Handler = element handler { ComponentDefinition & - ServerBindings & - element clientBinding {text}* + ServerBindings } Binding = element binding {text} 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 527b29f398d..f6103854cda 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 @@ -102,6 +102,7 @@ import static org.junit.Assert.fail; * @author gjoranv */ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { + @Rule public TemporaryFolder applicationFolder = new TemporaryFolder(); @@ -293,7 +294,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { assertThat(discBindingsConfig, containsString("{discHandler}")); assertThat(discBindingsConfig, containsString(".serverBindings[0] \"http://*/binding0\"")); assertThat(discBindingsConfig, containsString(".serverBindings[1] \"http://*/binding1\"")); - assertThat(discBindingsConfig, containsString(".clientBindings[0] \"http://*/clientBinding\"")); } @Test @@ -308,7 +308,6 @@ public class ContainerModelBuilderTest extends ContainerModelBuilderTestBase { " <handler id='discHandler'>", " <binding>http://*/binding0</binding>", " <binding>http://*/binding1</binding>", - " <clientBinding>http://*/clientBinding</clientBinding>", " </handler>", "</container>"); diff --git a/config-model/src/test/schema-test-files/services.xml b/config-model/src/test/schema-test-files/services.xml index 8ebcd549a03..4cc8918cf85 100644 --- a/config-model/src/test/schema-test-files/services.xml +++ b/config-model/src/test/schema-test-files/services.xml @@ -193,8 +193,6 @@ <handler id="jdisc-handler"> <binding>http://*:*/HelloWorld</binding> <binding>http://*:*/Status</binding> - <clientBinding>http://*:*/foo</clientBinding> - <clientBinding>http://*:*/bar</clientBinding> </handler> <client id="client-provider"> 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 0735debdf23..a777f11f207 100644 --- a/config-model/src/test/schema-test-files/standalone-container.xml +++ b/config-model/src/test/schema-test-files/standalone-container.xml @@ -93,8 +93,6 @@ <handler id="jdisc-handler"> <binding>http://*:*/HelloWorld</binding> <binding>http://*:*/Status</binding> - <clientBinding>http://*:*/foo</clientBinding> - <clientBinding>http://*:*/bar</clientBinding> </handler> <client id="client-provider"> diff --git a/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java b/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java index 6f3d332a17c..93ba8089395 100644 --- a/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java +++ b/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java @@ -23,7 +23,7 @@ public class CallbackTestCase { private DocumentPut put1; private DocumentPut put2; - private List<DocumentOperation> operations = new ArrayList<>(2); + private final List<DocumentOperation> operations = new ArrayList<>(2); DocprocService service; @Before diff --git a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java index fa214808ae3..b46f23923f5 100644 --- a/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java +++ b/vespa-http-client/src/main/java/com/yahoo/vespa/http/client/core/api/FeedClientImpl.java @@ -52,8 +52,8 @@ public class FeedClientImpl implements FeedClient { timeoutExecutor, clock); if (warningPrinted.compareAndSet(false, true)) { - log.warning("The vespa-http-client is deprecated and will be removed in Vespa 8. " + - "See https://docs.vespa.ai/en/vespa8-release-notes.html"); + log.warning("The vespa-http-client is deprecated and will be removed on Vespa 8. " + + "See https://docs.vespa.ai/en/vespa8-release-notes.html"); } } |