1 files changed, 7 insertions, 6 deletions
diff --git a/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java b/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java
index 77e11dcf2a8..c5bcd356c94 100644
--- a/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java
+++ b/document/src/main/java/com/yahoo/document/json/document/DocumentParser.java
@@ -61,7 +61,7 @@ public class DocumentParser {
     private boolean parseOneItem(DocumentParseInfo documentParseInfo, boolean docIdAndOperationIsSetExternally) throws IOException {
         parser.nextValue();
         processIndent();
-        if (parser.getCurrentName() == null) return false;
+        if (parser.currentName() == null) return false;
         if (indentLevel == 1L) {
             handleIdentLevelOne(documentParseInfo, docIdAndOperationIsSetExternally);
         } else if (indentLevel == 2L) {
@@ -85,17 +85,18 @@ public class DocumentParser {
 
     private void handleIdentLevelOne(DocumentParseInfo documentParseInfo, boolean docIdAndOperationIsSetExternally)
             throws IOException {
-        JsonToken currentToken = parser.getCurrentToken();
+        JsonToken currentToken = parser.currentToken();
+        String currentName = parser.currentName();
         if ((currentToken == JsonToken.VALUE_TRUE || currentToken == JsonToken.VALUE_FALSE) &&
-                CREATE_IF_NON_EXISTENT.equals(parser.getCurrentName())) {
+                CREATE_IF_NON_EXISTENT.equals(currentName)) {
             documentParseInfo.create = Optional.of(currentToken == JsonToken.VALUE_TRUE);
-        } else if (currentToken == JsonToken.VALUE_STRING && CONDITION.equals(parser.getCurrentName())) {
+        } else if (currentToken == JsonToken.VALUE_STRING && CONDITION.equals(currentName)) {
             documentParseInfo.condition = Optional.of(parser.getText());
         } else if (currentToken == JsonToken.VALUE_STRING) {
             // Value is expected to be set in the header not in the document. Ignore any unknown field
             // as well.
             if (! docIdAndOperationIsSetExternally) {
-                documentParseInfo.operationType = operationNameToOperationType(parser.getCurrentName());
+                documentParseInfo.operationType = operationNameToOperationType(currentName);
                 documentParseInfo.documentId = new DocumentId(parser.getText());
             }
         }
@@ -104,7 +105,7 @@ public class DocumentParser {
     private void handleIdentLevelTwo(DocumentParseInfo documentParseInfo) {
         try {
             // "fields" opens a dictionary and is therefore on level two which might be surprising.
-            if (parser.currentToken() == JsonToken.START_OBJECT && FIELDS.equals(parser.getCurrentName())) {
+            if (parser.currentToken() == JsonToken.START_OBJECT && FIELDS.equals(parser.currentName())) {
                 documentParseInfo.fieldsBuffer.bufferObject(parser);
                 processIndent();
             }