- Removing body struct from our own usage.

- Deprecate public methods using body struct.
- Update expected generated config.

4 files changed, 8 insertions, 29 deletions

diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java
index 27327daab47..cac05fb7879 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer6.java
@@ -118,14 +118,12 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu
         doc.setId(documentId);
 
         Struct h = doc.getHeader();
-        Struct b = doc.getBody();
         h.clear();
-        b.clear();
         if ((content & 0x2) != 0) {
-            readHeaderBody(h, b);
+            readHeaderBody(h);
         }
         if ((content & 0x4) != 0) {
-            readHeaderBody(b, h);
+            readHeaderBody(h);
         }
 
         if (dataLength != (position() - dataPos)) {
@@ -326,7 +324,7 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu
         buf = bigBuf;
     }
 
-    private void readHeaderBody(Struct primary, Struct alternate) {
+    private void readHeaderBody(Struct primary) {
         primary.setVersion(version);
 
         if (version < 8) {
@@ -371,24 +369,14 @@ public class VespaDocumentDeserializer6 extends BufferSerializer implements Docu
         buf = GrowableByteBuffer.wrap(destination);
 
         StructDataType priType = primary.getDataType();
-        StructDataType altType = alternate.getDataType();
         for (int i=0; i<numberOfFields; ++i) {
             int posBefore = position();
-            Struct s = null;
             Integer f_id = fieldIdsAndLengths.get(i).first;
             Field structField = priType.getField(f_id);
             if (structField != null) {
-                s = primary;
-            } else {
-                structField = altType.getField(f_id);
-                if (structField != null) {
-                  s = alternate;
-                }
-            }
-            if (s != null) {
               FieldValue value = structField.getDataType().createFieldValue();
               value.deserialize(structField, this);
-              s.setFieldValue(structField, value);
+              primary.setFieldValue(structField, value);
             }
             //jump to beginning of next field:
             position(posBefore + fieldIdsAndLengths.get(i).second.intValue());
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
index 630f204c44d..3fca853b4d1 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer6.java
@@ -96,27 +96,20 @@ public class VespaDocumentSerializer6 extends BufferSerializer implements Docume
 
         doc.getId().serialize(this);
 
-        Struct head = doc.getHeader();
-        Struct body = doc.getBody();
-        boolean hasHead = (head.getFieldCount() != 0);
-        boolean hasBody = (body.getFieldCount() != 0);
+        boolean hasHead = (doc.getFieldCount() != 0);
 
         byte contents = 0x01; // Indicating we have document type which we always have
         if (hasHead) {
             contents |= 0x2; // Indicate we have header
         }
-        if (hasBody) {
-            contents |= 0x4; // Indicate we have a body
-        }
+
         buf.put(contents);
 
         doc.getDataType().serialize(this);
         if (hasHead) {
-            head.serialize(null, this);
-        }
-        if (hasBody) {
-            body.serialize(null, this);
+            doc.getHeader().serialize(null, this);
         }
+
         int finalPos = buf.position();
         buf.position(lenPos);
         buf.putInt(finalPos - lenPos - 4); // Don't include the length itself or the version
diff --git a/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java b/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java
index 5db98f26141..9dc5b7c2480 100644
--- a/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java
+++ b/document/src/main/java/com/yahoo/document/serialization/XmlDocumentWriter.java
@@ -106,7 +106,6 @@ public final class XmlDocumentWriter implements DocumentWriter {
             buffer.addAttribute("lastmodifiedtime", lastModified);
         }
         write(null, value.getHeader());
-        write(null, value.getBody());
 
         buffer.endTag();
     }
diff --git a/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java b/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java
index 85bc4d032ff..8c6444fb853 100644
--- a/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java
+++ b/document/src/main/java/com/yahoo/document/serialization/XmlSerializationHelper.java
@@ -55,7 +55,6 @@ public class XmlSerializationHelper {
             xml.addAttribute("lastmodifiedtime", lastModified);
         }
         doc.getHeader().printXml(xml);
-        doc.getBody().printXml(xml);
     }
 
     public static void printDoubleXml(DoubleFieldValue d, XmlStream xml) {