diff options
author | Arne Juul <arnej@yahoo-inc.com> | 2018-11-21 08:21:19 +0000 |
---|---|---|
committer | gjoranv <gv@oath.com> | 2019-01-21 15:09:28 +0100 |
commit | 140404118894f07990652de456b0a1ed0b623d27 (patch) | |
tree | fccea8f1f4543f7e7a990d92a173fada1f914f35 /document | |
parent | 791dd80ea050b3aa8edcf7e3ea38aba36b54f2d9 (diff) |
remove "headerOnly" serialization
Diffstat (limited to 'document')
-rw-r--r-- | document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java | 8 | ||||
-rw-r--r-- | document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java | 12 |
2 files changed, 1 insertions, 19 deletions
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java index 05f9fbbda04..54ec4e2fcca 100644 --- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java +++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java @@ -46,14 +46,6 @@ public class DocumentSerializerFactory { * Creates a serializer for the document format that was created on Vespa 4.2. */ @SuppressWarnings("deprecation") - public static DocumentSerializer create42(GrowableByteBuffer buf, boolean headerOnly) { - return new VespaDocumentSerializer42(buf, headerOnly); - } - - /** - * Creates a serializer for the document format that was created on Vespa 4.2. - */ - @SuppressWarnings("deprecation") public static DocumentSerializer create42() { return new VespaDocumentSerializer42(); } diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java index eb158c53258..ebe9a124033 100644 --- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java +++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializer42.java @@ -71,7 +71,6 @@ import static com.yahoo.text.Utf8.calculateBytePositions; // When removing: Move content into VespaDocumentSerializerHead public class VespaDocumentSerializer42 extends BufferSerializer implements DocumentSerializer { - private boolean headerOnly; private int spanNodeCounter = -1; private int[] bytePositions; @@ -83,15 +82,6 @@ public class VespaDocumentSerializer42 extends BufferSerializer implements Docum super(); } - VespaDocumentSerializer42(GrowableByteBuffer buf, boolean headerOnly) { - this(buf); - this.headerOnly = headerOnly; - } - - public void setHeaderOnly(boolean headerOnly) { - this.headerOnly = headerOnly; - } - public void write(Document doc) { write(new Field(doc.getDataType().getName(), 0, doc.getDataType(), true), doc); } @@ -109,7 +99,7 @@ public class VespaDocumentSerializer42 extends BufferSerializer implements Docum Struct head = doc.getHeader(); Struct body = doc.getBody(); boolean hasHead = (head.getFieldCount() != 0); - boolean hasBody = (body.getFieldCount() != 0) && !headerOnly; + boolean hasBody = (body.getFieldCount() != 0); byte contents = 0x01; // Indicating we have document type which we always have if (hasHead) { |