just confusing to have Deserializer extend Serializer

2 files changed, 8 insertions, 8 deletions

diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
index 5cba0e94323..7ec4433a24f 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializer42.java
@@ -63,6 +63,7 @@ import com.yahoo.tensor.serialization.TypedBinaryFormat;
 import com.yahoo.text.Utf8;
 import com.yahoo.text.Utf8Array;
 import com.yahoo.text.Utf8String;
+import com.yahoo.vespa.objects.BufferSerializer;
 import com.yahoo.vespa.objects.FieldBase;
 
 import java.nio.ByteBuffer;
@@ -82,7 +83,7 @@ import static com.yahoo.text.Utf8.calculateStringPositions;
  */
 @Deprecated // TODO: Remove on Vespa 8
 // When removing: Move content of this class into VespaDocumentDeserializerHead
-public class VespaDocumentDeserializer42 extends VespaDocumentSerializer42 implements DocumentDeserializer {
+public class VespaDocumentDeserializer42 extends BufferSerializer implements DocumentDeserializer {
 
     private final Compressor compressor = new Compressor();
     private DocumentTypeManager manager;
diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
index e39008cfc91..6af5dc8d28b 100644
--- a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
@@ -299,13 +299,13 @@ public class DocumentUpdateTestCase {
         docUp.addFieldUpdate(assignSingle);
         docUp.addFieldUpdate(addMultiList);
 
-        DocumentDeserializer buf = DocumentDeserializerFactory.create42(docMan, new GrowableByteBuffer());
-        docUp.serialize((DocumentUpdateWriter)buf);
-        buf.getBuf().flip();
+        GrowableByteBuffer buf = new GrowableByteBuffer();
+        docUp.serialize(DocumentSerializerFactory.create42(buf));
+        buf.flip();
 
         try {
             FileOutputStream fos = new FileOutputStream("src/test/files/updateser.dat");
-            fos.write(buf.getBuf().array(), 0, buf.getBuf().remaining());
+            fos.write(buf.array(), 0, buf.remaining());
             fos.close();
         } catch (Exception e) {
         }
@@ -330,10 +330,9 @@ public class DocumentUpdateTestCase {
 
                            + (4  //valueUpdateClassID
                               + (4 + 4 + 4 + (1 + 1 + 2 + 1) + 4 + (1 + 1 + 2 + 1) + 4 + (1 + 1 + 2 + 1))))) //value
-                , buf.getBuf().remaining());
-
-        DocumentUpdate docUpDeser = new DocumentUpdate(buf);
+                , buf.remaining());
 
+        DocumentUpdate docUpDeser = new DocumentUpdate(DocumentDeserializerFactory.create42(docMan, buf));
         assertEquals(docUp.getDocumentType(), docUpDeser.getDocumentType());
         assertEquals(docUp, docUpDeser);
     }