actually use Serializer6

26 files changed, 52 insertions, 36 deletions

diff --git a/document/src/main/java/com/yahoo/document/Document.java b/document/src/main/java/com/yahoo/document/Document.java
index 75a331f5707..ab602880453 100644
--- a/document/src/main/java/com/yahoo/document/Document.java
+++ b/document/src/main/java/com/yahoo/document/Document.java
@@ -137,7 +137,7 @@ public class Document extends StructuredFieldValue {
     }
 
     public int getSerializedSize() throws SerializationException {
-        DocumentSerializer data = DocumentSerializerFactory.create42(new GrowableByteBuffer(64 * 1024, 2.0f));
+        DocumentSerializer data = DocumentSerializerFactory.create6(new GrowableByteBuffer(64 * 1024, 2.0f));
         data.write(this);
         return data.getBuf().position();
     }
@@ -149,7 +149,7 @@ public class Document extends StructuredFieldValue {
     public final int getApproxSize() { return 4096; }
 
     public void serialize(OutputStream out) throws SerializationException {
-        DocumentSerializer writer = DocumentSerializerFactory.create42(new GrowableByteBuffer(64 * 1024, 2.0f));
+        DocumentSerializer writer = DocumentSerializerFactory.create6(new GrowableByteBuffer(64 * 1024, 2.0f));
         writer.write(this);
         GrowableByteBuffer data = writer.getBuf();
         byte[] array;
diff --git a/document/src/main/java/com/yahoo/document/DocumentUpdate.java b/document/src/main/java/com/yahoo/document/DocumentUpdate.java
index a47f1546a75..ef075662ee7 100644
--- a/document/src/main/java/com/yahoo/document/DocumentUpdate.java
+++ b/document/src/main/java/com/yahoo/document/DocumentUpdate.java
@@ -336,7 +336,7 @@ public class DocumentUpdate extends DocumentOperation implements Iterable<FieldP
     }
 
     public final void serialize(GrowableByteBuffer buf) {
-        serialize(DocumentSerializerFactory.create42(buf));
+        serialize(DocumentSerializerFactory.create6(buf));
     }
 
     public void serialize(DocumentUpdateWriter data) {
diff --git a/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java b/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java
index dc3fd36b367..f895ad21b0a 100644
--- a/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java
+++ b/document/src/main/java/com/yahoo/document/datatypes/FieldValue.java
@@ -52,7 +52,7 @@ public abstract class FieldValue extends Identifiable implements Comparable<Fiel
     }
 
     final public void serialize(GrowableByteBuffer buf) {
-        serialize(DocumentSerializerFactory.create42(buf));
+        serialize(DocumentSerializerFactory.create6(buf));
     }
 
     public abstract void printXml(XmlStream xml);
@@ -140,9 +140,9 @@ public abstract class FieldValue extends Identifiable implements Comparable<Fiel
         if (target instanceof FieldWriter) {
             serialize(null, (FieldWriter) target);
         } else if (target instanceof BufferSerializer) {
-            serialize(null, DocumentSerializerFactory.create42(((BufferSerializer) target).getBuf()));
+            serialize(null, DocumentSerializerFactory.create6(((BufferSerializer) target).getBuf()));
         } else {
-            DocumentSerializer fw = DocumentSerializerFactory.create42(new GrowableByteBuffer());
+            DocumentSerializer fw = DocumentSerializerFactory.create6(new GrowableByteBuffer());
             serialize(null, fw);
             target.put(null, fw.getBuf().getByteBuffer());
         }
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 7ff58855c34..05f9fbbda04 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentSerializerFactory.java
@@ -12,13 +12,29 @@ public class DocumentSerializerFactory {
 
     /**
      * Creates a serializer for the current head document format.
-     * This format is an extension of the 4.2 format.
+     * This format is an extension of the 6.x format.
      */
     public static DocumentSerializer createHead(GrowableByteBuffer buf) {
         return new VespaDocumentSerializerHead(buf);
     }
 
     /**
+     * Creates a serializer for the 6.x document format.
+     * This format is an extension of the 4.2 format.
+     */
+    public static DocumentSerializer create6(GrowableByteBuffer buf) {
+        return new VespaDocumentSerializer6(buf);
+    }
+
+    /**
+     * Creates a serializer for the 6.x document format.
+     * This format is an extension of the 4.2 format.
+     */
+    public static DocumentSerializer create6() {
+        return new VespaDocumentSerializer6(new GrowableByteBuffer());
+    }
+
+    /**
      * Creates a serializer for the document format that was created on Vespa 4.2.
      */
     @SuppressWarnings("deprecation")
diff --git a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java
index 163bda5b623..192afba80b3 100644
--- a/document/src/main/java/com/yahoo/document/update/FieldUpdate.java
+++ b/document/src/main/java/com/yahoo/document/update/FieldUpdate.java
@@ -291,7 +291,7 @@ public class FieldUpdate {
     }
 
     public final void serialize(GrowableByteBuffer buf) {
-        serialize(DocumentSerializerFactory.create42(buf));
+        serialize(DocumentSerializerFactory.create6(buf));
     }
 
     public void serialize(DocumentUpdateWriter data) {
diff --git a/document/src/test/java/com/yahoo/document/DocInDocTestCase.java b/document/src/test/java/com/yahoo/document/DocInDocTestCase.java
index cdc868af987..cd9a15db2e3 100644
--- a/document/src/test/java/com/yahoo/document/DocInDocTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocInDocTestCase.java
@@ -37,7 +37,7 @@ public class DocInDocTestCase {
         Document outer = new Document(manager.getDocumentType("outerdoc"), "doc:outer:the:only:one");
         outer.setFieldValue("innerdocuments", innerArray);
 
-        DocumentSerializer serializer = DocumentSerializerFactory.create42();
+        DocumentSerializer serializer = DocumentSerializerFactory.create6();
         serializer.write(outer);
 
         GrowableByteBuffer buf = serializer.getBuf();
diff --git a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java
index ce55a5a501c..68e8e984e4a 100755
--- a/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentPathUpdateTestCase.java
@@ -581,7 +581,7 @@ public class DocumentPathUpdateTestCase {
         docUp.addFieldPathUpdate(ass);
 
         GrowableByteBuffer buffer = new GrowableByteBuffer();
-        docUp.serialize(DocumentSerializerFactory.createHead(buffer));
+        docUp.serialize(DocumentSerializerFactory.create6(buffer));
         buffer.flip();
         DocumentUpdate docUp2 = new DocumentUpdate(DocumentDeserializerFactory.createHead(docMan, buffer));
 
@@ -599,7 +599,7 @@ public class DocumentPathUpdateTestCase {
         docUp.addFieldPathUpdate(add);
 
         GrowableByteBuffer buffer = new GrowableByteBuffer();
-        docUp.serialize(DocumentSerializerFactory.createHead(buffer));
+        docUp.serialize(DocumentSerializerFactory.create6(buffer));
         buffer.flip();
         DocumentUpdate docUp2 = new DocumentUpdate(DocumentDeserializerFactory.createHead(docMan, buffer));
 
@@ -613,7 +613,7 @@ public class DocumentPathUpdateTestCase {
         docUp.addFieldPathUpdate(remove);
 
         GrowableByteBuffer buffer = new GrowableByteBuffer();
-        docUp.serialize(DocumentSerializerFactory.createHead(buffer));
+        docUp.serialize(DocumentSerializerFactory.create6(buffer));
         buffer.flip();
         DocumentUpdate docUp2 = new DocumentUpdate(DocumentDeserializerFactory.createHead(docMan, buffer));
 
@@ -658,7 +658,7 @@ public class DocumentPathUpdateTestCase {
         DocumentUpdate docUp = createDocumentUpdateForSerialization();
 
         GrowableByteBuffer buffer = new GrowableByteBuffer();
-        docUp.serialize(DocumentSerializerFactory.createHead(buffer));
+        docUp.serialize(DocumentSerializerFactory.create6(buffer));
 
         int size = buffer.position();
         buffer.position(0);
diff --git a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
index 7d1992225e4..4d813fed788 100644
--- a/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentSerializationTestCase.java
@@ -214,7 +214,7 @@ public class DocumentSerializationTestCase extends AbstractTypesTest {
         doc.setFieldValue("friend", 2384L);
 
         GrowableByteBuffer buffer = new GrowableByteBuffer(1024);
-        DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
         serializer.write(doc);
         buffer.flip();
 
diff --git a/document/src/test/java/com/yahoo/document/DocumentTestCase.java b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
index 3eebc4396e8..098bc59b5ae 100644
--- a/document/src/test/java/com/yahoo/document/DocumentTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentTestCase.java
@@ -1450,7 +1450,7 @@ public class DocumentTestCase extends DocumentTestCaseBase {
         }
         public void serialize(String docId) {
             new Document(docType, DocumentId.createFromSerialized(docId))
-                    .serialize(DocumentSerializerFactory.createHead(buffer));
+                    .serialize(DocumentSerializerFactory.create6(buffer));
             buffer.flip();
         }
         public Document deserialize() {
diff --git a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
index a9f77cb5eb0..e39008cfc91 100644
--- a/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
+++ b/document/src/test/java/com/yahoo/document/DocumentUpdateTestCase.java
@@ -630,7 +630,7 @@ public class DocumentUpdateTestCase {
     public void testRequireThatCreateIfNonExistentFlagIsSerializedAndDeserialized() {
         docUp.setCreateIfNonExistent(true);
 
-        DocumentSerializer serializer = DocumentSerializerFactory.createHead(new GrowableByteBuffer());
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(new GrowableByteBuffer());
         docUp.serialize(serializer);
         serializer.getBuf().flip();
 
@@ -655,7 +655,7 @@ public class DocumentUpdateTestCase {
     @Test
     public void testThatAssignValueUpdateForTensorFieldCanBeSerializedAndDeserialized() {
         DocumentUpdate serializedUpdate = createTensorAssignUpdate();
-        DocumentSerializer serializer = DocumentSerializerFactory.createHead(new GrowableByteBuffer());
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(new GrowableByteBuffer());
         serializedUpdate.serialize(serializer);
         serializer.getBuf().flip();
 
diff --git a/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java b/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java
index 47e514d74f5..e491d271d96 100755
--- a/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/AlternateSpanListTestCase.java
@@ -57,7 +57,7 @@ public class AlternateSpanListTestCase extends AbstractTypesTest {
         GrowableByteBuffer buffer;
         {
             buffer = new GrowableByteBuffer(1024);
-            DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+            DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
             StringFieldValue value = new StringFieldValue("lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lk");
             SpanTree tree = new SpanTree("bababa", alternateSpanList);
             value.setSpanTree(tree);
diff --git a/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java b/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java
index de674aa3cca..a21bd44e03f 100644
--- a/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/AnnotationTestCase.java
@@ -115,7 +115,7 @@ public class AnnotationTestCase extends AbstractTypesTest {
 
     private void serializeAndAssert(Annotation annotation) {
         GrowableByteBuffer buffer = new GrowableByteBuffer(1024);
-        DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
         serializer.write(annotation);
         buffer.flip();
 
diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java
index 18f19030c9e..131a6255b66 100644
--- a/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/Bug6394548TestCase.java
@@ -43,7 +43,7 @@ public class Bug6394548TestCase {
         String annotationsBefore = dumpAllAnnotations(tree);
 
         GrowableByteBuffer buffer = new GrowableByteBuffer();
-        DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
         serializer.write(doc);
 
         buffer.flip();
diff --git a/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java b/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java
index 8f071650382..24525b84fb7 100644
--- a/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/Bug6425939TestCase.java
@@ -37,7 +37,7 @@ public class Bug6425939TestCase {
         emptyString.setSpanTree(createSpanTree());
 
         GrowableByteBuffer buffer = new GrowableByteBuffer(1024);
-        DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
         Field strField = new Field("flarn", DataType.STRING);
         serializer.write(strField, emptyString);
         buffer.flip();
diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java
index 887bfec5059..b8994140522 100755
--- a/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/SpanListTestCase.java
@@ -46,7 +46,7 @@ public class SpanListTestCase extends AbstractTypesTest {
         GrowableByteBuffer buffer;
         {
             buffer = new GrowableByteBuffer(1024);
-            DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+            DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
             StringFieldValue value = new StringFieldValue("lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lk");
             SpanTree tree = new SpanTree("bababa", spanList);
             value.setSpanTree(tree);
diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java
index 701f6917ecd..88604768a42 100755
--- a/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/SpanTestCase.java
@@ -79,7 +79,7 @@ public class SpanTestCase extends AbstractTypesTest {
         GrowableByteBuffer buffer;
         {
             buffer = new GrowableByteBuffer(1024);
-            DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+            DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
             StringFieldValue value = new StringFieldValue("lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lkj lk");
             SpanTree tree = new SpanTree("bababa", span);
             value.setSpanTree(tree);
diff --git a/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java
index 393fe8b6688..380f157c680 100755
--- a/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/SpanTreeTestCase.java
@@ -865,7 +865,7 @@ public class SpanTreeTestCase extends AbstractTypesTest {
 
 
         GrowableByteBuffer buffer = new GrowableByteBuffer(1024);
-        DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
 
         serializer.write(new Field("stringfield", DataType.STRING), strfval);
         buffer.flip();
diff --git a/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java b/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java
index ffa71ea7939..a122df16018 100755
--- a/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java
+++ b/document/src/test/java/com/yahoo/document/annotation/SystemTestCase.java
@@ -124,7 +124,7 @@ public class SystemTestCase {
         annotate(inDocument);
 
         GrowableByteBuffer buffer = new GrowableByteBuffer();
-        DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
         serializer.write(inDocument);
         buffer.flip();
         DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(manager, buffer);
diff --git a/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java
index c4441910f2a..01f917e163c 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/MapTestCase.java
@@ -144,7 +144,7 @@ public class MapTestCase {
         DocumentTypeManager man = new DocumentTypeManager();
         man.register(mapType);
         GrowableByteBuffer buffer = new GrowableByteBuffer(1024);
-        DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
         serializer.write(f, map);
         buffer.flip();
         DocumentDeserializer deserializer = DocumentDeserializerFactory.create42(man, buffer);
diff --git a/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java b/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java
index e9fce35ed01..3b46a5518d9 100644
--- a/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java
+++ b/document/src/test/java/com/yahoo/document/datatypes/StringTestCase.java
@@ -146,7 +146,7 @@ public class StringTestCase extends AbstractTypesTest {
         Field f = new Field("text", DataType.STRING);
 
         GrowableByteBuffer buffer = new GrowableByteBuffer(1024);
-        DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
         serializer.write(f, stringFieldValue);
         buffer.flip();
 
@@ -183,7 +183,7 @@ public class StringTestCase extends AbstractTypesTest {
         innerTree.annotate(innerSpan, new Annotation(type));
 
         GrowableByteBuffer buffer = new GrowableByteBuffer(1024);
-        DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
 
         try {
             serializer.write(null, outerString);
@@ -216,7 +216,7 @@ public class StringTestCase extends AbstractTypesTest {
 
     private Document serializeAndDeserialize(Document doc, DocumentTypeManager manager) {
         GrowableByteBuffer buffer = new GrowableByteBuffer(1024);
-        DocumentSerializer serializer = DocumentSerializerFactory.create42(buffer);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buffer);
         serializer.write(doc);
         buffer.flip();
 
diff --git a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
index b3d502ea56f..d82935e3c3b 100644
--- a/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
+++ b/document/src/test/java/com/yahoo/document/json/JsonReaderTestCase.java
@@ -323,7 +323,7 @@ public class JsonReaderTestCase {
         assertEquals(2, s.getFieldCount());
         assertEquals(new StringFieldValue("person"), s.getFieldValue(s.getField("sandra")));
         GrowableByteBuffer buf = new GrowableByteBuffer();
-        DocumentSerializer serializer = DocumentSerializerFactory.createHead(buf);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buf);
         put.serialize(serializer);
         assertEquals(107, buf.position());
     }
@@ -345,7 +345,7 @@ public class JsonReaderTestCase {
         Struct s = (Struct) avu.getValue();
         assertEquals(0, s.getFieldCount());
         GrowableByteBuffer buf = new GrowableByteBuffer();
-        DocumentSerializer serializer = DocumentSerializerFactory.createHead(buf);
+        DocumentSerializer serializer = DocumentSerializerFactory.create6(buf);
         put.serialize(serializer);
         assertEquals(69, buf.position());
     }
diff --git a/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java b/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java
index 38cf2b0e9d1..debd565d7e7 100644
--- a/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java
+++ b/document/src/test/java/com/yahoo/document/serialization/SerializationTestUtils.java
@@ -24,7 +24,7 @@ public class SerializationTestUtils {
 
     public static byte[] serializeDocument(Document doc) {
         GrowableByteBuffer out = new GrowableByteBuffer();
-        DocumentSerializerFactory.create42(out).write(doc);
+        DocumentSerializerFactory.create6(out).write(doc);
         out.flip();
         byte[] buf = new byte[out.remaining()];
         out.get(buf);
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 4f34431c729..5a8d458c74b 100644
--- a/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java
+++ b/document/src/test/java/com/yahoo/document/serialization/VespaDocumentSerializerTestCase.java
@@ -53,7 +53,7 @@ public class VespaDocumentSerializerTestCase {
         PredicateFieldValue predicate = Mockito.mock(PredicateFieldValue.class);
         doc.setFieldValue("my_predicate", predicate);
 
-        DocumentSerializerFactory.create42(new GrowableByteBuffer()).write(doc);
+        DocumentSerializerFactory.create6(new GrowableByteBuffer()).write(doc);
         Mockito.verify(predicate, Mockito.times(1)).serialize(Mockito.same(field), Mockito.any(FieldWriter.class));
     }
 
diff --git a/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java b/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java
index 3cf0fab80ae..ea497cd6340 100644
--- a/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java
+++ b/document/src/test/java/com/yahoo/document/update/FieldUpdateTestCase.java
@@ -186,7 +186,7 @@ public class FieldUpdateTestCase {
 
     // Copy all field updates using serialization to verify that it is supported
     private FieldUpdate serializedCopy(FieldUpdate source, DocumentType docType) {
-        DocumentSerializer buffer = DocumentSerializerFactory.create42();
+        DocumentSerializer buffer = DocumentSerializerFactory.create6();
         source.serialize(buffer);
         buffer.getBuf().flip();
         FieldUpdate copy = new FieldUpdate(DocumentDeserializerFactory.create42(docman, buffer.getBuf()), docType, Document.SERIALIZED_VERSION);
diff --git a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
index f1cce1e4c4a..9be3c12bee0 100644
--- a/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
+++ b/document/src/test/java/com/yahoo/document/update/SerializationTestCase.java
@@ -30,7 +30,7 @@ public class SerializationTestCase {
     @Test
     public void testAddSerialization() {
         FieldUpdate update = FieldUpdate.createAdd(field, new StringFieldValue("value1"));
-        DocumentSerializer buffer = DocumentSerializerFactory.create42();
+        DocumentSerializer buffer = DocumentSerializerFactory.create6();
         update.serialize(buffer);
 
         buffer.getBuf().rewind();
@@ -48,7 +48,7 @@ public class SerializationTestCase {
     @Test
     public void testClearSerialization() {
         FieldUpdate update = FieldUpdate.createClear(field);
-        DocumentSerializer buffer = DocumentSerializerFactory.create42();
+        DocumentSerializer buffer = DocumentSerializerFactory.create6();
         update.serialize(buffer);
 
         buffer.getBuf().rewind();
diff --git a/document/src/tests/data/serializeupdatejava.dat b/document/src/tests/data/serializeupdatejava.dat
index 20c56228bde..1ca17d1d451 100644
--- a/document/src/tests/data/serializeupdatejava.dat
+++ b/document/src/tests/data/serializeupdatejava.dat