Deprecating a whole lot of body/header related methods that should have been done a long time ago.

1 files changed, 5 insertions, 4 deletions

diff --git a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
index b4d72f3a456..6387cfbdc85 100644
--- a/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
+++ b/config-model/src/main/java/com/yahoo/searchdefinition/DocumentModelBuilder.java
@@ -302,11 +302,11 @@ public class DocumentModelBuilder {
 
     private static StructDataType handleStruct(NewDocumentType dt, SDDocumentType type) {
         StructDataType s = new StructDataType(type.getName());
-        for (Field f : type.getDocumentType().getHeaderType().getFieldsThisTypeOnly()) {
+        for (Field f : type.getDocumentType().getContentType().getFieldsThisTypeOnly()) {
             specialHandleAnnotationReference(dt, f);
             s.addField(f);
         }
-        for (StructDataType inherited : type.getDocumentType().getHeaderType().getInheritedTypes()) {
+        for (StructDataType inherited : type.getDocumentType().getContentType().getInheritedTypes()) {
             s.inherit(inherited);
         }
         extractNestedTypes(dt, s);
@@ -330,11 +330,12 @@ public class DocumentModelBuilder {
         }
         return false;
     }
+    @SuppressWarnings("deprecation")
     private NewDocumentType convert(SDDocumentType sdoc) {
         Map<AnnotationType, String> annotationInheritance = new HashMap<>();
         Map<StructDataType, String> structInheritance = new HashMap<>();
         NewDocumentType dt = new NewDocumentType(new NewDocumentType.Name(sdoc.getName()),
-                                                 sdoc.getDocumentType().getHeaderType(),
+                                                 sdoc.getDocumentType().getContentType(),
                                                  sdoc.getDocumentType().getBodyType(),
                                                  sdoc.getFieldSets(),
                                                  convertDocumentReferencesToNames(sdoc.getDocumentReferences()));
@@ -386,7 +387,7 @@ public class DocumentModelBuilder {
                 e.getKey().inherit(s);
             }
         }
-        handleStruct(dt, sdoc.getDocumentType().getHeaderType());
+        handleStruct(dt, sdoc.getDocumentType().getContentType());
         handleStruct(dt, sdoc.getDocumentType().getBodyType());
 
         extractDataTypesFromFields(dt, sdoc.fieldSet());