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

This reverts commit e24c1df653d6470089f05786d74e729bb8f82990.

9 files changed, 37 insertions, 0 deletions

diff --git a/config-model/src/test/cfg/admin/metricconfig/searchdefinitions/music.sd b/config-model/src/test/cfg/admin/metricconfig/searchdefinitions/music.sd
index 5baa006da5d..f7b182f66ea 100644
--- a/config-model/src/test/cfg/admin/metricconfig/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/admin/metricconfig/searchdefinitions/music.sd
@@ -3,9 +3,13 @@ search music      {
         document music    {
                 field f1 type string    {
                         indexing: summary | index
+                        # index-to: f1, all
+                        header
                 }
                 field f2 type string    {
                         indexing: summary | index
+                        # index-to: f2, all
+                        body
                 }
         }
 }
diff --git a/config-model/src/test/cfg/application/app1/searchdefinitions/music.sd b/config-model/src/test/cfg/application/app1/searchdefinitions/music.sd
index bdf4c060cf7..dda729d6a35 100644
--- a/config-model/src/test/cfg/application/app1/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/application/app1/searchdefinitions/music.sd
@@ -9,28 +9,34 @@ search music {
       indexing: summary | index   # How this field should be indexed
       # index-to: title, default    # Create two indexes
       rank-type: about            # Type of ranking settings to apply
+      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
+      body
     }
 
     field url type uri {
       indexing: summary | index
+      header
     }
 
     field cover type raw {
+      body
     }
 
   }
diff --git a/config-model/src/test/cfg/application/app_genericservices/searchdefinitions/music.sd b/config-model/src/test/cfg/application/app_genericservices/searchdefinitions/music.sd
index bdf4c060cf7..dda729d6a35 100644
--- a/config-model/src/test/cfg/application/app_genericservices/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/application/app_genericservices/searchdefinitions/music.sd
@@ -9,28 +9,34 @@ search music {
       indexing: summary | index   # How this field should be indexed
       # index-to: title, default    # Create two indexes
       rank-type: about            # Type of ranking settings to apply
+      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
+      body
     }
 
     field url type uri {
       indexing: summary | index
+      header
     }
 
     field cover type raw {
+      body
     }
 
   }
diff --git a/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/mobile.sd b/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/mobile.sd
index d87d582223f..feae86fe966 100644
--- a/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/mobile.sd
+++ b/config-model/src/test/cfg/routing/content_two_clusters/searchdefinitions/mobile.sd
@@ -3,9 +3,13 @@ search mobile      {
         document mobile    {
                 field f1 type string    {
                         indexing: summary | index
+                        # index-to: f1, all
+                        header
                 }
                 field f2 type string    {
                         indexing: summary | index
+                        # index-to: f2, all
+                        body
                 }
         }
 }
diff --git a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd b/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd
index e6707345235..8cc6d05584c 100644
--- a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd
+++ b/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTEdge.sd
@@ -4,6 +4,7 @@ document TTEdge {
 # This field will contain a colon separate map for travel times per transport mode
     field TransportMode type array<string> {
         indexing: summary | index
+        header
     }
 }
 
diff --git a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd b/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd
index c0032474b89..0cb0596b31c 100644
--- a/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd
+++ b/config-model/src/test/cfg/search/data/travel/searchdefinitions/TTPOI.sd
@@ -4,11 +4,15 @@ document TTPOI {
 # categories associated with the POI
     field Categories type array<string> {
         indexing: summary | index
+        # index-to: Categories
+        header
     }
 
 # sub catagories associated with the POI
     field SubCategories type array<string> {
         indexing: summary | index
+        # index-to: SubCategories
+        header
     }
 }
 
diff --git a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/music.sd b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/music.sd
index 6e26531849e..0d3859b65a0 100644
--- a/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/search/data/v2/inherited_rankprofiles/searchdefinitions/music.sd
@@ -3,9 +3,13 @@ search music      {
         document music    {
                 field f1 type string    {
                         indexing: summary | index
+                        # index-to: f1, all
+                        header
                 }
                 field f2 type string    {
                         indexing: summary | index
+                        # index-to: f2, all
+                        body
                 }
         }
 }
diff --git a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/searchdefinitions/music.sd b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/searchdefinitions/music.sd
index 6e26531849e..0d3859b65a0 100644
--- a/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/storage/app_index_higher_than_num_nodes/searchdefinitions/music.sd
@@ -3,9 +3,13 @@ search music      {
         document music    {
                 field f1 type string    {
                         indexing: summary | index
+                        # index-to: f1, all
+                        header
                 }
                 field f2 type string    {
                         indexing: summary | index
+                        # index-to: f2, all
+                        body
                 }
         }
 }
diff --git a/config-model/src/test/cfg/storage/clustercontroller_advanced/searchdefinitions/music.sd b/config-model/src/test/cfg/storage/clustercontroller_advanced/searchdefinitions/music.sd
index 6e26531849e..0d3859b65a0 100644
--- a/config-model/src/test/cfg/storage/clustercontroller_advanced/searchdefinitions/music.sd
+++ b/config-model/src/test/cfg/storage/clustercontroller_advanced/searchdefinitions/music.sd
@@ -3,9 +3,13 @@ search music      {
         document music    {
                 field f1 type string    {
                         indexing: summary | index
+                        # index-to: f1, all
+                        header
                 }
                 field f2 type string    {
                         indexing: summary | index
+                        # index-to: f2, all
+                        body
                 }
         }
 }