summaryrefslogtreecommitdiffstats
path: root/config-model/src/test
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2022-07-04 22:47:21 +0200
committerJon Bratseth <bratseth@gmail.com>2022-07-04 22:47:21 +0200
commit40744a1a30cccff9c4b4b9f67ae6891956509ee3 (patch)
tree2b904bcf1826f6748abbbb6d5d392a5a2e729570 /config-model/src/test
parentbdca3da122423f78c7dace3ab10c27c575b9fa65 (diff)
Add option to ignore undefined fields
Diffstat (limited to 'config-model/src/test')
-rw-r--r--config-model/src/test/configmodel/types/documentmanager.cfg1
-rw-r--r--config-model/src/test/configmodel/types/documenttypes.cfg1
-rw-r--r--config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg1
-rw-r--r--config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg1
-rw-r--r--config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg1
-rw-r--r--config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg1
-rw-r--r--config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg1
-rw-r--r--config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg1
-rw-r--r--config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg1
-rw-r--r--config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg1
-rw-r--r--config-model/src/test/derived/advanced/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/annotationsinheritance/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/annotationsreference/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/annotationssimple/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/annotationsstruct/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/annotationsstructarray/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/arrays/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/attributeprefetch/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/complex/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/declstruct/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/duplicate_struct/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/duplicate_struct/documenttypes.cfg1
-rw-r--r--config-model/src/test/derived/emptydefault/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/id/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg1
-rw-r--r--config-model/src/test/derived/indexswitches/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/inheritance/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/inheritdiamond/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/inheritfromparent/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/inheritfromparent/documenttypes.cfg1
-rw-r--r--config-model/src/test/derived/multi_struct/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/multi_struct/documenttypes.cfg1
-rw-r--r--config-model/src/test/derived/namecollision/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/prefixexactattribute/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/ranktypes/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/reference_from_several/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/schemainheritance/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/streamingstruct/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/structandfieldset/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/structanyorder/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/structinheritance/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/structinheritance/documenttypes.cfg1
-rw-r--r--config-model/src/test/derived/tensor/documentmanager.cfg1
-rw-r--r--config-model/src/test/derived/tensor/documenttypes.cfg1
-rw-r--r--config-model/src/test/derived/types/documentmanager.cfg1
-rw-r--r--config-model/src/test/examples/fieldoftypedocument-doctypes.cfg1
-rw-r--r--config-model/src/test/examples/fieldoftypedocument.cfg1
-rw-r--r--config-model/src/test/examples/structresult.cfg1
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java18
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java9
54 files changed, 75 insertions, 4 deletions
diff --git a/config-model/src/test/configmodel/types/documentmanager.cfg b/config-model/src/test/configmodel/types/documentmanager.cfg
index 00920cc6d76..c471935d9da 100644
--- a/config-model/src/test/configmodel/types/documentmanager.cfg
+++ b/config-model/src/test/configmodel/types/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/configmodel/types/documenttypes.cfg b/config-model/src/test/configmodel/types/documenttypes.cfg
index 7ea2fa42a2a..d35928a7a4b 100644
--- a/config-model/src/test/configmodel/types/documenttypes.cfg
+++ b/config-model/src/test/configmodel/types/documenttypes.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg b/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg
index 15430101553..f8c7dacd3af 100644
--- a/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg
+++ b/config-model/src/test/configmodel/types/documenttypes_with_doc_field.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg b/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg
index a4b37113ef1..bf2ae28c417 100644
--- a/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg
+++ b/config-model/src/test/configmodel/types/references/documentmanager_multiple_imported_fields.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg
index f6d4269abcd..7f93eea8e90 100644
--- a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg
+++ b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_other_types.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg
index 31f514b16cd..ecb499b5ed3 100644
--- a/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg
+++ b/config-model/src/test/configmodel/types/references/documentmanager_refs_to_same_type.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg b/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg
index 1582c6572da..6073faca616 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_multiple_imported_fields.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg b/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg
index 19bcb81db38..92bde94f54a 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_ref_to_self_type.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
documenttype[].id 2987301
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg
index 4222229cdd3..5ea07de4124 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_other_types.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg
index 0d3802bcbe3..f31e5f6e7c0 100644
--- a/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg
+++ b/config-model/src/test/configmodel/types/references/documenttypes_refs_to_same_type.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/derived/advanced/documentmanager.cfg b/config-model/src/test/derived/advanced/documentmanager.cfg
index 6eea5ae038b..1ad50f57e93 100644
--- a/config-model/src/test/derived/advanced/documentmanager.cfg
+++ b/config-model/src/test/derived/advanced/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg b/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg
index f15b49c6b76..1ca66a7aea2 100644
--- a/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsimplicitstruct/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg b/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg
index 4098c0fe53c..8dc07ae8eab 100644
--- a/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsinheritance/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg b/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg
index b67f1df3b4b..67c47032995 100644
--- a/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsinheritance2/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg b/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg
index df8d038fe79..dbe6054ce6c 100644
--- a/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationspolymorphy/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/annotationsreference/documentmanager.cfg b/config-model/src/test/derived/annotationsreference/documentmanager.cfg
index 94258fdb798..d27ff5c9d07 100644
--- a/config-model/src/test/derived/annotationsreference/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsreference/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/annotationssimple/documentmanager.cfg b/config-model/src/test/derived/annotationssimple/documentmanager.cfg
index e863e305643..a52837c5c06 100644
--- a/config-model/src/test/derived/annotationssimple/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationssimple/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/annotationsstruct/documentmanager.cfg b/config-model/src/test/derived/annotationsstruct/documentmanager.cfg
index 62084994721..4ab3f376d9d 100644
--- a/config-model/src/test/derived/annotationsstruct/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsstruct/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg
index 640655c53b6..c2078dfa671 100644
--- a/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg
+++ b/config-model/src/test/derived/annotationsstructarray/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/arrays/documentmanager.cfg b/config-model/src/test/derived/arrays/documentmanager.cfg
index 9bf53699140..836f3903079 100644
--- a/config-model/src/test/derived/arrays/documentmanager.cfg
+++ b/config-model/src/test/derived/arrays/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg
index 9d91ad3f5ab..a5c063108e4 100644
--- a/config-model/src/test/derived/attributeprefetch/documentmanager.cfg
+++ b/config-model/src/test/derived/attributeprefetch/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/complex/documentmanager.cfg b/config-model/src/test/derived/complex/documentmanager.cfg
index da4f2fc0942..dd0b7095d93 100644
--- a/config-model/src/test/derived/complex/documentmanager.cfg
+++ b/config-model/src/test/derived/complex/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/declstruct/documentmanager.cfg b/config-model/src/test/derived/declstruct/documentmanager.cfg
index 0286af0eade..992d210dbe2 100644
--- a/config-model/src/test/derived/declstruct/documentmanager.cfg
+++ b/config-model/src/test/derived/declstruct/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/duplicate_struct/documentmanager.cfg b/config-model/src/test/derived/duplicate_struct/documentmanager.cfg
index bb791943d41..4742a75205a 100644
--- a/config-model/src/test/derived/duplicate_struct/documentmanager.cfg
+++ b/config-model/src/test/derived/duplicate_struct/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/duplicate_struct/documenttypes.cfg b/config-model/src/test/derived/duplicate_struct/documenttypes.cfg
index 13567666674..45c1bd8700f 100644
--- a/config-model/src/test/derived/duplicate_struct/documenttypes.cfg
+++ b/config-model/src/test/derived/duplicate_struct/documenttypes.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/emptydefault/documentmanager.cfg b/config-model/src/test/derived/emptydefault/documentmanager.cfg
index a6530d49507..bf2a39df89f 100644
--- a/config-model/src/test/derived/emptydefault/documentmanager.cfg
+++ b/config-model/src/test/derived/emptydefault/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/id/documentmanager.cfg b/config-model/src/test/derived/id/documentmanager.cfg
index fafea7dd4bc..33cdbe5b996 100644
--- a/config-model/src/test/derived/id/documentmanager.cfg
+++ b/config-model/src/test/derived/id/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg b/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
index b15734169a5..c6cd1a2949d 100644
--- a/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
+++ b/config-model/src/test/derived/imported_fields_inherited_reference/documenttypes.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/indexswitches/documentmanager.cfg b/config-model/src/test/derived/indexswitches/documentmanager.cfg
index 7f6b9150e07..fa91cb0e554 100644
--- a/config-model/src/test/derived/indexswitches/documentmanager.cfg
+++ b/config-model/src/test/derived/indexswitches/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/inheritance/documentmanager.cfg b/config-model/src/test/derived/inheritance/documentmanager.cfg
index f0917864ebd..52cac7bfa79 100644
--- a/config-model/src/test/derived/inheritance/documentmanager.cfg
+++ b/config-model/src/test/derived/inheritance/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg
index 10fdcf50026..7d5dacbe00f 100644
--- a/config-model/src/test/derived/inheritdiamond/documentmanager.cfg
+++ b/config-model/src/test/derived/inheritdiamond/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg b/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg
index 8c0ffd50840..537c452c38c 100644
--- a/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg
+++ b/config-model/src/test/derived/inheritfromgrandparent/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/inheritfromparent/documentmanager.cfg b/config-model/src/test/derived/inheritfromparent/documentmanager.cfg
index 186f3c0e3c1..d246e886a3d 100644
--- a/config-model/src/test/derived/inheritfromparent/documentmanager.cfg
+++ b/config-model/src/test/derived/inheritfromparent/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg
index e8fd97671ff..efd8170d95e 100644
--- a/config-model/src/test/derived/inheritfromparent/documenttypes.cfg
+++ b/config-model/src/test/derived/inheritfromparent/documenttypes.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/multi_struct/documentmanager.cfg b/config-model/src/test/derived/multi_struct/documentmanager.cfg
index dbf753c6bc3..e37a3dc51c6 100644
--- a/config-model/src/test/derived/multi_struct/documentmanager.cfg
+++ b/config-model/src/test/derived/multi_struct/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/multi_struct/documenttypes.cfg b/config-model/src/test/derived/multi_struct/documenttypes.cfg
index 9ce19079177..93452602f86 100644
--- a/config-model/src/test/derived/multi_struct/documenttypes.cfg
+++ b/config-model/src/test/derived/multi_struct/documenttypes.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/namecollision/documentmanager.cfg b/config-model/src/test/derived/namecollision/documentmanager.cfg
index 73730595574..d8cf44a9a3d 100644
--- a/config-model/src/test/derived/namecollision/documentmanager.cfg
+++ b/config-model/src/test/derived/namecollision/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg
index be048ee2eba..d516eaf7886 100644
--- a/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg
+++ b/config-model/src/test/derived/prefixexactattribute/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/ranktypes/documentmanager.cfg b/config-model/src/test/derived/ranktypes/documentmanager.cfg
index 33d41084651..46457fb479d 100644
--- a/config-model/src/test/derived/ranktypes/documentmanager.cfg
+++ b/config-model/src/test/derived/ranktypes/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/reference_from_several/documentmanager.cfg b/config-model/src/test/derived/reference_from_several/documentmanager.cfg
index 6ac1aab0baf..28f40aeee5b 100644
--- a/config-model/src/test/derived/reference_from_several/documentmanager.cfg
+++ b/config-model/src/test/derived/reference_from_several/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/schemainheritance/documentmanager.cfg b/config-model/src/test/derived/schemainheritance/documentmanager.cfg
index 12c29667079..1fe61cf2bd2 100644
--- a/config-model/src/test/derived/schemainheritance/documentmanager.cfg
+++ b/config-model/src/test/derived/schemainheritance/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/streamingstruct/documentmanager.cfg b/config-model/src/test/derived/streamingstruct/documentmanager.cfg
index 81de2d7ebdb..b94f23a9c7b 100644
--- a/config-model/src/test/derived/streamingstruct/documentmanager.cfg
+++ b/config-model/src/test/derived/streamingstruct/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/structandfieldset/documentmanager.cfg b/config-model/src/test/derived/structandfieldset/documentmanager.cfg
index 85df5249e3a..e1169e3ca5d 100644
--- a/config-model/src/test/derived/structandfieldset/documentmanager.cfg
+++ b/config-model/src/test/derived/structandfieldset/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/structanyorder/documentmanager.cfg b/config-model/src/test/derived/structanyorder/documentmanager.cfg
index b3b6a2587c1..eac63515944 100644
--- a/config-model/src/test/derived/structanyorder/documentmanager.cfg
+++ b/config-model/src/test/derived/structanyorder/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/structinheritance/documentmanager.cfg b/config-model/src/test/derived/structinheritance/documentmanager.cfg
index ca11481afa4..37240887e3b 100644
--- a/config-model/src/test/derived/structinheritance/documentmanager.cfg
+++ b/config-model/src/test/derived/structinheritance/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/structinheritance/documenttypes.cfg b/config-model/src/test/derived/structinheritance/documenttypes.cfg
index 8b343665289..16521b920a7 100644
--- a/config-model/src/test/derived/structinheritance/documenttypes.cfg
+++ b/config-model/src/test/derived/structinheritance/documenttypes.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/tensor/documentmanager.cfg b/config-model/src/test/derived/tensor/documentmanager.cfg
index d11c67fea01..f52fe073208 100644
--- a/config-model/src/test/derived/tensor/documentmanager.cfg
+++ b/config-model/src/test/derived/tensor/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/tensor/documenttypes.cfg b/config-model/src/test/derived/tensor/documenttypes.cfg
index 9ee6a82245f..3081a5bd0c4 100644
--- a/config-model/src/test/derived/tensor/documenttypes.cfg
+++ b/config-model/src/test/derived/tensor/documenttypes.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/derived/types/documentmanager.cfg b/config-model/src/test/derived/types/documentmanager.cfg
index 9a73664ac86..118f7d279e6 100644
--- a/config-model/src/test/derived/types/documentmanager.cfg
+++ b/config-model/src/test/derived/types/documentmanager.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[].name "document"
diff --git a/config-model/src/test/examples/fieldoftypedocument-doctypes.cfg b/config-model/src/test/examples/fieldoftypedocument-doctypes.cfg
index ea56800ea1c..2efc2f40d21 100644
--- a/config-model/src/test/examples/fieldoftypedocument-doctypes.cfg
+++ b/config-model/src/test/examples/fieldoftypedocument-doctypes.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/examples/fieldoftypedocument.cfg b/config-model/src/test/examples/fieldoftypedocument.cfg
index b59b3206a2d..10c66ce3e93 100644
--- a/config-model/src/test/examples/fieldoftypedocument.cfg
+++ b/config-model/src/test/examples/fieldoftypedocument.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/examples/structresult.cfg b/config-model/src/test/examples/structresult.cfg
index 34383084625..2e3904b7110 100644
--- a/config-model/src/test/examples/structresult.cfg
+++ b/config-model/src/test/examples/structresult.cfg
@@ -1,3 +1,4 @@
+ignoreundefinedfields false
enablecompression false
usev8geopositions false
doctype[0].name "document"
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
index b4242336c5c..ca0b4681e51 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerDocumentApiBuilderTest.java
@@ -5,7 +5,9 @@ import com.yahoo.config.model.builder.xml.test.DomBuilderTest;
import com.yahoo.config.model.test.MockApplicationPackage;
import com.yahoo.config.model.test.MockRoot;
import com.yahoo.container.handler.threadpool.ContainerThreadpoolConfig;
+import com.yahoo.document.config.DocumentmanagerConfig;
import com.yahoo.vespa.model.container.ContainerCluster;
+import com.yahoo.vespa.model.container.ContainerModel;
import com.yahoo.vespa.model.container.component.Handler;
import com.yahoo.vespa.model.container.component.SystemBindingPattern;
import com.yahoo.vespa.model.container.component.UserBindingPattern;
@@ -63,7 +65,7 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
}
@Test
- public void requireThatHandlersAreSetup() {
+ public void test_handler_setup() {
Element elem = DomBuilderTest.parse(
"<container id='cluster1' version='1.0'>",
" <document-api />",
@@ -86,6 +88,20 @@ public class ContainerDocumentApiBuilderTest extends ContainerModelBuilderTestBa
}
@Test
+ public void nonexisting_fields_can_be_ignored() {
+ Element elem = DomBuilderTest.parse(
+ "<container id='cluster1' version='1.0'>",
+ " <document-api ignore-undefined-fields='true' />",
+ nodesXml,
+ "</container>");
+ ContainerModel model = createModel(root, elem).get(0);
+
+ var documentManager = new DocumentmanagerConfig.Builder();
+ model.getCluster().getConfig(documentManager);
+ assertTrue(documentManager.build().ignoreundefinedfields());
+ }
+
+ @Test
public void feeding_api_have_separate_threadpools() {
Element elem = DomBuilderTest.parse(
"<container id='cluster1' version='1.0'>",
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
index cfe4b72f37d..7e8852ce85a 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/container/xml/ContainerModelBuilderTestBase.java
@@ -56,18 +56,21 @@ public abstract class ContainerModelBuilderTestBase {
createModel(root, clusterElem);
}
- public static void createModel(MockRoot root, DeployState deployState, VespaModel vespaModel, Element... containerElems) {
+ public static List<ContainerModel> createModel(MockRoot root, DeployState deployState, VespaModel vespaModel, Element... containerElems) {
+ List<ContainerModel> containerModels = new ArrayList<>();
for (Element containerElem : containerElems) {
ContainerModel model = new ContainerModelBuilder(false, ContainerModelBuilder.Networking.enable)
.build(deployState, vespaModel, null, root, containerElem);
ContainerCluster<?> cluster = model.getCluster();
generateDefaultSearchChains(cluster);
+ containerModels.add(model);
}
root.freezeModelTopology();
+ return containerModels;
}
- public static void createModel(MockRoot root, Element... containerElems) {
- createModel(root, DeployState.createTestState(), null, containerElems);
+ public static List<ContainerModel> createModel(MockRoot root, Element... containerElems) {
+ return createModel(root, DeployState.createTestState(), null, containerElems);
}
public static void createModel(MockRoot root, DeployLogger testLogger, Element... containerElems) {