Add a binary format too.

4 files changed, 41 insertions, 15 deletions

diff --git a/document/src/main/java/com/yahoo/document/json/JsonWriter.java b/document/src/main/java/com/yahoo/document/json/JsonWriter.java
index ab0884a54a3..d7944246ff2 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonWriter.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonWriter.java
@@ -38,7 +38,33 @@ import java.nio.ByteBuffer;
 import java.util.Iterator;
 import java.util.Map;
 
-import static com.yahoo.document.json.JsonSerializationHelper.*;
+import static com.yahoo.document.json.JsonSerializationHelper.fieldNameIfNotNull;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeArrayField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeBoolField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeByte;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeByteArray;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeByteBuffer;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeByteField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeCollectionField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeDouble;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeDoubleField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeFloat;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeFloatField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeInt;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeIntField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeLong;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeLongField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeMapField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializePredicateField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeRawField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeReferenceField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeShort;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeString;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeStringField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeStructField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeStructuredField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeTensorField;
+import static com.yahoo.document.json.JsonSerializationHelper.serializeWeightedSet;
 import static com.yahoo.document.json.document.DocumentParser.FIELDS;
 import static com.yahoo.document.json.document.DocumentParser.REMOVE;
 
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java
index 582a6b0bd92..afdce012b0f 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentDeserializer.java
@@ -15,7 +15,7 @@ public interface DocumentDeserializer extends DocumentReader, DocumentUpdateRead
     /**
      * Returns the underlying buffer used for de-serialization.
      */
-    public GrowableByteBuffer getBuf();
+    GrowableByteBuffer getBuf();
 
 }
 
diff --git a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java
index 4b87edeeded..d95a344be77 100644
--- a/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java
+++ b/document/src/main/java/com/yahoo/document/serialization/DocumentUpdateWriter.java
@@ -21,15 +21,15 @@ import com.yahoo.document.update.TensorRemoveUpdate;
  * @since 5.1.27
  */
 public interface DocumentUpdateWriter {
-    public void write(DocumentUpdate update);
-    public void write(FieldUpdate update);
-    public void write(AddValueUpdate update, DataType superType);
-    public void write(MapValueUpdate update, DataType superType);
-    public void write(ArithmeticValueUpdate update);
-    public void write(AssignValueUpdate update, DataType superType);
-    public void write(RemoveValueUpdate update, DataType superType);
-    public void write(ClearValueUpdate clearValueUpdate, DataType superType);
-    public void write(TensorModifyUpdate update);
-    public void write(TensorAddUpdate update);
-    public void write(TensorRemoveUpdate update);
+    void write(DocumentUpdate update);
+    void write(FieldUpdate update);
+    void write(AddValueUpdate update, DataType superType);
+    void write(MapValueUpdate update, DataType superType);
+    void write(ArithmeticValueUpdate update);
+    void write(AssignValueUpdate update, DataType superType);
+    void write(RemoveValueUpdate update, DataType superType);
+    void write(ClearValueUpdate clearValueUpdate, DataType superType);
+    void write(TensorModifyUpdate update);
+    void write(TensorAddUpdate update);
+    void write(TensorRemoveUpdate update);
 }
diff --git a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java
index e0213b4c88d..14f4fd9484c 100644
--- a/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java
+++ b/document/src/main/java/com/yahoo/vespaxmlparser/VespaXMLFeedReader.java
@@ -93,7 +93,7 @@ public class VespaXMLFeedReader extends VespaXMLReader implements FeedReader {
         private Document doc;
         private DocumentId remove;
         private DocumentUpdate docUpdate;
-        private TestAndSetCondition condition;
+        private TestAndSetCondition condition = TestAndSetCondition.NOT_PRESENT_CONDITION;
 
         public Operation() {
             setInvalid();
@@ -104,7 +104,7 @@ public class VespaXMLFeedReader extends VespaXMLReader implements FeedReader {
             doc = null;
             remove = null;
             docUpdate = null;
-            condition = null;
+            condition = TestAndSetCondition.NOT_PRESENT_CONDITION;
         }
 
         public OperationType getType() {