Merge pull request #30751 from vespa-engine/renovate/jackson2.vespa.version

Update jackson2.vespa.version to v2.17.0

14 files changed, 61 insertions, 62 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java
index 40c9a03b126..02a6b243054 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/application/validation/ConstantTensorJsonValidator.java
@@ -132,7 +132,7 @@ public class ConstantTensorJsonValidator {
     private void consumeTopObject() throws IOException {
         for (var cur = parser.nextToken(); cur != JsonToken.END_OBJECT; cur = parser.nextToken()) {
             assertCurrentTokenIs(JsonToken.FIELD_NAME);
-            String fieldName = parser.getCurrentName();
+            String fieldName = parser.currentName();
             switch (fieldName) {
                 case FIELD_TYPE -> consumeTypeField();
                 case FIELD_VALUES -> consumeValuesField();
@@ -189,7 +189,7 @@ public class ConstantTensorJsonValidator {
         }
         for (var cur = parser.nextToken(); cur != JsonToken.END_OBJECT; cur = parser.nextToken()) {
             assertCurrentTokenIs(JsonToken.FIELD_NAME);
-            validateNumeric(parser.getCurrentName(), parser.nextToken());
+            validateNumeric(parser.currentName(), parser.nextToken());
         }
     }
 
@@ -199,7 +199,7 @@ public class ConstantTensorJsonValidator {
         boolean seenValue = false;
         for (int i = 0; i < 2; i++) {
             assertNextTokenIs(JsonToken.FIELD_NAME);
-            String fieldName = parser.getCurrentName();
+            String fieldName = parser.currentName();
             switch (fieldName) {
                 case FIELD_ADDRESS -> {
                     validateTensorAddress(new HashSet<>(tensorDimensions.keySet()));
@@ -228,13 +228,13 @@ public class ConstantTensorJsonValidator {
         // Iterate within the address key, value pairs
         while ((parser.nextToken() != JsonToken.END_OBJECT)) {
             assertCurrentTokenIs(JsonToken.FIELD_NAME);
-            String dimensionName = parser.getCurrentName();
+            String dimensionName = parser.currentName();
             TensorType.Dimension dimension = tensorDimensions.get(dimensionName);
             if (dimension == null) {
-                throw new InvalidConstantTensorException(parser, String.format("Tensor dimension '%s' does not exist", parser.getCurrentName()));
+                throw new InvalidConstantTensorException(parser, String.format("Tensor dimension '%s' does not exist", dimensionName));
             }
             if (!cellDimensions.contains(dimensionName)) {
-                throw new InvalidConstantTensorException(parser, String.format("Duplicate tensor dimension '%s'", parser.getCurrentName()));
+                throw new InvalidConstantTensorException(parser, String.format("Duplicate tensor dimension '%s'", dimensionName));
             }
             cellDimensions.remove(dimensionName);
             validateLabel(dimension);
@@ -300,7 +300,7 @@ public class ConstantTensorJsonValidator {
     }
 
     private void assertCurrentTokenIs(JsonToken wantedToken) {
-        assertTokenIs(parser.getCurrentToken(), wantedToken);
+        assertTokenIs(parser.currentToken(), wantedToken);
     }
 
     private void assertNextTokenIs(JsonToken wantedToken) throws IOException {
@@ -316,11 +316,11 @@ public class ConstantTensorJsonValidator {
     static class InvalidConstantTensorException extends IllegalArgumentException {
 
         InvalidConstantTensorException(JsonParser parser, String message) {
-            super(message + " " + parser.getCurrentLocation().toString());
+            super(message + " " + parser.currentLocation().toString());
         }
 
         InvalidConstantTensorException(JsonParser parser, Exception base) {
-            super("Failed to parse JSON stream " + parser.getCurrentLocation().toString(), base);
+            super("Failed to parse JSON stream " + parser.currentLocation().toString(), base);
         }
 
         InvalidConstantTensorException(IOException base) {
@@ -412,7 +412,7 @@ public class ConstantTensorJsonValidator {
             boolean seenValues = false;
             for (int i = 0; i < 2; i++) {
                 assertNextTokenIs(JsonToken.FIELD_NAME);
-                String fieldName = parser.getCurrentName();
+                String fieldName = parser.currentName();
                 switch (fieldName) {
                     case FIELD_ADDRESS -> {
                         validateTensorAddress(new HashSet<>(mappedDims));
diff --git a/container-search/src/main/java/com/yahoo/search/handler/Json2SingleLevelMap.java b/container-search/src/main/java/com/yahoo/search/handler/Json2SingleLevelMap.java
index 01167be6b8b..fdedbdc2fd9 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/Json2SingleLevelMap.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/Json2SingleLevelMap.java
@@ -64,8 +64,8 @@ class Json2SingleLevelMap {
     }
 
     void parse(Map<String, String> map, String parent) throws IOException {
-        for (parser.nextToken(); parser.getCurrentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
-            String fieldName = parent + parser.getCurrentName();
+        for (parser.nextToken(); parser.currentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
+            String fieldName = parent + parser.currentName();
             JsonToken token = parser.nextToken();
             if ((token == JsonToken.VALUE_STRING) ||
                 (token == JsonToken.VALUE_NUMBER_FLOAT) ||
@@ -89,9 +89,9 @@ class Json2SingleLevelMap {
     }
 
     private String skipChildren(JsonParser parser, byte [] input) throws IOException {
-        JsonLocation start = parser.getCurrentLocation();
+        JsonLocation start = parser.currentLocation();
         parser.skipChildren();
-        JsonLocation end = parser.getCurrentLocation();
+        JsonLocation end = parser.currentLocation();
         int offset = (int)start.getByteOffset() - 1;
         return new String(input, offset, (int)(end.getByteOffset() - offset), StandardCharsets.UTF_8);
     }
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
index ffa6c82e941..611df6ad284 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
@@ -1532,7 +1532,7 @@ public class JsonRendererTestCase {
                 + "}";
         assertEquals(
                 "Unexpected character ('a' (code 97)): was expecting comma to separate Object entries\n" +
-                        " at [Source: (String)\"{    \"root\": {        \"invalidvalue\": 1adsf,    }}\"; line: 1, column: 41]",
+                        " at [Source: (String)\"{    \"root\": {        \"invalidvalue\": 1adsf,    }}\"; line: 1, column: 40]",
                 validateJSON(json));
     }
 
diff --git a/dependency-versions/pom.xml b/dependency-versions/pom.xml
index 0876674e8c6..d27318aaaf9 100644
--- a/dependency-versions/pom.xml
+++ b/dependency-versions/pom.xml
@@ -37,7 +37,7 @@
         <guava.vespa.version>33.2.0-jre</guava.vespa.version>
         <guice.vespa.version>6.0.0</guice.vespa.version>
         <j2objc-annotations.vespa.version>3.0.0</j2objc-annotations.vespa.version>
-        <jackson2.vespa.version>2.16.2</jackson2.vespa.version>
+        <jackson2.vespa.version>2.17.1</jackson2.vespa.version>
         <jackson-databind.vespa.version>${jackson2.vespa.version}</jackson-databind.vespa.version>
         <jakarta.inject.vespa.version>2.0.1</jakarta.inject.vespa.version>
         <javax.activation-api.vespa.version>1.2.0</javax.activation-api.vespa.version>
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 358c0cb65e4..9c621c033bd 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.getCurrentName()) {
+                switch (parser.currentName()) {
                     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.isPresent()) {
+        if (documentParseInfo.isEmpty()) {
             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 0fbdd0b28c7..53ddacf6cc3 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();
-            Supplier<Token> buffered = LazyTokenBuffer.super.lookahead();
+            final 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.getCurrentName(), parser.getText());
+            return new Token(token, parser.currentName(), 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 3a48f71c4cd..c5c022370bf 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.getCurrentName(), tokens.getText());
+        add(tokens.currentToken(), tokens.currentName(), 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 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();
             }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/MetricsParser.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/MetricsParser.java
index 0e33d7dbf2f..052b8425a45 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/MetricsParser.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/MetricsParser.java
@@ -53,8 +53,8 @@ public class MetricsParser {
             throw new IOException("Expected start of object, got " + parser.currentToken());
         }
 
-        for (parser.nextToken(); parser.getCurrentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
-            String fieldName = parser.getCurrentName();
+        for (parser.nextToken(); parser.currentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
+            String fieldName = parser.currentName();
             JsonToken token = parser.nextToken();
             if (fieldName.equals("metrics")) {
                 parseMetrics(parser, consumer);
@@ -67,12 +67,12 @@ public class MetricsParser {
     }
 
     static private Instant parseSnapshot(JsonParser parser) throws IOException {
-        if (parser.getCurrentToken() != JsonToken.START_OBJECT) {
+        if (parser.currentToken() != JsonToken.START_OBJECT) {
             throw new IOException("Expected start of 'snapshot' object, got " + parser.currentToken());
         }
         Instant timestamp = Instant.now();
-        for (parser.nextToken(); parser.getCurrentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
-            String fieldName = parser.getCurrentName();
+        for (parser.nextToken(); parser.currentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
+            String fieldName = parser.currentName();
             JsonToken token = parser.nextToken();
             if (fieldName.equals("to")) {
                 timestamp = Instant.ofEpochSecond(parser.getLongValue());
@@ -88,12 +88,12 @@ public class MetricsParser {
 
     // 'metrics' object with 'snapshot' and 'values' arrays
     static private void parseMetrics(JsonParser parser, Collector consumer) throws IOException {
-        if (parser.getCurrentToken() != JsonToken.START_OBJECT) {
+        if (parser.currentToken() != JsonToken.START_OBJECT) {
             throw new IOException("Expected start of 'metrics' object, got " + parser.currentToken());
         }
         Instant timestamp = Instant.now();
-        for (parser.nextToken(); parser.getCurrentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
-            String fieldName = parser.getCurrentName();
+        for (parser.nextToken(); parser.currentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
+            String fieldName = parser.currentName();
             JsonToken token = parser.nextToken();
             if (fieldName.equals("snapshot")) {
                 timestamp = parseSnapshot(parser);
@@ -109,7 +109,7 @@ public class MetricsParser {
 
     // 'values' array
     static private void parseMetricValues(JsonParser parser, Instant timestamp, Collector consumer) throws IOException {
-        if (parser.getCurrentToken() != JsonToken.START_ARRAY) {
+        if (parser.currentToken() != JsonToken.START_ARRAY) {
             throw new IOException("Expected start of 'metrics:values' array, got " + parser.currentToken());
         }
 
@@ -126,8 +126,8 @@ public class MetricsParser {
         String description = "";
         Map<DimensionId, String> dim = Map.of();
         List<Map.Entry<String, Number>> values = List.of();
-        for (parser.nextToken(); parser.getCurrentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
-            String fieldName = parser.getCurrentName();
+        for (parser.nextToken(); parser.currentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
+            String fieldName = parser.currentName();
             JsonToken token = parser.nextToken();
             switch (fieldName) {
                 case "name" -> name = parser.getText();
@@ -154,8 +154,8 @@ public class MetricsParser {
 
         Set<Dimension> dimensions = new HashSet<>();
 
-        for (parser.nextToken(); parser.getCurrentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
-            String fieldName = parser.getCurrentName();
+        for (parser.nextToken(); parser.currentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
+            String fieldName = parser.currentName();
             JsonToken token = parser.nextToken();
 
             if (token == JsonToken.VALUE_STRING){
@@ -180,17 +180,16 @@ public class MetricsParser {
 
     private static List<Map.Entry<String, Number>> parseValues(JsonParser parser) throws IOException {
         List<Map.Entry<String, Number>> metrics = new ArrayList<>();
-        for (parser.nextToken(); parser.getCurrentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
-            String fieldName = parser.getCurrentName();
+        for (parser.nextToken(); parser.currentToken() != JsonToken.END_OBJECT; parser.nextToken()) {
+            String metricName = parser.currentName();
             JsonToken token = parser.nextToken();
-            String metricName = fieldName;
             if (token == JsonToken.VALUE_NUMBER_INT) {
                 metrics.add(Map.entry(metricName, parser.getLongValue()));
             } else if (token == JsonToken.VALUE_NUMBER_FLOAT) {
                 double value = parser.getValueAsDouble();
                 metrics.add(Map.entry(metricName, value == ZERO_DOUBLE ? ZERO_DOUBLE : value));
             } else {
-                throw new IllegalArgumentException("Value for aggregator '" + fieldName + "' is not a number");
+                throw new IllegalArgumentException("Value for aggregator '" + metricName + "' is not a number");
             }
         }
         return metrics;
diff --git a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/lightgbm/LightGBMImporter.java b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/lightgbm/LightGBMImporter.java
index e1d2f8802a6..6a1e2f2562a 100644
--- a/model-integration/src/main/java/ai/vespa/rankingexpression/importer/lightgbm/LightGBMImporter.java
+++ b/model-integration/src/main/java/ai/vespa/rankingexpression/importer/lightgbm/LightGBMImporter.java
@@ -34,9 +34,9 @@ public class LightGBMImporter extends ModelImporter {
     private boolean probe(File modelFile) {
         try (JsonParser parser = Jackson.mapper().createParser(modelFile)) {
             while (parser.nextToken() != null) {
-                JsonToken token = parser.getCurrentToken();
+                JsonToken token = parser.currentToken();
                 if (token == JsonToken.FIELD_NAME) {
-                    if ("tree_info".equals(parser.getCurrentName())) return true;
+                    if ("tree_info".equals(parser.currentName())) return true;
                 }
             }
             return false;
diff --git a/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java b/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java
index 09487506ffe..42b6195549e 100644
--- a/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java
+++ b/predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java
@@ -10,7 +10,6 @@ import java.util.Arrays;
 
 /**
  * Parses predicate queries from JSON.
- *
  * Input JSON is assumed to have the following format:
  * {
  *      "features": [
@@ -46,7 +45,7 @@ public class PredicateQueryParser {
         try (JsonParser parser = factory.createParser(json)) {
             skipToken(parser, JsonToken.START_OBJECT);
             while (parser.nextToken() != JsonToken.END_OBJECT) {
-                String fieldName = parser.getCurrentName();
+                String fieldName = parser.currentName();
                 switch (fieldName) {
                     case "features":
                         parseFeatures(parser, JsonParser::getText, featureHandler);
@@ -82,7 +81,7 @@ public class PredicateQueryParser {
         long subqueryBitmap = SubqueryBitmap.DEFAULT_VALUE; // Specifying subquery bitmap is optional.
 
         while (parser.nextToken() != JsonToken.END_OBJECT) {
-            String fieldName = parser.getCurrentName();
+            String fieldName = parser.currentName();
             skipToken(parser, JsonToken.VALUE_STRING, JsonToken.VALUE_NUMBER_INT);
             switch (fieldName) {
                 case "k":
@@ -100,11 +99,11 @@ public class PredicateQueryParser {
         }
         if (key == null) {
             throw new IllegalArgumentException(
-                    String.format("Feature key is missing! (%s)", parser.getCurrentLocation()));
+                    String.format("Feature key is missing! (%s)", parser.currentLocation()));
         }
         if (value == null) {
             throw new IllegalArgumentException(
-                    String.format("Feature value is missing! (%s)", parser.getCurrentLocation()));
+                    String.format("Feature value is missing! (%s)", parser.currentLocation()));
         }
         featureHandler.accept(key, value, subqueryBitmap);
     }
@@ -114,7 +113,7 @@ public class PredicateQueryParser {
         if (Arrays.stream(expected).noneMatch(e -> e.equals(actual))) {
             throw new IllegalArgumentException(
                     String.format("Expected a token in %s, got %s (%s).",
-                            Arrays.toString(expected), actual, parser.getTokenLocation()));
+                            Arrays.toString(expected), actual, parser.currentTokenLocation()));
         }
     }
 
diff --git a/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/JsonFeeder.java b/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/JsonFeeder.java
index 11fb6526210..3111815b332 100644
--- a/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/JsonFeeder.java
+++ b/vespa-feed-client-api/src/main/java/ai/vespa/feed/client/JsonFeeder.java
@@ -414,7 +414,7 @@ public class JsonFeeder implements Closeable {
         abstract String getDocumentJson(long start, long end);
 
         OperationParseException parseException(String error) {
-            JsonLocation location = parser.getTokenLocation();
+            JsonLocation location = parser.currentLocation();
             return new OperationParseException(error + " at offset " + location.getByteOffset() +
                                                " (line " + location.getLineNr() + ", column " + location.getColumnNr() + ")");
         }
@@ -444,13 +444,13 @@ public class JsonFeeder implements Closeable {
                             case "create":    parameters = parameters.createIfNonExistent(readBoolean()); break;
                             case "fields": {
                                 expect(START_OBJECT);
-                                start = parser.getTokenLocation().getByteOffset();
+                                start = parser.currentTokenLocation().getByteOffset();
                                 int depth = 1;
                                 while (depth > 0) switch (parser.nextToken()) {
                                     case START_OBJECT: ++depth; break;
                                     case END_OBJECT:   --depth; break;
                                 }
-                                end = parser.getTokenLocation().getByteOffset() + 1;
+                                end = parser.currentTokenLocation().getByteOffset() + 1;
                                 break;
                             }
                             default: throw parseException("Unexpected field name '" + parser.getText() + "'");
@@ -470,7 +470,7 @@ public class JsonFeeder implements Closeable {
                 if (end >= start)
                     throw parseException("Illegal 'fields' object for remove operation");
                 else
-                    start = end = parser.getTokenLocation().getByteOffset(); // getDocumentJson advances buffer overwrite head.
+                    start = end = parser.currentTokenLocation().getByteOffset(); // getDocumentJson advances buffer overwrite head.
             }
             else if (end < start)
                 throw parseException("No 'fields' object for document");
@@ -486,14 +486,14 @@ public class JsonFeeder implements Closeable {
 
         private void expect(JsonToken token) throws IOException {
             if (parser.nextToken() != token)
-                throw new OperationParseException("Expected '" + token + "' at offset " + parser.getTokenLocation().getByteOffset() +
+                throw new OperationParseException("Expected '" + token + "' at offset " + parser.currentTokenLocation().getByteOffset() +
                         ", but found '" + parser.currentToken() + "' (" + parser.getText() + ")");
         }
 
         private String readString() throws IOException {
             String value = parser.nextTextValue();
             if (value == null)
-                throw new OperationParseException("Expected '" + JsonToken.VALUE_STRING + "' at offset " + parser.getTokenLocation().getByteOffset() +
+                throw new OperationParseException("Expected '" + JsonToken.VALUE_STRING + "' at offset " + parser.currentTokenLocation().getByteOffset() +
                                                   ", but found '" + parser.currentToken() + "' (" + parser.getText() + ")");
 
             return value;
@@ -502,7 +502,7 @@ public class JsonFeeder implements Closeable {
         private boolean readBoolean() throws IOException {
             Boolean value = parser.nextBooleanValue();
             if (value == null)
-                throw new OperationParseException("Expected '" + JsonToken.VALUE_FALSE + "' or '" + JsonToken.VALUE_TRUE + "' at offset " + parser.getTokenLocation().getByteOffset() +
+                throw new OperationParseException("Expected '" + JsonToken.VALUE_FALSE + "' or '" + JsonToken.VALUE_TRUE + "' at offset " + parser.currentTokenLocation().getByteOffset() +
                                                   ", but found '" + parser.currentToken() + "' (" + parser.getText() + ")");
 
             return value;
diff --git a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpFeedClient.java b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpFeedClient.java
index a30cfd5ec39..9dd11113c0b 100644
--- a/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpFeedClient.java
+++ b/vespa-feed-client/src/main/java/ai/vespa/feed/client/impl/HttpFeedClient.java
@@ -219,13 +219,13 @@ class HttpFeedClient implements FeedClient {
                             throw new ResultParseException(documentId,
                                                            "Expected 'trace' to be an array, but got '" + parser.currentToken() + "' in: " +
                                                            new String(json, UTF_8));
-                        int start = (int) parser.getTokenLocation().getByteOffset();
+                        int start = (int) parser.currentTokenLocation().getByteOffset();
                         int depth = 1;
                         while (depth > 0) switch (parser.nextToken()) {
                             case START_ARRAY: ++depth; break;
                             case END_ARRAY: --depth; break;
                         }
-                        int end = (int) parser.getTokenLocation().getByteOffset() + 1;
+                        int end = (int) parser.currentTokenLocation().getByteOffset() + 1;
                         trace = new String(json, start, end - start, UTF_8);
                         break;
                     default:
diff --git a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
index ee755a44010..cccc9667e11 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
@@ -43,7 +43,7 @@ public class JsonBenchmark {
                 try (JsonParser jsonParser = jsonFactory.createParser(json)) {
                     JsonToken array = jsonParser.nextToken();
                     for (JsonToken token = jsonParser.nextToken(); !JsonToken.END_ARRAY.equals(token); token = jsonParser.nextToken()) {
-                        if (JsonToken.FIELD_NAME.equals(token) && "weight".equals(jsonParser.getCurrentName())) {
+                        if (JsonToken.FIELD_NAME.equals(token) && "weight".equals(jsonParser.currentName())) {
                             token = jsonParser.nextToken();
                             count += jsonParser.getLongValue();
                         }