- Removing body struct from our own usage.

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

1 files changed, 4 insertions, 8 deletions

diff --git a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
index 29bee2e9e3e..91b786e20f5 100644
--- a/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
+++ b/documentgen-test/src/test/java/com/yahoo/vespa/config/DocumentGenPluginTest.java
@@ -870,25 +870,21 @@ public class DocumentGenPluginTest {
         final Book book = getBook();
         assertEquals(book.getMystruct().getD1(), (Double)56.777);
         assertEquals(book.getMystruct().getCompressionType(), CompressionType.NONE);
-        assertEquals(book.getBody().getFieldCount(), 0);
-        assertEquals(book.getHeader().getFieldCount(), 13);
+        assertEquals(book.getFieldCount(), 13);
         assertEquals(book.getMystruct().getFieldCount(), 4);
         assertEquals(book.getContent().get(0), 3);
         assertEquals(book.getContent().get(1), 4);
         assertEquals(book.getContent().get(2), 5);
         final Document des = roundtripSerialize(book, typeManagerForBookType());
-        assertEquals(des.getBody().getFieldCount(), 0);
-        assertEquals(des.getHeader().getFieldCount(), 13);
+        assertEquals(des.getFieldCount(), 13);
         assertEquals(des.getDataType().getName(), "book");
         assertEquals(((Raw) des.getFieldValue("content")).getByteBuffer().get(0), 3);
         assertEquals(((Raw) des.getFieldValue("content")).getByteBuffer().get(1), 4);
         assertEquals(((Raw) des.getFieldValue("content")).getByteBuffer().get(2), 5);
         assertEquals(des.getFieldValue("author").toString(), "Herman Melville");
         assertEquals(des.getFieldValue("title").toString(), "Moby Dick - Or The Whale");
-        assertEquals(des.getHeader().getFieldValue("title").toString(), "Moby Dick - Or The Whale");
-        assertNull(des.getBody().getFieldValue("title"));
-        assertEquals(des.getHeader().getFieldValue("author").toString(), "Herman Melville");
-        assertNull(des.getBody().getFieldValue("author"));
+        assertEquals(des.getFieldValue("title").toString(), "Moby Dick - Or The Whale");
+        assertEquals(des.getFieldValue("author").toString(), "Herman Melville");
 
         Struct mystruct = (Struct)des.getFieldValue("mystruct");
         FieldValue d1 = mystruct.getFieldValue("d1");