Header/body does not exist anymore. Deprecate and remove own internal usage.

7 files changed, 35 insertions, 46 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplierForStructs.java b/config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplierForStructs.java
index 9ff749a994c..ade8ae21870 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplierForStructs.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/FieldOperationApplierForStructs.java
@@ -41,7 +41,7 @@ public class FieldOperationApplierForStructs extends FieldOperationApplier {
                 }
                 if (structUsedByField.getName().equals(structType.getName())) {
                     //this field is using this type!!
-                    field.populateWithStructFields(sdoc, field.getName(), field.getDataType(), field.isHeader(), 0);
+                    field.populateWithStructFields(sdoc, field.getName(), field.getDataType(), 0);
                     field.populateWithStructMatching(sdoc, field.getName(), field.getDataType(), field.getMatching());
                 }
             }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java
index 60b8ee78c7b..d8773063053 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/derived/IndexSchema.java
@@ -138,11 +138,10 @@ public class IndexSchema extends Derived implements IndexschemaConfig.Producer {
             return Collections.singletonList(field);
         }
         if (fieldType instanceof ArrayDataType) {
-            boolean header = field.isHeader();
             List<Field> ret = new LinkedList<>();
-            Field innerField = new Field(field.getName(), ((ArrayDataType)fieldType).getNestedType(), header);
+            Field innerField = new Field(field.getName(), ((ArrayDataType)fieldType).getNestedType());
             for (Field flatField : flattenField(innerField)) {
-                ret.add(new Field(flatField.getName(), DataType.getArray(flatField.getDataType()), header));
+                ret.add(new Field(flatField.getName(), DataType.getArray(flatField.getDataType())));
             }
             return ret;
         }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
index c657d29033a..4fe6c3a96f2 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/SDField.java
@@ -38,9 +38,8 @@ import java.util.TreeMap;
 
 /**
  * The field class represents a document field. It is used in
- * the Document class to get and set fields. Each SDField has
- * a name, a numeric ID, a data type, and a boolean that says whether it's
- * a header field. The numeric ID is used when the fields are stored
+ * the Document class to get and set fields. Each SDField has a name, a numeric ID,
+ * a data type. The numeric ID is used when the fields are stored
  * in serialized form.
  *
  * @author bratseth
@@ -120,15 +119,14 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
      * Creates a new field. This method is only used to create reserved fields
      * @param name The name of the field
      * @param dataType The datatype of the field
-     * @param isHeader Whether this is a "header" field or a "content" field (true = "header").
     */
