diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-05-06 15:07:45 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-05-06 15:07:45 +0200 |
commit | 4567057679e35b925e0939c7c4efe32f15bdd4d8 (patch) | |
tree | b263778a9773af2f2ed3157ef6f70bdbfc1857d9 /predicate-search-core | |
parent | f143aa860045bd4fe5125d46b6c9ac5172060b61 (diff) |
Revert "Update jackson2.vespa.version to v2.17.0"
Diffstat (limited to 'predicate-search-core')
-rw-r--r-- | predicate-search-core/src/main/java/com/yahoo/search/predicate/PredicateQueryParser.java | 11 |
1 files changed, 6 insertions, 5 deletions
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 42b6195549e..09487506ffe 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,6 +10,7 @@ import java.util.Arrays; /** * Parses predicate queries from JSON. + * * Input JSON is assumed to have the following format: * { * "features": [ @@ -45,7 +46,7 @@ public class PredicateQueryParser { try (JsonParser parser = factory.createParser(json)) { skipToken(parser, JsonToken.START_OBJECT); while (parser.nextToken() != JsonToken.END_OBJECT) { - String fieldName = parser.currentName(); + String fieldName = parser.getCurrentName(); switch (fieldName) { case "features": parseFeatures(parser, JsonParser::getText, featureHandler); @@ -81,7 +82,7 @@ public class PredicateQueryParser { long subqueryBitmap = SubqueryBitmap.DEFAULT_VALUE; // Specifying subquery bitmap is optional. while (parser.nextToken() != JsonToken.END_OBJECT) { - String fieldName = parser.currentName(); + String fieldName = parser.getCurrentName(); skipToken(parser, JsonToken.VALUE_STRING, JsonToken.VALUE_NUMBER_INT); switch (fieldName) { case "k": @@ -99,11 +100,11 @@ public class PredicateQueryParser { } if (key == null) { throw new IllegalArgumentException( - String.format("Feature key is missing! (%s)", parser.currentLocation())); + String.format("Feature key is missing! (%s)", parser.getCurrentLocation())); } if (value == null) { throw new IllegalArgumentException( - String.format("Feature value is missing! (%s)", parser.currentLocation())); + String.format("Feature value is missing! (%s)", parser.getCurrentLocation())); } featureHandler.accept(key, value, subqueryBitmap); } @@ -113,7 +114,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.currentTokenLocation())); + Arrays.toString(expected), actual, parser.getTokenLocation())); } } |