Code review cleanup.

2 files changed, 13 insertions, 19 deletions

diff --git a/document/src/main/java/com/yahoo/document/json/JsonReader.java b/document/src/main/java/com/yahoo/document/json/JsonReader.java
index 0d9c9544501..f1c87866228 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonReader.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonReader.java
@@ -36,7 +36,6 @@ public class JsonReader {
         return documentParser.parse(Optional.empty());
     }
 
-
     private final JsonParser parser;
     private final DocumentTypeManager typeManager;
     private ReaderState state = ReaderState.AT_START;
@@ -57,7 +56,7 @@ public class JsonReader {
     }
 
     /**
-     * Reads a single operation. The operation is not expected to be part of an array. It only reads FIELDS.
+     * Reads a single operation. The operation is not expected to be part of an array.
      * @param operationType the type of operation (update or put)
      * @param docIdString document ID.
      * @return the document
diff --git a/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java b/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java
index a8e1934bed1..b896d2e2db0 100644
--- a/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java
+++ b/document/src/main/java/com/yahoo/document/json/readers/VespaJsonDocumentReader.java
@@ -71,7 +71,6 @@ public class VespaJsonDocumentReader {
                         verifyEndState(documentParseInfo.fieldsBuffer, JsonToken.END_OBJECT);
                     }
                     if (documentParseInfo.fieldpathsBuffer.size() > 0) {
-                        VespaJsonDocumentReader vespaJsonDocumentReader = new VespaJsonDocumentReader(documentType, documentParseInfo);
                         parseFieldpathsBuffer((DocumentUpdate) documentOperation, documentParseInfo.fieldpathsBuffer);
                         verifyEndState(documentParseInfo.fieldpathsBuffer, JsonToken.END_ARRAY);
                     }
@@ -93,8 +92,18 @@ public class VespaJsonDocumentReader {
     }
 
     // Exposed for unit testing...
-    public static void readUpdate(TokenBuffer buffer, DocumentUpdate next) {
-        populateUpdateFromBuffer(buffer, next);
+    public static void readUpdate(TokenBuffer buffer, DocumentUpdate update) {
+        expectObjectStart(buffer.currentToken());
+        int localNesting = buffer.nesting();
+        JsonToken t = buffer.next();
+
+        while (localNesting <= buffer.nesting()) {
+            expectObjectStart(t);
+            String fieldName = buffer.currentName();
+            Field field = update.getType().getField(fieldName);
+            addFieldUpdates(buffer, update, field);
+            t = buffer.next();
+        }
     }
 
     // Exposed for unit testing...
@@ -114,20 +123,6 @@ public class VespaJsonDocumentReader {
         Preconditions.checkState(buffer.size() == 0, "Dangling data at end of operation");
     }
 
-    private static void populateUpdateFromBuffer(TokenBuffer buffer, DocumentUpdate update) {
-        expectObjectStart(buffer.currentToken());
-        int localNesting = buffer.nesting();
-        JsonToken t = buffer.next();
-
-        while (localNesting <= buffer.nesting()) {
-            expectObjectStart(t);
-            String fieldName = buffer.currentName();
-            Field field = update.getType().getField(fieldName);
-            addFieldUpdates(buffer, update, field);
-            t = buffer.next();
-        }
-    }
-
     private static void addFieldUpdates(TokenBuffer buffer, DocumentUpdate update, Field field) {
         int localNesting = buffer.nesting();
         FieldUpdate fieldUpdate = FieldUpdate.create(field);