summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorArne Juul <arnej@yahoo-inc.com>2018-11-23 11:55:15 +0000
committergjoranv <gv@oath.com>2019-01-21 15:09:29 +0100
commit07993c57daa824c9cf6d5c0c7285cb0bf0d13d3b (patch)
treeb44116982db2ef06186893daa9ba80164a1ccd68
parent595f2111f828745cd75adad67e5e80bfe81ed353 (diff)
disallow old top-level "cluster", hope nobody uses it
update todo for old top-level tag "config", used by several unit tests.
-rw-r--r--config-model/src/main/java/com/yahoo/config/model/ConfigModelRepo.java9
-rw-r--r--config-model/src/main/java/com/yahoo/searchdefinition/document/SDDocumentType.java4
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;