diff options
| author | gjoranv <gv@verizonmedia.com> | 2022-01-14 22:08:37 +0100 |
|---|---|---|
| committer | gjoranv <gv@verizonmedia.com> | 2022-01-14 22:08:37 +0100 |
| commit | d90dd166005897a0bb8eae4dde68936da432b0ec (patch) | |
| tree | 1cc17efecd13f486d73f897a359ecdc372f3212e | |
| parent | 3ecb072685b30c4851bbf3469695ca98ba3a6a63 (diff) | |
Deprecate the 'handler/clientBinding' element.
| -rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomHandlerBuilder.java | 9 |
1 files changed, 8 insertions, 1 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 0b32c77fe58..bbc18ab2254 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 @@ -15,7 +15,9 @@ import com.yahoo.vespa.model.container.component.UserBindingPattern; import com.yahoo.vespa.model.container.xml.BundleInstantiationSpecificationBuilder; import org.w3c.dom.Element; +import java.util.List; import java.util.Set; +import java.util.logging.Level; import static com.yahoo.vespa.model.container.ApplicationContainerCluster.METRICS_V2_HANDLER_BINDING_1; import static com.yahoo.vespa.model.container.ApplicationContainerCluster.METRICS_V2_HANDLER_BINDING_2; @@ -49,7 +51,12 @@ public class DomHandlerBuilder extends VespaDomBuilder.DomConfigProducerBuilder< for (Element binding : XML.getChildren(handlerElement, "binding")) addServerBinding(handler, UserBindingPattern.fromPattern(XML.getValue(binding)), deployState.getDeployLogger()); - for (Element clientBinding : XML.getChildren(handlerElement, "clientBinding")) + 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); |