Remove producing of summarymap config from the config model.

The search backend is no longer using this config.

32 files changed, 40 insertions, 673 deletions

diff --git a/config-model/src/test/derived/advanced/summarymap.cfg b/config-model/src/test/derived/advanced/summarymap.cfg
deleted file mode 100644
index f91aebe57f9..00000000000
--- a/config-model/src/test/derived/advanced/summarymap.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "location_zcurve"
-override[].command "attribute"
-override[].arguments "location_zcurve"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/array_of_struct_attribute/summarymap.cfg b/config-model/src/test/derived/array_of_struct_attribute/summarymap.cfg
deleted file mode 100644
index 4fb66c0e0b1..00000000000
--- a/config-model/src/test/derived/array_of_struct_attribute/summarymap.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-defaultoutputclass -1
-override[].field "new_elem_array"
-override[].command "attributecombiner"
-override[].arguments "elem_array"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "elem_array"
-override[].command "attributecombiner"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/attributeprefetch/summarymap.cfg b/config-model/src/test/derived/attributeprefetch/summarymap.cfg
deleted file mode 100644
index ae5e4b5f7c5..00000000000
--- a/config-model/src/test/derived/attributeprefetch/summarymap.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "singlebyte"
-override[].command "attribute"
-override[].arguments "singlebyte"
-override[].field "singleint"
-override[].command "attribute"
-override[].arguments "singleint"
-override[].field "singlelong"
-override[].command "attribute"
-override[].arguments "singlelong"
-override[].field "singlefloat"
-override[].command "attribute"
-override[].arguments "singlefloat"
-override[].field "singledouble"
-override[].command "attribute"
-override[].arguments "singledouble"
-override[].field "singlestring"
-override[].command "attribute"
-override[].arguments "singlestring"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/attributes/summarymap.cfg b/config-model/src/test/derived/attributes/summarymap.cfg
deleted file mode 100644
index 72a5e41e555..00000000000
--- a/config-model/src/test/derived/attributes/summarymap.cfg
+++ /dev/null
@@ -1,55 +0,0 @@
-defaultoutputclass -1
-override[].field "a1"
-override[].command "attribute"
-override[].arguments "a1"
-override[].field "a2"
-override[].command "attribute"
-override[].arguments "a2"
-override[].field "a3"
-override[].command "attribute"
-override[].arguments "a3"
-override[].field "a5"
-override[].command "attribute"
-override[].arguments "a5"
-override[].field "a6"
-override[].command "attribute"
-override[].arguments "a6"
-override[].field "b1"
-override[].command "attribute"
-override[].arguments "b1"
-override[].field "b2"
-override[].command "attribute"
-override[].arguments "b2"
-override[].field "b3"
-override[].command "attribute"
-override[].arguments "b3"
-override[].field "b4"
-override[].command "attribute"
-override[].arguments "b4"
-override[].field "b5"
-override[].command "attribute"
-override[].arguments "b5"
-override[].field "b6"
-override[].command "attribute"
-override[].arguments "b6"
-override[].field "b7"
-override[].command "attribute"
-override[].arguments "b7"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "a9"
-override[].command "attribute"
-override[].arguments "a9"
-override[].field "a11"
-override[].command "attribute"
-override[].arguments "a11"
-override[].field "a12"
-override[].command "attribute"
-override[].arguments "a12"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/complex/summarymap.cfg b/config-model/src/test/derived/complex/summarymap.cfg
deleted file mode 100644
index 685b818fc6a..00000000000
--- a/config-model/src/test/derived/complex/summarymap.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-defaultoutputclass -1
-override[].field "dyntitle"
-override[].command "dynamicteaser"
-override[].arguments "dyntitle"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "year_sub"
-override[].command "attribute"
-override[].arguments "year_sub"
-override[].field "prefixenabled"
-override[].command "attribute"
-override[].arguments "prefixenabled"
-override[].field "fleeting2"
-override[].command "attribute"
-override[].arguments "fleeting2"
-override[].field "foundat"
-override[].command "attribute"
-override[].arguments "foundat"
-override[].field "collapseby"
-override[].command "attribute"
-override[].arguments "collapseby"
-override[].field "ts"
-override[].command "attribute"
-override[].arguments "ts"
-override[].field "combineda"
-override[].command "attribute"
-override[].arguments "combineda"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/emptydefault/summarymap.cfg b/config-model/src/test/derived/emptydefault/summarymap.cfg
deleted file mode 100644
index b247ff94bbf..00000000000
--- a/config-model/src/test/derived/emptydefault/summarymap.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/id/summarymap.cfg b/config-model/src/test/derived/id/summarymap.cfg
deleted file mode 100644
index b247ff94bbf..00000000000
--- a/config-model/src/test/derived/id/summarymap.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/imported_position_field/summarymap.cfg b/config-model/src/test/derived/imported_position_field/summarymap.cfg
deleted file mode 100644
index b247ff94bbf..00000000000
--- a/config-model/src/test/derived/imported_position_field/summarymap.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/imported_position_field_summary/summarymap.cfg b/config-model/src/test/derived/imported_position_field_summary/summarymap.cfg
deleted file mode 100644
index c17dcdce267..00000000000
--- a/config-model/src/test/derived/imported_position_field_summary/summarymap.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-defaultoutputclass -1
-override[].field "my_pos"
-override[].command "geopos"
-override[].arguments "my_pos_zcurve"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/imported_struct_fields/summarymap.cfg b/config-model/src/test/derived/imported_struct_fields/summarymap.cfg
deleted file mode 100644
index 653b0a26b75..00000000000
--- a/config-model/src/test/derived/imported_struct_fields/summarymap.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-defaultoutputclass -1
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
-override[].field "my_elem_array"
-override[].command "attributecombiner"
-override[].arguments ""
-override[].field "my_elem_map"
-override[].command "attributecombiner"
-override[].arguments ""
-override[].field "my_str_int_map"
-override[].command "attributecombiner"
-override[].arguments ""
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "elem_array_filtered"
-override[].command "matchedattributeelementsfilter"
-override[].arguments "my_elem_array"
-override[].field "elem_map_filtered"
-override[].command "matchedattributeelementsfilter"
-override[].arguments "my_elem_map"
-override[].field "str_int_map_filtered"
-override[].command "matchedattributeelementsfilter"
-override[].arguments "my_str_int_map"
diff --git a/config-model/src/test/derived/importedfields/summarymap.cfg b/config-model/src/test/derived/importedfields/summarymap.cfg
deleted file mode 100644
index 7a4677301db..00000000000
--- a/config-model/src/test/derived/importedfields/summarymap.cfg
+++ /dev/null
@@ -1,28 +0,0 @@
-defaultoutputclass -1
-override[].field "my_int_field"
-override[].command "attribute"
-override[].arguments "my_int_field"
-override[].field "my_string_field"
-override[].command "attribute"
-override[].arguments "my_string_field"
-override[].field "my_int_array_field"
-override[].command "attribute"
-override[].arguments "my_int_array_field"
-override[].field "my_int_wset_field"
-override[].command "attribute"
-override[].arguments "my_int_wset_field"
-override[].field "my_ancient_int_field"
-override[].command "attribute"
-override[].arguments "my_ancient_int_field"
-override[].field "my_filtered_int_array_field"
-override[].command "matchedattributeelementsfilter"
-override[].arguments "my_int_array_field"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/indexswitches/summarymap.cfg b/config-model/src/test/derived/indexswitches/summarymap.cfg
deleted file mode 100644
index b247ff94bbf..00000000000
--- a/config-model/src/test/derived/indexswitches/summarymap.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/inheritance/summarymap.cfg b/config-model/src/test/derived/inheritance/summarymap.cfg
deleted file mode 100644
index 7fb5eab0200..00000000000
--- a/config-model/src/test/derived/inheritance/summarymap.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "onlygrandparent"
-override[].command "attribute"
-override[].arguments "onlygrandparent"
-override[].field "overridden"
-override[].command "attribute"
-override[].arguments "overridden"
-override[].field "onlymother"
-override[].command "attribute"
-override[].arguments "onlymother"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/inheritfromparent/summary.cfg b/config-model/src/test/derived/inheritfromparent/summary.cfg
new file mode 100644
index 00000000000..32719e81eb9
--- /dev/null
+++ b/config-model/src/test/derived/inheritfromparent/summary.cfg
@@ -0,0 +1,36 @@
+defaultsummaryid 1561972036
+usev8geopositions true
+classes[].id 1561972036
+classes[].name "default"
+classes[].omitsummaryfeatures false
+classes[].fields[].name "weight"
+classes[].fields[].type "float"
+classes[].fields[].command "attribute"
+classes[].fields[].source "weight"
+classes[].fields[].name "rankfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].command "rankfeatures"
+classes[].fields[].source ""
+classes[].fields[].name "summaryfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].command "summaryfeatures"
+classes[].fields[].source ""
+classes[].fields[].name "documentid"
+classes[].fields[].type "longstring"
+classes[].fields[].command "documentid"
+classes[].fields[].source ""
+classes[].id 571976254
+classes[].name "attributeprefetch"
+classes[].omitsummaryfeatures false
+classes[].fields[].name "weight"
+classes[].fields[].type "float"
+classes[].fields[].command "attribute"
+classes[].fields[].source "weight"
+classes[].fields[].name "rankfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].command "rankfeatures"
+classes[].fields[].source ""
+classes[].fields[].name "summaryfeatures"
+classes[].fields[].type "featuredata"
+classes[].fields[].command "summaryfeatures"
+classes[].fields[].source ""
diff --git a/config-model/src/test/derived/inheritfromparent/summarymap.cfg b/config-model/src/test/derived/inheritfromparent/summarymap.cfg
deleted file mode 100644
index fb1a18ab864..00000000000
--- a/config-model/src/test/derived/inheritfromparent/summarymap.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-defaultoutputclass -1
-override[].field "weight"
-override[].command "attribute"
-override[].arguments "weight"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/mail/summarymap.cfg b/config-model/src/test/derived/mail/summarymap.cfg
deleted file mode 100644
index 40444944e3a..00000000000
--- a/config-model/src/test/derived/mail/summarymap.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-defaultoutputclass -1
-override[].field "snippet"
-override[].command "dynamicteaser"
-override[].arguments "snippet"
-override[].field "date"
-override[].command "attribute"
-override[].arguments "date"
-override[].field "attachmentcount"
-override[].command "attribute"
-override[].arguments "attachmentcount"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
diff --git a/config-model/src/test/derived/map_attribute/summarymap.cfg b/config-model/src/test/derived/map_attribute/summarymap.cfg
deleted file mode 100644
index f9267fb39d3..00000000000
--- a/config-model/src/test/derived/map_attribute/summarymap.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-defaultoutputclass -1
-override[].field "str_map"
-override[].command "attributecombiner"
-override[].arguments ""
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg b/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg
deleted file mode 100644
index 46608a4a885..00000000000
--- a/config-model/src/test/derived/map_of_struct_attribute/summarymap.cfg
+++ /dev/null
@@ -1,19 +0,0 @@
-defaultoutputclass -1
-override[].field "new_str_elem_map"
-override[].command "attributecombiner"
-override[].arguments "str_elem_map"
-override[].field "new_int_elem_map"
-override[].command "copy"
-override[].arguments "int_elem_map"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "str_elem_map"
-override[].command "attributecombiner"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/multiplesummaries/summarymap.cfg b/config-model/src/test/derived/multiplesummaries/summarymap.cfg
deleted file mode 100644
index ee61fac39f4..00000000000
--- a/config-model/src/test/derived/multiplesummaries/summarymap.cfg
+++ /dev/null
@@ -1,58 +0,0 @@
-defaultoutputclass -1
-override[].field "a"
-override[].command "attribute"
-override[].arguments "a"
-override[].field "adynamic"
-override[].command "dynamicteaser"
-override[].arguments "adynamic"
-override[].field "d"
-override[].command "dynamicteaser"
-override[].arguments "d"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "c"
-override[].command "attribute"
-override[].arguments "c"
-override[].field "adynamic2"
-override[].command "dynamicteaser"
-override[].arguments "adynamic2"
-override[].field "sometags"
-override[].command "matchedelementsfilter"
-override[].arguments "mytags"
-override[].field "anothera"
-override[].command "attribute"
-override[].arguments "a"
-override[].field "anotdynamic"
-override[].command "attribute"
-override[].arguments "adynamic"
-override[].field "loc_position"
-override[].command "attribute"
-override[].arguments "loc_pos_zcurve"
-override[].field "anotbolded"
-override[].command "attribute"
-override[].arguments "a"
-override[].field "loc_pos_zcurve"
-override[].command "attribute"
-override[].arguments "loc_pos_zcurve"
-override[].field "abolded2"
-override[].command "dynamicteaser"
-override[].arguments "abolded2"
-override[].field "aboldeddynamic"
-override[].command "dynamicteaser"
-override[].arguments "aboldeddynamic"
-override[].field "loc_pos"
-override[].command "geopos"
-override[].arguments "loc_pos_zcurve"
-override[].field "abolded"
-override[].command "dynamicteaser"
-override[].arguments "abolded"
-override[].field "dynamice"
-override[].command "dynamicteaser"
-override[].arguments "dynamice"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/music/summarymap.cfg b/config-model/src/test/derived/music/summarymap.cfg
deleted file mode 100644
index 2973d4f6750..00000000000
--- a/config-model/src/test/derived/music/summarymap.cfg
+++ /dev/null
@@ -1,49 +0,0 @@
-defaultoutputclass -1
-override[].field "bgndata"
-override[].command "dynamicteaser"
-override[].arguments "bgndata"
-override[].field "sales"
-override[].command "attribute"
-override[].arguments "sales"
-override[].field "pto"
-override[].command "attribute"
-override[].arguments "pto"
-override[].field "mid"
-override[].command "attribute"
-override[].arguments "mid"
-override[].field "ew"
-override[].command "dynamicteaser"
-override[].arguments "ew"
-override[].field "weight"
-override[].command "attribute"
-override[].arguments "weight"
-override[].field "song"
-override[].command "dynamicteaser"
-override[].arguments "song"
-override[].field "bgnpfrom"
-override[].command "attribute"
-override[].arguments "bgnpfrom"
-override[].field "newestedition"
-override[].command "attribute"
-override[].arguments "newestedition"
-override[].field "bgnpto"
-override[].command "dynamicteaser"
-override[].arguments "bgnpto"
-override[].field "year"
-override[].command "attribute"
-override[].arguments "year"
-override[].field "did"
-override[].command "attribute"
-override[].arguments "did"
-override[].field "cbid"
-override[].command "attribute"
-override[].arguments "cbid"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/newrank/summarymap.cfg b/config-model/src/test/derived/newrank/summarymap.cfg
deleted file mode 100644
index e769e3a2a5a..00000000000
--- a/config-model/src/test/derived/newrank/summarymap.cfg
+++ /dev/null
@@ -1,52 +0,0 @@
-defaultoutputclass -1
-override[].field "bgndata"
-override[].command "dynamicteaser"
-override[].arguments "bgndata"
-override[].field "sales"
-override[].command "attribute"
-override[].arguments "sales"
-override[].field "pto"
-override[].command "attribute"
-override[].arguments "pto"
-override[].field "mid"
-override[].command "attribute"
-override[].arguments "mid"
-override[].field "ew"
-override[].command "dynamicteaser"
-override[].arguments "ew"
-override[].field "weight"
-override[].command "attribute"
-override[].arguments "weight"
-override[].field "song"
-override[].command "dynamicteaser"
-override[].arguments "song"
-override[].field "bgnpfrom"
-override[].command "attribute"
-override[].arguments "bgnpfrom"
-override[].field "newestedition"
-override[].command "attribute"
-override[].arguments "newestedition"
-override[].field "bgnpto"
-override[].command "dynamicteaser"
-override[].arguments "bgnpto"
-override[].field "year"
-override[].command "attribute"
-override[].arguments "year"
-override[].field "did"
-override[].command "attribute"
-override[].arguments "did"
-override[].field "scorekey"
-override[].command "attribute"
-override[].arguments "scorekey"
-override[].field "cbid"
-override[].command "attribute"
-override[].arguments "cbid"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/position_nosummary/summarymap.cfg b/config-model/src/test/derived/position_nosummary/summarymap.cfg
deleted file mode 100644
index 2ed737b5205..00000000000
--- a/config-model/src/test/derived/position_nosummary/summarymap.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "pos_zcurve"
-override[].command "attribute"
-override[].arguments "pos_zcurve"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/position_summary/summarymap.cfg b/config-model/src/test/derived/position_summary/summarymap.cfg
deleted file mode 100644
index d34c4727810..00000000000
--- a/config-model/src/test/derived/position_summary/summarymap.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-defaultoutputclass -1
-override[].field "pos"
-override[].command "geopos"
-override[].arguments "pos_zcurve"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "pos_zcurve"
-override[].command "attribute"
-override[].arguments "pos_zcurve"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/predicate_attribute/summarymap.cfg b/config-model/src/test/derived/predicate_attribute/summarymap.cfg
deleted file mode 100644
index b247ff94bbf..00000000000
--- a/config-model/src/test/derived/predicate_attribute/summarymap.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/rankingexpression/summarymap.cfg b/config-model/src/test/derived/rankingexpression/summarymap.cfg
deleted file mode 100644
index bc8e67320ad..00000000000
--- a/config-model/src/test/derived/rankingexpression/summarymap.cfg
+++ /dev/null
@@ -1,37 +0,0 @@
-defaultoutputclass -1
-override[].field "year"
-override[].command "attribute"
-override[].arguments "year"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "foo1"
-override[].command "attribute"
-override[].arguments "foo1"
-override[].field "foo2"
-override[].command "attribute"
-override[].arguments "foo2"
-override[].field "foo3"
-override[].command "attribute"
-override[].arguments "foo3"
-override[].field "foo4"
-override[].command "attribute"
-override[].arguments "foo4"
-override[].field "bar1"
-override[].command "attribute"
-override[].arguments "bar1"
-override[].field "bar2"
-override[].command "attribute"
-override[].arguments "bar2"
-override[].field "bar3"
-override[].command "attribute"
-override[].arguments "bar3"
-override[].field "bar4"
-override[].command "attribute"
-override[].arguments "bar4"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/ranktypes/summarymap.cfg b/config-model/src/test/derived/ranktypes/summarymap.cfg
deleted file mode 100644
index b247ff94bbf..00000000000
--- a/config-model/src/test/derived/ranktypes/summarymap.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/reference_fields/summarymap.cfg b/config-model/src/test/derived/reference_fields/summarymap.cfg
deleted file mode 100644
index b247ff94bbf..00000000000
--- a/config-model/src/test/derived/reference_fields/summarymap.cfg
+++ /dev/null
@@ -1,10 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/schemainheritance/summarymap.cfg b/config-model/src/test/derived/schemainheritance/summarymap.cfg
deleted file mode 100644
index 98885124eab..00000000000
--- a/config-model/src/test/derived/schemainheritance/summarymap.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-defaultoutputclass -1
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "parent_field"
-override[].command "attribute"
-override[].arguments "parent_field"
-override[].field "child_field"
-override[].command "attribute"
-override[].arguments "child_field"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/streamingstruct/summarymap.cfg b/config-model/src/test/derived/streamingstruct/summarymap.cfg
deleted file mode 100644
index acb9b3491c3..00000000000
--- a/config-model/src/test/derived/streamingstruct/summarymap.cfg
+++ /dev/null
@@ -1,16 +0,0 @@
-defaultoutputclass -1
-override[].field "snippet"
-override[].command "dynamicteaser"
-override[].arguments "snippet"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "g"
-override[].command "dynamicteaser"
-override[].arguments "g"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/derived/twostreamingstructs/summarymap.cfg b/config-model/src/test/derived/twostreamingstructs/summarymap.cfg
deleted file mode 100644
index 865c6f733f1..00000000000
--- a/config-model/src/test/derived/twostreamingstructs/summarymap.cfg
+++ /dev/null
@@ -1,13 +0,0 @@
-defaultoutputclass -1
-override[].field "snippet"
-override[].command "dynamicteaser"
-override[].arguments "snippet"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "g"
-override[].command "dynamicteaser"
-override[].arguments "g"
diff --git a/config-model/src/test/derived/types/summarymap.cfg b/config-model/src/test/derived/types/summarymap.cfg
deleted file mode 100644
index 21ecb2dd07d..00000000000
--- a/config-model/src/test/derived/types/summarymap.cfg
+++ /dev/null
@@ -1,34 +0,0 @@
-defaultoutputclass -1
-override[].field "abyte"
-override[].command "attribute"
-override[].arguments "abyte"
-override[].field "along"
-override[].command "attribute"
-override[].arguments "along"
-override[].field "abool"
-override[].command "attribute"
-override[].arguments "abool"
-override[].field "ashortfloat"
-override[].command "attribute"
-override[].arguments "ashortfloat"
-override[].field "tagfield"
-override[].command "attribute"
-override[].arguments "tagfield"
-override[].field "album1"
-override[].command "attribute"
-override[].arguments "album1"
-override[].field "rankfeatures"
-override[].command "rankfeatures"
-override[].arguments ""
-override[].field "summaryfeatures"
-override[].command "summaryfeatures"
-override[].arguments ""
-override[].field "other"
-override[].command "attribute"
-override[].arguments "other"
-override[].field "juletre"
-override[].command "attribute"
-override[].arguments "juletre"
-override[].field "documentid"
-override[].command "documentid"
-override[].arguments ""
diff --git a/config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java b/config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java
index f2b03d9c955..2071d142da9 100644
--- a/config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java
+++ b/config-model/src/test/java/com/yahoo/schema/derived/SummaryTestCase.java
@@ -211,10 +211,10 @@ public class SummaryTestCase extends AbstractSchemaTestCase {
 
     @Test
     void commands_that_are_dynamic_and_require_the_query() {
-        assertTrue(SummaryMap.isDynamicCommand("dynamicteaser"));
-        assertTrue(SummaryMap.isDynamicCommand(SummaryTransform.MATCHED_ELEMENTS_FILTER.getName()));
-        assertTrue(SummaryMap.isDynamicCommand(SummaryTransform.MATCHED_ATTRIBUTE_ELEMENTS_FILTER.getName()));
-        assertFalse(SummaryMap.isDynamicCommand(SummaryTransform.ATTRIBUTE.getName()));
+        assertTrue(SummaryClass.commandRequiringQuery("dynamicteaser"));
+        assertTrue(SummaryClass.commandRequiringQuery(SummaryTransform.MATCHED_ELEMENTS_FILTER.getName()));
+        assertTrue(SummaryClass.commandRequiringQuery(SummaryTransform.MATCHED_ATTRIBUTE_ELEMENTS_FILTER.getName()));
+        assertFalse(SummaryClass.commandRequiringQuery(SummaryTransform.ATTRIBUTE.getName()));
     }
 
     @Test