Revert "remove "header" and "body" keywords"

This reverts commit e24c1df653d6470089f05786d74e729bb8f82990.

7 files changed, 34 insertions, 6 deletions

diff --git a/config-model/src/test/derived/inheritstruct/child.sd b/config-model/src/test/derived/inheritstruct/child.sd
index 5ac69c429e1..cd3d4f51458 100644
--- a/config-model/src/test/derived/inheritstruct/child.sd
+++ b/config-model/src/test/derived/inheritstruct/child.sd
@@ -3,6 +3,7 @@ search child {
     document child inherits parent {
       field child_struct_field type my_struct {
         indexing: summary | index
+        header
         match: prefix
       }
     }
diff --git a/config-model/src/test/derived/mail/mail.sd b/config-model/src/test/derived/mail/mail.sd
index 5c19522125c..6d30891f307 100644
--- a/config-model/src/test/derived/mail/mail.sd
+++ b/config-model/src/test/derived/mail/mail.sd
@@ -54,31 +54,38 @@ search mail {
     field body type string {
       indexing: summary | index
       match: substring
+      body
     }
 
     field attachmentcount type int {
       indexing: summary | index
+      body
     }
 
     field attachmentnames type string {
       indexing: index
+      body
     }
 
     field attachmenttypes type string {
       indexing: index
+      body
     }
 
     field attachmentlanguages type string {
       indexing: index
       match: prefix
+      body
     }
 
     field attachmentcontent type string {
       indexing: summary | index
       match: prefix
+      body
     }
 
     field attachments type raw[] {
+      body
     }
 
   }
diff --git a/config-model/src/test/derived/music3/music3.sd b/config-model/src/test/derived/music3/music3.sd
index c49b0c5aaee..8aeed27d29f 100644
--- a/config-model/src/test/derived/music3/music3.sd
+++ b/config-model/src/test/derived/music3/music3.sd
@@ -5,25 +5,37 @@ search music3 {
 
     field title type string {
       indexing: summary | index
+      # index-to: title, default
       rank-type: about
+
+      header
     }
 
     field artist type string {
       indexing: summary | attribute | index
+      # index-to: artist, default
       rank-type:about
+
+      header
     }
 
     field year type int {
       indexing: summary | attribute
+
+      header
     }
 
     # Increase rank score of popular documents regardless of query
     field popularity type int {
       indexing: summary | attribute
+
+      header
     }
 
     field url type uri {
       indexing: summary | index
+
+      header
     }
 
   }
diff --git a/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd b/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd
index 92b833ffd5d..0d81ecd21f3 100644
--- a/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd
+++ b/config-model/src/test/derived/streamingjuniper/streamingjuniper.sd
@@ -3,10 +3,12 @@ search streamingjuniper {
   document streamingjuniper {
     field f1 type string {
       indexing: index | summary
+      header
       bolding: on
     }
     field f2 type string {
       indexing: index | summary
+      header
       summary: dynamic
     }
   }
diff --git a/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd b/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd
index 46112db7454..6d16a1b3808 100644
--- a/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd
+++ b/config-model/src/test/derived/streamingstructdefault/streamingstructdefault.sd
@@ -8,9 +8,11 @@ search streamingstructdefault {
     field f1 type array<string> {
       indexing: index | summary
       summary-to: default
+      header
     }
     field f2 type array<sct> {
       indexing: index | summary
+      header
     }
   }
   document-summary default {
diff --git a/config-model/src/test/derived/twostreamingstructs/whatever.sd b/config-model/src/test/derived/twostreamingstructs/whatever.sd
index 5600b0cec7d..25da3f06a38 100644
--- a/config-model/src/test/derived/twostreamingstructs/whatever.sd
+++ b/config-model/src/test/derived/twostreamingstructs/whatever.sd
@@ -9,6 +9,7 @@ search whatever {
 
     field f1 type pair {
       indexing: summary
+      body
     }
   }
 
diff --git a/config-model/src/test/derived/types/types.sd b/config-model/src/test/derived/types/types.sd
index d3d8aa82b28..839cb08dbd6 100644
--- a/config-model/src/test/derived/types/types.sd
+++ b/config-model/src/test/derived/types/types.sd
@@ -93,9 +93,9 @@ search types {
     #field wildcardfield2 type map<?,?> {
     #}
 
-    field arrarr type array<array<array<string>>> {}
-    field maparr type array<map<string, string>> {}
-    field complexarray type array< map<int, array<array<string>>> > {}
+    field arrarr type array<array<array<string>>> {header}
+    field maparr type array<map<string, string>> {header}
+    field complexarray type array< map<int, array<array<string>>> > {body}
 
     struct mystruct {
       field bytearr type array<byte>{}
@@ -104,9 +104,9 @@ search types {
       field structfield type string {}
     }
 
-    field mystructfield type mystruct {}
-    field mystructmap type map<int, mystruct> {}
-    field mystructarr type array<mystruct> {}
+    field mystructfield type mystruct {header}
+    field mystructmap type map<int, mystruct> {header}
+    field mystructarr type array<mystruct> {header}
 
     struct folder {
       field Version                   type int {}
@@ -133,6 +133,7 @@ search types {
         create-if-nonexistent
         remove-if-zero
       }
+      header
     }
 
     # Field defined same way as tag    
@@ -142,11 +143,13 @@ search types {
         create-if-nonexistent
         remove-if-zero
       }
+      header
     }
 
   }
 
   field pst_sta_boldingoff_nomatch_tag_01 type tag {
+    body
   } 
 
   field other type long {