Use modern syntax

36 files changed, 47 insertions, 39 deletions

diff --git a/config-model/src/test/derived/newrank/newrank.sd b/config-model/src/test/derived/newrank/newrank.sd
index 8990f1b4163..345d01bffb5 100644
--- a/config-model/src/test/derived/newrank/newrank.sd
+++ b/config-model/src/test/derived/newrank/newrank.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search newrank{
+schema newrank{
   document newrank{
 
     field bgndata type string {
diff --git a/config-model/src/test/derived/nuwa/newsindex.sd b/config-model/src/test/derived/nuwa/newsindex.sd
index 4d81df85000..9fe3c125b97 100644
--- a/config-model/src/test/derived/nuwa/newsindex.sd
+++ b/config-model/src/test/derived/nuwa/newsindex.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search newsindex {
+schema newsindex {
 
   document newsindex {
 
diff --git a/config-model/src/test/derived/orderilscripts/orderilscripts.sd b/config-model/src/test/derived/orderilscripts/orderilscripts.sd
index dd4598efd0b..02c1dd667b0 100755
--- a/config-model/src/test/derived/orderilscripts/orderilscripts.sd
+++ b/config-model/src/test/derived/orderilscripts/orderilscripts.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search orderilscripts {
+schema orderilscripts {
 
     document orderilscripts {
         field foo type string {
diff --git a/config-model/src/test/derived/position_array/position_array.sd b/config-model/src/test/derived/position_array/position_array.sd
index af76106859c..cafdc15b9d2 100644
--- a/config-model/src/test/derived/position_array/position_array.sd
+++ b/config-model/src/test/derived/position_array/position_array.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search position_array {
+schema position_array {
     document position_array {
         field pos type array<position> {
             indexing: attribute
diff --git a/config-model/src/test/derived/position_attribute/position_attribute.sd b/config-model/src/test/derived/position_attribute/position_attribute.sd
index a524143376f..b55ac26b399 100644
--- a/config-model/src/test/derived/position_attribute/position_attribute.sd
+++ b/config-model/src/test/derived/position_attribute/position_attribute.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search position_attribute {
+schema position_attribute {
     document position_attribute {
         field pos type position {
             indexing: attribute
diff --git a/config-model/src/test/derived/position_extra/position_extra.sd b/config-model/src/test/derived/position_extra/position_extra.sd
index a7cc8ef8cc4..d850113b723 100644
--- a/config-model/src/test/derived/position_extra/position_extra.sd
+++ b/config-model/src/test/derived/position_extra/position_extra.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search position_extra {
+schema position_extra {
     document position_extra {
         field pos_str type string {
 
diff --git a/config-model/src/test/derived/position_nosummary/position_nosummary.sd b/config-model/src/test/derived/position_nosummary/position_nosummary.sd
index d20e7a412dc..5aa40d98811 100644
--- a/config-model/src/test/derived/position_nosummary/position_nosummary.sd
+++ b/config-model/src/test/derived/position_nosummary/position_nosummary.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search position_nosummary {
+schema position_nosummary {
     document position_nosummary {
         field pos type position {
             indexing: attribute
diff --git a/config-model/src/test/derived/position_summary/position_summary.sd b/config-model/src/test/derived/position_summary/position_summary.sd
index 59b930bc9e4..f30e3d92c6a 100644
--- a/config-model/src/test/derived/position_summary/position_summary.sd
+++ b/config-model/src/test/derived/position_summary/position_summary.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search position_summary {
+schema position_summary {
     document position_summary {
         field pos type position {
             indexing: attribute | summary
diff --git a/config-model/src/test/derived/predicate_attribute/predicate_attribute.sd b/config-model/src/test/derived/predicate_attribute/predicate_attribute.sd
index f03d9d6b294..76482870719 100644
--- a/config-model/src/test/derived/predicate_attribute/predicate_attribute.sd
+++ b/config-model/src/test/derived/predicate_attribute/predicate_attribute.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search predicate_type {
+schema predicate_type {
     document predicate_type {
         field some_predicate_field type predicate {
             indexing: attribute | summary
diff --git a/config-model/src/test/derived/prefixexactattribute/prefixexactattribute.sd b/config-model/src/test/derived/prefixexactattribute/prefixexactattribute.sd
index 03a8d05f1ad..119ec88c33c 100644
--- a/config-model/src/test/derived/prefixexactattribute/prefixexactattribute.sd
+++ b/config-model/src/test/derived/prefixexactattribute/prefixexactattribute.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search prefixexactattribute {
+schema prefixexactattribute {
 
   document prefixexactattribute {
 
diff --git a/config-model/src/test/derived/rankingexpression/rankexpression.sd b/config-model/src/test/derived/rankingexpression/rankexpression.sd
index 25d657eaf0b..a5e7f07f6ac 100644
--- a/config-model/src/test/derived/rankingexpression/rankexpression.sd
+++ b/config-model/src/test/derived/rankingexpression/rankexpression.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search rankexpression {
+schema rankexpression {
   
   document rankexpression {
 
diff --git a/config-model/src/test/derived/rankprofiles/rankprofiles.sd b/config-model/src/test/derived/rankprofiles/rankprofiles.sd
index 4b0a7702d6c..9966e304b78 100644
--- a/config-model/src/test/derived/rankprofiles/rankprofiles.sd
+++ b/config-model/src/test/derived/rankprofiles/rankprofiles.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search rankprofiles {
+schema rankprofiles {
 
   document rankprofiles {
 
diff --git a/config-model/src/test/derived/rankproperties/rankproperties.sd b/config-model/src/test/derived/rankproperties/rankproperties.sd
index db259f1daec..a2eb987d4ff 100644
--- a/config-model/src/test/derived/rankproperties/rankproperties.sd
+++ b/config-model/src/test/derived/rankproperties/rankproperties.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search rankproperties {
+schema rankproperties {
 
   document rankproperties {
 
diff --git a/config-model/src/test/derived/ranktypes/ranktypes.sd b/config-model/src/test/derived/ranktypes/ranktypes.sd
index 1651d43afa6..8f11a21236d 100644
--- a/config-model/src/test/derived/ranktypes/ranktypes.sd
+++ b/config-model/src/test/derived/ranktypes/ranktypes.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search ranktypes {
+schema ranktypes {
 
   document ranktypes {
 
diff --git a/config-model/src/test/derived/reference_fields/ad.sd b/config-model/src/test/derived/reference_fields/ad.sd
index 9a4f52c7f8a..a39ec2f67ab 100644
--- a/config-model/src/test/derived/reference_fields/ad.sd
+++ b/config-model/src/test/derived/reference_fields/ad.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search ad {
+schema ad {
   document ad {
     field campaign_ref type reference<campaign> {
       indexing: attribute | summary
diff --git a/config-model/src/test/derived/reference_fields/campaign.sd b/config-model/src/test/derived/reference_fields/campaign.sd
index dce3a84320a..026d520dfb3 100644
--- a/config-model/src/test/derived/reference_fields/campaign.sd
+++ b/config-model/src/test/derived/reference_fields/campaign.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search campaign {
+schema campaign {
   document campaign {
   }
 }
diff --git a/config-model/src/test/derived/renamedfeatures/foo.sd b/config-model/src/test/derived/renamedfeatures/foo.sd
index 462eb0da44e..7ab4da4de33 100644
--- a/config-model/src/test/derived/renamedfeatures/foo.sd
+++ b/config-model/src/test/derived/renamedfeatures/foo.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search foo {
+schema foo {
 
   document foo {
     field title type string {
diff --git a/config-model/src/test/derived/reserved_position/reserved_position.sd b/config-model/src/test/derived/reserved_position/reserved_position.sd
index c910ced1477..68879c53e89 100644
--- a/config-model/src/test/derived/reserved_position/reserved_position.sd
+++ b/config-model/src/test/derived/reserved_position/reserved_position.sd
@@ -1,4 +1,4 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search position {
+schema position {
     document position { }
 }
diff --git a/config-model/src/test/derived/schemainheritance/parent.sd b/config-model/src/test/derived/schemainheritance/parent.sd
index 41c2d89fff5..3635a179b44 100644
--- a/config-model/src/test/derived/schemainheritance/parent.sd
+++ b/config-model/src/test/derived/schemainheritance/parent.sd
@@ -36,5 +36,5 @@ schema parent {
     }
     import field importedschema_ref.importedfield1 as parent_imported {
     }
-    raw-as-base64-in-summary
+    raw-as-base64-in-summary: true
 }
diff --git a/config-model/src/test/derived/slice/test.sd b/config-model/src/test/derived/slice/test.sd
index c2060300785..0c351d4323d 100644
--- a/config-model/src/test/derived/slice/test.sd
+++ b/config-model/src/test/derived/slice/test.sd
@@ -1,4 +1,4 @@
-search test {
+schema test {
 
     document test {
     }
diff --git a/config-model/src/test/derived/sorting/sorting.sd b/config-model/src/test/derived/sorting/sorting.sd
index a08b00ed9ac..7317c784f66 100644
--- a/config-model/src/test/derived/sorting/sorting.sd
+++ b/config-model/src/test/derived/sorting/sorting.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search sorting {
+schema sorting {
 
   document sorting {
 
diff --git a/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd b/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd
index bffc2f0cda2..392911d4b34 100644
--- a/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd
+++ b/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search streamingjuniper {
+schema streamingjuniper {
   document streamingjuniper {
     field f1 type string {
       indexing: index | summary
diff --git a/config-model/src/test/derived/streamingstruct/streamingstruct.sd b/config-model/src/test/derived/streamingstruct/streamingstruct.sd
index 32f58cc7a5e..59c325f8117 100644
--- a/config-model/src/test/derived/streamingstruct/streamingstruct.sd
+++ b/config-model/src/test/derived/streamingstruct/streamingstruct.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search streamingstruct {
+schema streamingstruct {
 
   document streamingstruct {
     field coupleof type string {
@@ -15,7 +15,9 @@ search streamingstruct {
 
     struct s1 {
       field f1 type string { }
-      field f1s type string { match: substring }
+      field f1s type string {
+        match: substring
+      }
       field f2 type int { }
       field f3 type double { }
       # Allow default matchtypes in struct. Can be overridden.
diff --git a/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd b/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd
index d91020f6562..ecb7a177775 100644
--- a/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd
+++ b/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search streamingstructdefault {
+schema streamingstructdefault {
   document streamingstructdefault {
     struct sct {
       field s1 type string {}
diff --git a/config-model/src/test/derived/structandfieldset/test.sd b/config-model/src/test/derived/structandfieldset/test.sd
index da12787e564..0b50738ab54 100644
--- a/config-model/src/test/derived/structandfieldset/test.sd
+++ b/config-model/src/test/derived/structandfieldset/test.sd
@@ -13,7 +13,9 @@ schema test {
 
         field people type array<person> {
             indexing: summary
-            struct-field first_name { indexing: attribute }
+            struct-field first_name {
+                indexing: attribute
+            }
             struct-field last_name  {
                 indexing: attribute
                 rank: filter
diff --git a/config-model/src/test/derived/structanyorder/structanyorder.sd b/config-model/src/test/derived/structanyorder/structanyorder.sd
index 7ca35cd0ec1..829ef04a1d5 100755
--- a/config-model/src/test/derived/structanyorder/structanyorder.sd
+++ b/config-model/src/test/derived/structanyorder/structanyorder.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search annotationsimplicitstruct {
+schema annotationsimplicitstruct {
 
   document annotationsimplicitstruct {
       field structfield type sct {
diff --git a/config-model/src/test/derived/structinheritance/bad.sd b/config-model/src/test/derived/structinheritance/bad.sd
index ef5137842ec..31bef765142 100644
--- a/config-model/src/test/derived/structinheritance/bad.sd
+++ b/config-model/src/test/derived/structinheritance/bad.sd
@@ -1,6 +1,6 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search bad {
+schema bad {
   document bad {
     struct base {
       field name type string {}
diff --git a/config-model/src/test/derived/structinheritance/simple.sd b/config-model/src/test/derived/structinheritance/simple.sd
index 8b4bb6150c1..0e56be4fec8 100644
--- a/config-model/src/test/derived/structinheritance/simple.sd
+++ b/config-model/src/test/derived/structinheritance/simple.sd
@@ -1,6 +1,6 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 
-search simple {
+schema simple {
   document simple {
     struct base {
       field name type string {}
diff --git a/config-model/src/test/derived/tensor/tensor.sd b/config-model/src/test/derived/tensor/tensor.sd
index 8845b5c7447..89c00ec80cb 100644
--- a/config-model/src/test/derived/tensor/tensor.sd
+++ b/config-model/src/test/derived/tensor/tensor.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search tensor {
+schema tensor {
 
   document tensor {
     field f1 type tensor(x[3]) {
diff --git a/config-model/src/test/derived/tensor2/first.sd b/config-model/src/test/derived/tensor2/first.sd
index 22b10ab5e3d..900cf515176 100644
--- a/config-model/src/test/derived/tensor2/first.sd
+++ b/config-model/src/test/derived/tensor2/first.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search first {
+schema first {
   document first {
     field first_field type tensor(first[10]) {
       indexing: summary | attribute
diff --git a/config-model/src/test/derived/tensor2/second.sd b/config-model/src/test/derived/tensor2/second.sd
index a347d511d80..a43495b7604 100644
--- a/config-model/src/test/derived/tensor2/second.sd
+++ b/config-model/src/test/derived/tensor2/second.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search second {
+schema second {
   document second {
     field second_field type tensor(second[10]) {
       indexing: summary | attribute
diff --git a/config-model/src/test/derived/twostreamingstructs/streamingstruct.sd b/config-model/src/test/derived/twostreamingstructs/streamingstruct.sd
index 0636e7a537e..a0f2888bc2a 100644
--- a/config-model/src/test/derived/twostreamingstructs/streamingstruct.sd
+++ b/config-model/src/test/derived/twostreamingstructs/streamingstruct.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search streamingstruct {
+schema streamingstruct {
 
   document streamingstruct {
     field coupleof type string {
@@ -15,7 +15,9 @@ search streamingstruct {
 
     struct s1 {
       field f1 type string { }
-      field f1s type string { match: substring }
+      field f1s type string {
+        match: substring
+      }
       field f2 type int { }
       field f3 type double { }
       # Allow default matchtypes in struct. Can be overridden.
@@ -24,7 +26,9 @@ search streamingstruct {
 
     struct ns1 {
       field nf1 type s1 { }
-      field nf1s type s1 { match: substring }
+      field nf1s type s1 {
+        match: substring
+      }
       field nf2 type string { }
       # May specify nested structs.
     }
diff --git a/config-model/src/test/derived/twostreamingstructs/whatever.sd b/config-model/src/test/derived/twostreamingstructs/whatever.sd
index 17ac30102a8..c8c7279e4e1 100644
--- a/config-model/src/test/derived/twostreamingstructs/whatever.sd
+++ b/config-model/src/test/derived/twostreamingstructs/whatever.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search whatever {
+schema whatever {
 
   document whatever {
     struct pair {
diff --git a/config-model/src/test/derived/types/types.sd b/config-model/src/test/derived/types/types.sd
index 15fab360940..3a0eef1332d 100644
--- a/config-model/src/test/derived/types/types.sd
+++ b/config-model/src/test/derived/types/types.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search types {
+schema types {
 
   document types {
 
diff --git a/config-model/src/test/derived/uri_array/uri_array.sd b/config-model/src/test/derived/uri_array/uri_array.sd
index b0b874ba2c3..6521f332a2f 100644
--- a/config-model/src/test/derived/uri_array/uri_array.sd
+++ b/config-model/src/test/derived/uri_array/uri_array.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search uri_array {
+schema uri_array {
     document uri_array {
         field my_uri type array<uri> {
             indexing: index
diff --git a/config-model/src/test/derived/uri_wset/uri_wset.sd b/config-model/src/test/derived/uri_wset/uri_wset.sd
index ec08428019e..8af136bbfef 100644
--- a/config-model/src/test/derived/uri_wset/uri_wset.sd
+++ b/config-model/src/test/derived/uri_wset/uri_wset.sd
@@ -1,5 +1,5 @@
 # Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-search uri_wset {
+schema uri_wset {
     document uri_wset {
         field my_uri type weightedset<uri> {
             indexing: index