diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-07-06 13:50:18 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-07-06 13:50:18 +0200 |
commit | fa594ca0ffa7d4d368d548a798573918354fa5e2 (patch) | |
tree | 8d08304ec10f1d5c6079bd756769dbb24678e89e /container-search | |
parent | 65108e6e3f8831fd949d3ed70beacd8e781c142a (diff) |
Allow the illegall single quoted json.
Diffstat (limited to 'container-search')
3 files changed, 7 insertions, 2 deletions
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 5b8c99506c5..bf0272f4f66 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 @@ -22,7 +22,7 @@ import java.util.Map; * @author baldersheim */ class Json2SingleLevelMap { - private static final ObjectMapper jsonMapper = new ObjectMapper(); + private static final ObjectMapper jsonMapper = new ObjectMapper().configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true); private final byte [] buf; private final JsonParser parser; Json2SingleLevelMap(InputStream data) { diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java index 76702a1d4e0..3da3f57cb21 100644 --- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java +++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java @@ -41,7 +41,6 @@ import com.yahoo.search.searchchain.ExecutionFactory; import com.yahoo.search.searchchain.SearchChainRegistry; import com.yahoo.search.statistics.ElapsedTime; import com.yahoo.slime.Inspector; -import com.yahoo.slime.ObjectTraverser; import com.yahoo.yolean.Exceptions; import com.yahoo.yolean.trace.TraceNode; diff --git a/container-search/src/test/java/com/yahoo/search/handler/Json2SinglelevelMapTestCase.java b/container-search/src/test/java/com/yahoo/search/handler/Json2SinglelevelMapTestCase.java index d8db88323c7..c50b063ff44 100644 --- a/container-search/src/test/java/com/yahoo/search/handler/Json2SinglelevelMapTestCase.java +++ b/container-search/src/test/java/com/yahoo/search/handler/Json2SinglelevelMapTestCase.java @@ -29,4 +29,10 @@ public class Json2SinglelevelMapTestCase { assertEquals("null", m.get("n")); assertEquals("[0.786, 0.193]", m.get("a")); } + @Test + public void testThatWeAllowSingleQuotes() { + Map<String, String> m = new Json2SingleLevelMap(new ByteArrayInputStream("{'yql':'text'}".getBytes(StandardCharsets.UTF_8))).parse(); + assertTrue(m.containsKey("yql")); + assertEquals("text", m.get("yql")); + } } |