-    protected SDField(SDDocumentType repo, String name, int id, DataType dataType, boolean isHeader, boolean populate) {
-        super(name, id, dataType, isHeader);
-        populate(populate, repo, name, dataType, isHeader);
+    protected SDField(SDDocumentType repo, String name, int id, DataType dataType, boolean populate) {
+        super(name, id, dataType);
+        populate(populate, repo, name, dataType);
     }
 
-    public SDField(SDDocumentType repo, String name, int id, DataType dataType, boolean isHeader) {
-        this(repo, name, id, dataType, isHeader, true);
+    public SDField(SDDocumentType repo, String name, int id, DataType dataType) {
+        this(repo, name, id, dataType, true);
     }
 
     /**
@@ -136,41 +134,35 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
 
        @param name The name of the field
        @param dataType The datatype of the field
-       @param isHeader Whether this is a "header" field or a "content" field
-       (true = "header").
     */
-    public SDField(SDDocumentType repo, String name, DataType dataType, boolean isHeader, boolean populate) {
-        super(name,dataType,isHeader);
-        populate(populate, repo, name, dataType, isHeader);
+    public SDField(SDDocumentType repo, String name, DataType dataType, boolean populate) {
+        super(name,dataType);
+        populate(populate, repo, name, dataType);
     }
 
-    private void populate(boolean populate, SDDocumentType repo, String name, DataType dataType, boolean isHeader) {
-        populate(populate,repo, name, dataType, isHeader, null, 0);
+    private void populate(boolean populate, SDDocumentType repo, String name, DataType dataType) {
+        populate(populate,repo, name, dataType, null, 0);
     }
 
-    private void populate(boolean populate, SDDocumentType repo, String name, DataType dataType, boolean isHeader, Matching fieldMatching,  int recursion) {
+    private void populate(boolean populate, SDDocumentType repo, String name, DataType dataType, Matching fieldMatching,  int recursion) {
         if (populate || (dataType instanceof MapDataType)) {
-            populateWithStructFields(repo, name, dataType, isHeader, recursion);
+            populateWithStructFields(repo, name, dataType, recursion);
             populateWithStructMatching(repo, name, dataType, fieldMatching);
         }
     }
 
-    public SDField(String name, DataType dataType, boolean isHeader) {
-        this(null, name, dataType, isHeader, true);
-    }
 
     /**
      * Creates a new field.
      *
      * @param name The name of the field
      * @param dataType The datatype of the field
-     * @param isHeader Whether this is a "header" field or a "content" field (true = "header").
      * @param owner the owning document (used to check for id collisions)
      */
-    protected SDField(SDDocumentType repo, String name, DataType dataType, boolean isHeader, SDDocumentType owner, boolean populate) {
-        super(name, dataType, isHeader, owner == null ? null : owner.getDocumentType());
+    protected SDField(SDDocumentType repo, String name, DataType dataType, SDDocumentType owner, boolean populate) {
+        super(name, dataType, owner == null ? null : owner.getDocumentType());
         this.ownerDocType=owner;
-        populate(populate, repo, name, dataType, isHeader);
+        populate(populate, repo, name, dataType);
     }
 
     /**
@@ -178,27 +170,25 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
      *
      * @param name The name of the field
      * @param dataType The datatype of the field
-     * @param isHeader Whether this is a "header" field or a "content" field (true = "header").
      * @param owner The owning document (used to check for id collisions)
      * @param fieldMatching The matching object to set for the field
      */
-    protected SDField(SDDocumentType repo, String name, DataType dataType, boolean isHeader, SDDocumentType owner,
+    protected SDField(SDDocumentType repo, String name, DataType dataType, SDDocumentType owner,
                       Matching fieldMatching, boolean populate, int recursion) {
-        super(name, dataType, isHeader, owner == null ? null : owner.getDocumentType());
+        super(name, dataType, owner == null ? null : owner.getDocumentType());
         this.ownerDocType=owner;
         if (fieldMatching != null)
             this.setMatching(fieldMatching);
-        populate(populate, repo, name, dataType, isHeader, fieldMatching, recursion);
+        populate(populate, repo, name, dataType, fieldMatching, recursion);
     }
 
     /**
-     * Constructor for <b>header</b> fields
      *
      * @param name The name of the field
      * @param dataType The datatype of the field
      */
     public SDField(SDDocumentType repo,  String name, DataType dataType) {
-        this(repo, name,dataType,true, true);
+        this(repo, name,dataType, true);
     }
     public SDField(String name, DataType dataType) {
         this(null, name,dataType);
@@ -277,7 +267,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
         }
     }
 
-    public void populateWithStructFields(SDDocumentType sdoc, String name, DataType dataType, boolean isHeader, int recursion) {
+    public void populateWithStructFields(SDDocumentType sdoc, String name, DataType dataType, int recursion) {
         DataType dt = getFirstStructOrMapRecursive();
         if (dt == null) {
             return;
@@ -286,11 +276,11 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
             MapDataType mdt = (MapDataType) dataType;
 
             SDField keyField = new SDField(sdoc, name.concat(".key"), mdt.getKeyType(),
-                                           isHeader, getOwnerDocType(), new Matching(), true, recursion + 1);
+                                           getOwnerDocType(), new Matching(), true, recursion + 1);
             structFields.put("key", keyField);
 
             SDField valueField = new SDField(sdoc, name.concat(".value"), mdt.getValueType(),
-                                             isHeader, getOwnerDocType(), new Matching(), true, recursion + 1);
+                                             getOwnerDocType(), new Matching(), true, recursion + 1);
             structFields.put("value", valueField);
         } else {
             if (recursion >= 10) {
@@ -306,7 +296,7 @@ public class SDField extends Field implements TypedKey, FieldOperationContainer,
                 }
                 for (Field field : subType.fieldSet()) {
                     SDField subField = new SDField(sdoc, name.concat(".").concat(field.getName()), field.getDataType(),
-                                                   isHeader, subType, new Matching(), true, recursion + 1);
+                                                   subType, new Matching(), true, recursion + 1);
                     structFields.put(field.getName(), subField);
                 }
             }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java
index 886bf777d3a..04d11792379 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/document/TemporarySDField.java
@@ -8,12 +8,12 @@ import com.yahoo.document.DataType;
  */
 public class TemporarySDField extends SDField {
 
-    public TemporarySDField(String name, DataType dataType, boolean isHeader, SDDocumentType owner) {
-        super(owner, name, dataType, isHeader, owner, false);
+    public TemporarySDField(String name, DataType dataType, SDDocumentType owner) {
+        super(owner, name, dataType, owner, false);
     }
 
     public TemporarySDField(String name, DataType dataType) {
-        super(null, name, dataType, true, false);
+        super(null, name, dataType, false);
     }
 
 }
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java
index d1eb18c4916..0ffd13927b4 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/AddExtraFieldsToDocument.java
@@ -71,7 +71,7 @@ public class AddExtraFieldsToDocument extends Processor {
         if (docField == null) {
             ImmutableSDField existingField = search.getField(field.getName());
             if (existingField == null) {
-                SDField newField = new SDField(document, field.getName(), field.getDataType(), field.isHeader(), true);
+                SDField newField = new SDField(document, field.getName(), field.getDataType(), true);
                 newField.setIsExtraField(true);
                 document.addField(newField);
             } else if (!existingField.isImportedField()) {
diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java b/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java
index d0a0bbfb748..d6398bc348c 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/processing/UriHack.java
@@ -61,7 +61,7 @@ public class UriHack extends Processor {
             String partName = uriName + "." + suffix;
             // I wonder if this is explicit in qrs or implicit in backend?
             // search.addFieldSetItem(uriName, partName);
-            SDField partField = new SDField(partName, generatedType, true);
+            SDField partField = new SDField(partName, generatedType);
             partField.setIndexStructureField(uriField.doesIndexing());
             partField.setRankType(uriField.getRankType());
             partField.setStemming(Stemming.NONE);
diff --git a/config-model/src/main/javacc/SDParser.jj b/config-model/src/main/javacc/SDParser.jj
index 3c09a521715..eb7d7763cd1 100644
--- a/config-model/src/main/javacc/SDParser.jj
+++ b/config-model/src/main/javacc/SDParser.jj
@@ -637,7 +637,7 @@ void field(SDDocumentType document, Search search) :
         if (name != null && com.yahoo.searchdefinition.Search.isReservedName(name.toLowerCase())) {
             throw new IllegalArgumentException("Reserved name '" + name + "' can not be used as a field name.");
         }
-        field = new TemporarySDField(name, type, true, document);
+        field = new TemporarySDField(name, type, document);
     }
     lbrace() (fieldBody(field, search, document) (<NL>)*)* <RBRACE>
     {
@@ -931,7 +931,7 @@ void structFieldDefinition(SDDocumentType struct) :
         if (name != null && com.yahoo.searchdefinition.Search.isReservedName(name.toLowerCase())) {
             throw new IllegalArgumentException("Reserved name '" + name + "' can not be used as a field name.");
         }
-        field = new TemporarySDField(name, type, true, struct);
+        field = new TemporarySDField(name, type, struct);
         struct.addField(field);
     }
     lbrace() (id(field,struct) (<NL>)*)? (match(field) (<NL>)*)* <RBRACE> {