From 07993c57daa824c9cf6d5c0c7285cb0bf0d13d3b Mon Sep 17 00:00:00 2001 From: Arne Juul Date: Fri, 23 Nov 2018 11:55:15 +0000 Subject: disallow old top-level "cluster", hope nobody uses it update todo for old top-level tag "config", used by several unit tests. --- .../src/main/java/com/yahoo/config/model/ConfigModelRepo.java | 9 +++++++-- .../java/com/yahoo/searchdefinition/document/SDDocumentType.java | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java index 0b638c14485..93ff88f182b 100644 --- a/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java +++ b/config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java @@ -125,8 +125,13 @@ public class ConfigModelRepo implements ConfigModelRepoAdder, Serializable, Iter for (Element servicesElement : children) { String tagName = servicesElement.getTagName(); - if (tagName.equals("config")) continue; // TODO: Remove on Vespa 6 - if (tagName.equals("cluster")) continue; // TODO: Remove on Vespa 6 + if (tagName.equals("config")) { + // TODO: disallow on Vespa 8 + continue; + } + if (tagName.equals("cluster")) { + throw new IllegalArgumentException("<" + tagName + "> on top-level is not allowed anymore"); + } if ((tagName.equals("clients")) && deployState.isHosted()) throw new IllegalArgumentException("<" + tagName + "> is not allowed when running Vespa in a hosted environment"); diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java index c7b698f5835..692fe7666d4 100644 --- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java +++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java @@ -260,9 +260,9 @@ public class SDDocumentType implements Cloneable, Serializable { } } } - } + } - public SDField addField(String string, DataType dataType) { + public SDField addField(String string, DataType dataType) { SDField field = new SDField(this, string, dataType); addField(field); return field; -- cgit v1.2.3