- Removing body struct from our own usage.

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

3 files changed, 7 insertions, 9 deletions

diff --git a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java
index e825db4e21d..e1482dead8d 100644
--- a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java
+++ b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java
@@ -239,7 +239,7 @@ public class ProxyDocument extends Document implements DocumentOperationWrapper
     @Override
     @SuppressWarnings("deprecation")
     public Struct getBody() {
-        return doc.getBody();
+        return null;
     }
 
     @Override
diff --git a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
index 96ea96b9e78..617cd01e6e1 100644
--- a/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
+++ b/docproc/src/test/java/com/yahoo/docproc/proxy/SchemaMappingAndAccessesTest.java
@@ -306,7 +306,6 @@ public class SchemaMappingAndAccessesTest {
         assertEquals(mapped.getId().toString(), "id:map:album::2");
         assertEquals(doc.getId().toString(), "id:map:album::2");
         assertEquals(doc.getHeader(), mapped.getHeader());
-        assertEquals(doc.getBody(), mapped.getBody());
         assertEquals(doc.getSerializedSize(), mapped.getSerializedSize());
         ByteArrayOutputStream bos = new ByteArrayOutputStream();
         ByteArrayOutputStream bos2 = new ByteArrayOutputStream();
diff --git a/docproc/src/test/java/com/yahoo/docproc/util/documentmanager.docindoc.cfg b/docproc/src/test/java/com/yahoo/docproc/util/documentmanager.docindoc.cfg
index 3347c3127b5..65ce1b56811 100644
--- a/docproc/src/test/java/com/yahoo/docproc/util/documentmanager.docindoc.cfg
+++ b/docproc/src/test/java/com/yahoo/docproc/util/documentmanager.docindoc.cfg
@@ -4,16 +4,15 @@ datatype[0].id -1407012075
 datatype[0].structtype[1]
 datatype[0].structtype[0].name "outerdoc.body"
 datatype[0].structtype[0].version 0
-datatype[0].structtype[0].field[1]
-datatype[0].structtype[0].field[0].datatype -2035324352
-datatype[0].structtype[0].field[0].name "innerdocuments"
 datatype[1].id -1686125086
 datatype[1].structtype[1]
 datatype[1].structtype[0].name "docindoc.header"
 datatype[1].structtype[0].version 0
-datatype[1].structtype[0].field[1]
+datatype[1].structtype[0].field[2]
 datatype[1].structtype[0].field[0].datatype 2
 datatype[1].structtype[0].field[0].name "name"
+datatype[1].structtype[0].field[1].datatype 2
+datatype[1].structtype[0].field[1].name "content"
 datatype[2].id -2035324352
 datatype[2].arraytype[1]
 datatype[2].arraytype[0].datatype 1447635645
@@ -21,6 +20,9 @@ datatype[3].id -2040625920
 datatype[3].structtype[1]
 datatype[3].structtype[0].name "outerdoc.header"
 datatype[3].structtype[0].version 0
+datatype[3].structtype[0].field[1]
+datatype[3].structtype[0].field[0].datatype -2035324352
+datatype[3].structtype[0].field[0].name "innerdocuments"
 datatype[4].id 1447635645
 datatype[4].documenttype[1]
 datatype[4].documenttype[0].bodystruct 2030224503
@@ -37,6 +39,3 @@ datatype[6].id 2030224503
 datatype[6].structtype[1]
 datatype[6].structtype[0].name "docindoc.body"
 datatype[6].structtype[0].version 0
-datatype[6].structtype[0].field[1]
-datatype[6].structtype[0].field[0].datatype 2
-datatype[6].structtype[0].field[0].name "content"