Merge pull request #13601 from vespa-engine/balder/remove-leftovers-from-head-body-period-and-depcrecate-methods-levaing-on-vespa-8

- Removing body struct from our own usage.

5 files changed, 18 insertions, 29 deletions

diff --git a/document/src/test/document/documentmanager.cfg b/document/src/test/document/documentmanager.cfg
index d77c2b17460..e4c581304ce 100644
--- a/document/src/test/document/documentmanager.cfg
+++ b/document/src/test/document/documentmanager.cfg
@@ -5,10 +5,13 @@ datatype[0].weightedsettype[0]
 datatype[0].structtype[1]
 datatype[0].structtype[0].name foobar.header
 datatype[0].structtype[0].version 9
-datatype[0].structtype[0].field[1]
+datatype[0].structtype[0].field[2]
 datatype[0].structtype[0].field[0].name foobarfield1
 datatype[0].structtype[0].field[0].id[0]
 datatype[0].structtype[0].field[0].datatype 4
+datatype[0].structtype[0].field[1].name foobarfield0
+datatype[0].structtype[0].field[1].id[0]
+datatype[0].structtype[0].field[1].datatype 2
 datatype[0].documenttype[0]
 datatype[1].id 278604398
 datatype[1].arraytype[0]
@@ -16,10 +19,6 @@ datatype[1].weightedsettype[0]
 datatype[1].structtype[1]
 datatype[1].structtype[0].name foobar.body
 datatype[1].structtype[0].version 9
-datatype[1].structtype[0].field[1]
-datatype[1].structtype[0].field[0].name foobarfield0
-datatype[1].structtype[0].field[0].id[0]
-datatype[1].structtype[0].field[0].datatype 2
 datatype[1].documenttype[0]
 datatype[2].id 378030104
 datatype[2].arraytype[0]
@@ -48,7 +47,6 @@ datatype[4].weightedsettype[0]
 datatype[4].structtype[1]
 datatype[4].structtype[0].name banana.body
 datatype[4].structtype[0].version 234
-datatype[4].structtype[0].field[0]
 datatype[4].documenttype[0]
 datatype[5].id 556449802
 datatype[5].arraytype[0]
@@ -68,7 +66,13 @@ datatype[6].weightedsettype[0]
 datatype[6].structtype[1]
 datatype[6].structtype[0].name customtypes.header
 datatype[6].structtype[0].version 3
-datatype[6].structtype[0].field[0]
+datatype[6].structtype[0].field[2]
+datatype[6].structtype[0].field[0].name arrayfloat
+datatype[6].structtype[0].field[0].id[0]
+datatype[6].structtype[0].field[0].datatype 99
+datatype[6].structtype[0].field[1].name arrayarrayfloat
+datatype[6].structtype[0].field[1].id[0]
+datatype[6].structtype[0].field[1].datatype 4003
 datatype[6].documenttype[0]
 datatype[7].id 99
 datatype[7].arraytype[1]
@@ -88,13 +92,6 @@ datatype[9].weightedsettype[0]
 datatype[9].structtype[1]
 datatype[9].structtype[0].name customtypes.body
 datatype[9].structtype[0].version 3
-datatype[9].structtype[0].field[2]
-datatype[9].structtype[0].field[0].name arrayfloat
-datatype[9].structtype[0].field[0].id[0]
-datatype[9].structtype[0].field[0].datatype 99
-datatype[9].structtype[0].field[1].name arrayarrayfloat
-datatype[9].structtype[0].field[1].id[0]
-datatype[9].structtype[0].field[1].datatype 4003
 datatype[9].documenttype[0]
 datatype[10].id -1500313747
 datatype[10].arraytype[0]
diff --git a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
index fa47c80c6fb..b2be93bfff9 100644
--- a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
@@ -116,18 +116,15 @@ public class DocumentSerializationTestCase extends AbstractTypesTest {
             CompressionConfig lz4comp = new CompressionConfig(CompressionType.LZ4);
             {
                 doc.getDataType().contentStruct().setCompressionConfig(noncomp);
-                doc.getDataType().getBodyType().setCompressionConfig(noncomp);
                 FileOutputStream fout = new FileOutputStream(path + "document-java-currentversion-uncompressed.dat", false);
                 doc.serialize(fout);
                 fout.close();
             }
             {
                 doc.getDataType().contentStruct().setCompressionConfig(lz4comp);
-                doc.getDataType().getBodyType().setCompressionConfig(lz4comp);
                 FileOutputStream fout = new FileOutputStream(path + "document-java-currentversion-lz4-9.dat", false);
                 doc.serialize(fout);
                 doc.getDataType().contentStruct().setCompressionConfig(noncomp);
-                doc.getDataType().getBodyType().setCompressionConfig(noncomp);
                 fout.close();
             }
         }
diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
index dcd4622b3f4..be6544563ed 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
@@ -753,12 +753,10 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         CompressionConfig lz4comp = new CompressionConfig(CompressionType.LZ4);
 
         doc.getDataType().contentStruct().setCompressionConfig(lz4comp);
-        doc.getDataType().getBodyType().setCompressionConfig(lz4comp);
         buf = new GrowableByteBuffer(size, 2.0f);
 
         doc.serialize(buf);
         doc.getDataType().contentStruct().setCompressionConfig(noncomp);
-        doc.getDataType().getBodyType().setCompressionConfig(noncomp);
         fos = new FileOutputStream("src/tests/data/serializejava-compressed.dat");
         fos.write(buf.array(), 0, buf.position());
         fos.close();
@@ -816,13 +814,11 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         CompressionConfig lz4comp = new CompressionConfig(CompressionType.LZ4);
 
         doc.getDataType().contentStruct().setCompressionConfig(lz4comp);
-        doc.getDataType().getBodyType().setCompressionConfig(lz4comp);
 
         GrowableByteBuffer data = new GrowableByteBuffer();
         doc.serialize(data);
         int size = doc.getSerializedSize();
         doc.getDataType().contentStruct().setCompressionConfig(noncomp);
-        doc.getDataType().getBodyType().setCompressionConfig(noncomp);
 
         assertEquals(size, data.position());
 
diff --git a/document/src/test/java/com/yahoo/document/documentmanager.docindoc.cfg b/document/src/test/java/com/yahoo/document/documentmanager.docindoc.cfg
index 3347c3127b5..65ce1b56811 100644
--- a/document/src/test/java/com/yahoo/document/documentmanager.docindoc.cfg
+++ b/document/src/test/java/com/yahoo/document/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"
diff --git a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java
index 598369bae39..079e16915e1 100644
--- a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java
+++ b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java
@@ -68,7 +68,7 @@ public class VespaDocumentSerializerTestCase {
 
         CompressionFixture() {
             docType = new DocumentType("map_of_structs");
-            docType.getHeaderType().setCompressionConfig(new CompressionConfig(CompressionType.LZ4));
+            docType.contentStruct().setCompressionConfig(new CompressionConfig(CompressionType.LZ4));
 
             nestedType = new StructDataType("nested_type");
             nestedType.addField(new Field("str", DataType.STRING));