diff options
author | gjoranv <gv@verizonmedia.com> | 2019-09-18 16:53:49 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2019-09-18 16:53:49 +0200 |
commit | 04b532415df6e02c45224bec7ecf2fadfe8a6cb7 (patch) | |
tree | 963566beee6477bdc5139e1146b765a0669e3d8d /config-model | |
parent | b6a52c8fda45d7d3f45a8606b419b5f4becfbaed (diff) |
Don't check for 'index' attribute on config arrays in services.xml
- Not supported since Vespa 5.1
Diffstat (limited to 'config-model')
-rw-r--r-- | config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java index 31231857aae..7d3981c9a2d 100644 --- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomConfigPayloadBuilder.java @@ -130,11 +130,7 @@ public class DomConfigPayloadBuilder { throw new ConfigurationRuntimeException("Element '" + name + "' must have either children or a value"); } - - if (element.hasAttribute("index")) { - // Check for legacy (pre Vespa 6) usage - throw new IllegalArgumentException("The 'index' attribute on config elements is not supported - use <item>"); - } else if (element.hasAttribute("operation")) { + if (element.hasAttribute("operation")) { // leaf array, currently the only supported operation is 'append' verifyLegalOperation(element); ConfigPayloadBuilder.Array a = payloadBuilder.getArray(name); @@ -156,10 +152,7 @@ public class DomConfigPayloadBuilder { private void parseComplex(Element element, List<Element> children, ConfigPayloadBuilder payloadBuilder, String parentName) { String name = extractName(element); // Inner value - if (element.hasAttribute("index")) { - // Check for legacy (pre Vespa 6) usage - throw new IllegalArgumentException("The 'index' attribute on config elements is not supported - use <item>"); - } else if (element.hasAttribute("operation")) { + if (element.hasAttribute("operation")) { // inner array, currently the only supported operation is 'append' verifyLegalOperation(element); ConfigPayloadBuilder childPayloadBuilder = payloadBuilder.getArray(name).append(); |