Revert "Update jackson2.vespa.version to v2.17.0"

4 files changed, 11 insertions, 12 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 9c621c033bd..358c0cb65e4 100644
--- a/document/src/main/java/com/yahoo/document/json/JsonReader.java
+++ b/document/src/main/java/com/yahoo/document/json/JsonReader.java
@@ -105,7 +105,7 @@ public class JsonReader {
             String condition = null;
             ParsedDocumentOperation operation = null;
             while (JsonToken.END_OBJECT != parser.nextValue()) {
-                switch (parser.currentName()) {
+                switch (parser.getCurrentName()) {
                     case FIELDS -> {
                         documentParseInfo.fieldsBuffer = new LazyTokenBuffer(parser);
                         VespaJsonDocumentReader vespaJsonDocumentReader = new VespaJsonDocumentReader(typeManager.getIgnoreUndefinedFields());
@@ -177,7 +177,7 @@ public class JsonReader {
             state = END_OF_FEED;
             throw new IllegalArgumentException(r);
         }
-        if (documentParseInfo.isEmpty()) {
+        if ( ! documentParseInfo.isPresent()) {
             state = END_OF_FEED;
             return null;
         }
diff --git a/document/src/main/java/com/yahoo/document/json/LazyTokenBuffer.java b/document/src/main/java/com/yahoo/document/json/LazyTokenBuffer.java
index 53ddacf6cc3..0fbdd0b28c7 100644
--- a/document/src/main/java/com/yahoo/document/json/LazyTokenBuffer.java
+++ b/document/src/main/java/com/yahoo/document/json/LazyTokenBuffer.java
@@ -33,7 +33,7 @@ public class LazyTokenBuffer extends TokenBuffer {
     public Supplier<Token> lookahead() {
         return new Supplier<>() {
             int localNesting = nesting();
-            final Supplier<Token> buffered = LazyTokenBuffer.super.lookahead();
+            Supplier<Token> buffered = LazyTokenBuffer.super.lookahead();
             @Override public Token get() {
                 if (localNesting == 0)
                     return null;
@@ -54,7 +54,7 @@ public class LazyTokenBuffer extends TokenBuffer {
             JsonToken token = parser.nextValue();
             if (token == null)
                 throw new IllegalStateException("no more JSON tokens");
-            return new Token(token, parser.currentName(), parser.getText());
+            return new Token(token, parser.getCurrentName(), parser.getText());
         }
         catch (IOException e) {
             throw new IllegalArgumentException("failed reading document JSON", e);
diff --git a/document/src/main/java/com/yahoo/document/json/TokenBuffer.java b/document/src/main/java/com/yahoo/document/json/TokenBuffer.java
index c5c022370bf..3a48f71c4cd 100644
--- a/document/src/main/java/com/yahoo/document/json/TokenBuffer.java
+++ b/document/src/main/java/com/yahoo/document/json/TokenBuffer.java
@@ -99,7 +99,7 @@ public class TokenBuffer {
     }
 
     int addFromParser(JsonParser tokens) throws IOException {
-        add(tokens.currentToken(), tokens.currentName(), tokens.getText());
+        add(tokens.currentToken(), tokens.getCurrentName(), tokens.getText());
         return nestingOffset(tokens.currentToken());
     }
 
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 c5bcd356c94..77e11dcf2a8 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.currentName() == null) return false;
+        if (parser.getCurrentName() == null) return false;
         if (indentLevel == 1L) {
             handleIdentLevelOne(documentParseInfo, docIdAndOperationIsSetExternally);
         } else if (indentLevel == 2L) {
@@ -85,18 +85,17 @@ public class DocumentParser {
 
     private void handleIdentLevelOne(DocumentParseInfo documentParseInfo, boolean docIdAndOperationIsSetExternally)
             throws IOException {
-        JsonToken currentToken = parser.currentToken();
-        String currentName = parser.currentName();
+        JsonToken currentToken = parser.getCurrentToken();
         if ((currentToken == JsonToken.VALUE_TRUE || currentToken == JsonToken.VALUE_FALSE) &&
-                CREATE_IF_NON_EXISTENT.equals(currentName)) {
+                CREATE_IF_NON_EXISTENT.equals(parser.getCurrentName())) {
             documentParseInfo.create = Optional.of(currentToken == JsonToken.VALUE_TRUE);
-        } else if (currentToken == JsonToken.VALUE_STRING && CONDITION.equals(currentName)) {
+        } else if (currentToken == JsonToken.VALUE_STRING && CONDITION.equals(parser.getCurrentName())) {
             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(currentName);
+                documentParseInfo.operationType = operationNameToOperationType(parser.getCurrentName());
                 documentParseInfo.documentId = new DocumentId(parser.getText());
             }
         }
@@ -105,7 +104,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.currentName())) {
+            if (parser.currentToken() == JsonToken.START_OBJECT && FIELDS.equals(parser.getCurrentName())) {
                 documentParseInfo.fieldsBuffer.bufferObject(parser);
                 processIndent();
             }