Merge pull request #31181 from vespa-engine/balder/jackson-2.17.1

Balder/jackson 2.17.1

2 files changed, 2 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/prelude/query/parser/SimpleParser.java b/container-search/src/main/java/com/yahoo/prelude/query/parser/SimpleParser.java
index ea0cd2312a6..d3e6241a6e5 100644
--- a/container-search/src/main/java/com/yahoo/prelude/query/parser/SimpleParser.java
+++ b/container-search/src/main/java/com/yahoo/prelude/query/parser/SimpleParser.java
@@ -134,10 +134,8 @@ abstract class SimpleParser extends StructuredParser {
             if (topLevelItem != null && topLevelItem != not) {
                 // => neutral rank items becomes implicit positives
                 not.addPositiveItem(getItemAsPositiveItem(topLevelItem, not));
-                return not;
-            } else {
-                return not;
             }
+            return not;
         }
         if (topLevelItem != null) {
             return topLevelItem;
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));
     }