diff options
Diffstat (limited to 'container-search')
4 files changed, 2 insertions, 23 deletions
diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json index 54cdb4ea929..b6ffd061cba 100644 --- a/container-search/abi-spec.json +++ b/container-search/abi-spec.json @@ -177,8 +177,6 @@ "public java.lang.String toString()", "public boolean fillWeightedSetItem(com.yahoo.prelude.query.WeightedSetItem)", "public java.lang.String getContent()", - "public java.lang.Object getParsedJSON()", - "public void setParsedJSON(java.lang.Object)", "public java.lang.String renderFromInspector()" ], "fields": [] diff --git a/container-search/pom.xml b/container-search/pom.xml index 8005b4179e5..d410eb1c2c6 100644 --- a/container-search/pom.xml +++ b/container-search/pom.xml @@ -64,7 +64,7 @@ <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> - <scope>provided</scope> + <scope>compile</scope> </dependency> <dependency> <groupId>com.yahoo.vespa</groupId> diff --git a/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java b/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java index 3b1b5d5e2d4..26fc067070b 100644 --- a/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java +++ b/container-search/src/main/java/com/yahoo/prelude/hitfield/JSONString.java @@ -21,7 +21,6 @@ import java.util.Iterator; * * @author Steinar Knutsen */ -// TODO Vespa 8: remove methods leaking org.json types (replace with Slime equivalent?) public class JSONString implements Inspectable { private Inspector value; @@ -439,21 +438,6 @@ public class JSONString implements Inspectable { return content; } - /** @deprecated Use {@link #getContent()} instead and parse content yourself */ - @Deprecated(forRemoval = true, since = "7") - public Object getParsedJSON() { - initContent(); - if (parsedJSON == null) { - initJSON(); - } - return parsedJSON; - } - - @Deprecated(forRemoval = true, since = "7") - public void setParsedJSON(Object parsedJSON) { - this.parsedJSON = parsedJSON; - } - public String renderFromInspector() { return XmlRenderer.render(new StringBuilder(), value).toString(); } diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java index a174bde3902..c39efe21e70 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/SlimeSummaryTestCase.java @@ -2,7 +2,6 @@ package com.yahoo.prelude.fastsearch; import com.google.common.collect.ImmutableSet; -import com.yahoo.config.subscription.ConfigGetter; import com.yahoo.data.access.slime.SlimeAdapter; import com.yahoo.prelude.hitfield.JSONString; import com.yahoo.prelude.hitfield.RawData; @@ -101,7 +100,7 @@ public class SlimeSummaryTestCase { if (hit.getField("jsonstring_field") instanceof JSONString) { JSONString jstr = (JSONString) hit.getField("jsonstring_field"); assertEquals("{\"foo\":1,\"bar\":2}", jstr.getContent()); - assertNotNull(getParsedJSON(jstr)); + assertNotNull(jstr.getContent()); com.yahoo.data.access.Inspector value = jstr.inspect(); assertEquals(1L, value.field("foo").asLong()); @@ -125,8 +124,6 @@ public class SlimeSummaryTestCase { assertEquals(tensor2, featureData.getTensor("tensor2_feature")); } - @SuppressWarnings("removal") private static Object getParsedJSON(JSONString jstr) { return jstr.getParsedJSON(); } - @Test public void testFieldAccessAPI() { DocsumDefinitionSet partialDocsum1 = createPartialDocsumDefinitionSet1(); |