Merge pull request #8120 from vespa-engine/balder/also-implement-for-head-so-7-branch-can-merged

Also implement on HEAD so that 7 branch can be merged too.

3 files changed, 17 insertions, 2 deletions

diff --git a/document/abi-spec.json b/document/abi-spec.json
index ba6992d743e..79e0cdc34d0 100644
--- a/document/abi-spec.json
+++ b/document/abi-spec.json
@@ -4921,7 +4921,8 @@
     ],
     "methods": [
       "public void <init>(com.yahoo.document.DocumentTypeManager, com.yahoo.io.GrowableByteBuffer)",
-      "public void read(com.yahoo.document.DocumentUpdate)"
+      "public void read(com.yahoo.document.DocumentUpdate)",
+      "public void read(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.BoolFieldValue)"
     ],
     "fields": []
   },
@@ -4987,7 +4988,8 @@
       "public void write(com.yahoo.document.DocumentUpdate)",
       "public void write(com.yahoo.document.fieldpathupdate.FieldPathUpdate)",
       "public void write(com.yahoo.document.fieldpathupdate.AssignFieldPathUpdate)",
-      "public void write(com.yahoo.document.fieldpathupdate.AddFieldPathUpdate)"
+      "public void write(com.yahoo.document.fieldpathupdate.AddFieldPathUpdate)",
+      "public void write(com.yahoo.vespa.objects.FieldBase, com.yahoo.document.datatypes.ByteFieldValue)"
     ],
     "fields": []
   },
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
index 44a1ca6e749..40aec94aec6 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentDeserializerHead.java
@@ -4,9 +4,11 @@ package com.yahoo.document.serialization;
 import com.yahoo.document.DocumentId;
 import com.yahoo.document.DocumentTypeManager;
 import com.yahoo.document.DocumentUpdate;
+import com.yahoo.document.datatypes.BoolFieldValue;
 import com.yahoo.document.fieldpathupdate.FieldPathUpdate;
 import com.yahoo.document.update.FieldUpdate;
 import com.yahoo.io.GrowableByteBuffer;
+import com.yahoo.vespa.objects.FieldBase;
 
 /**
  * Class used for de-serializing documents on the current head document format.
@@ -42,4 +44,8 @@ public class VespaDocumentDeserializerHead extends VespaDocumentDeserializer42 {
         }
     }
 
+    @Override
+    public void read(FieldBase field, BoolFieldValue value) {
+        value.setBoolean((getByte(null) != 0));
+    }
 }
diff --git a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
index ae995371125..92bce41ba8c 100644
--- a/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
+++ b/document/src/main/java/com/yahoo/document/serialization/VespaDocumentSerializerHead.java
@@ -2,11 +2,13 @@
 package com.yahoo.document.serialization;
 
 import com.yahoo.document.DocumentUpdate;
+import com.yahoo.document.datatypes.ByteFieldValue;
 import com.yahoo.document.fieldpathupdate.AddFieldPathUpdate;
 import com.yahoo.document.fieldpathupdate.AssignFieldPathUpdate;
 import com.yahoo.document.fieldpathupdate.FieldPathUpdate;
 import com.yahoo.document.update.FieldUpdate;
 import com.yahoo.io.GrowableByteBuffer;
+import com.yahoo.vespa.objects.FieldBase;
 
 /**
  * Class used for serializing documents on the current head document format.
@@ -70,4 +72,9 @@ public class VespaDocumentSerializerHead extends VespaDocumentSerializer42 {
         write((FieldPathUpdate)update);
         update.getNewValues().serialize(this);
     }
+
+    @Override
+    public void write(FieldBase field, ByteFieldValue value) {
+        buf.put(value.getByte());
+    }
 }