Remove usage of org.json

2 files changed, 4 insertions, 10 deletions

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 209bfd08e6b..55438aa35ba 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,6 +21,7 @@ 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;
@@ -436,6 +437,8 @@ 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) {
@@ -444,6 +447,7 @@ public class JSONString implements Inspectable {
         return parsedJSON;
     }
 
+    @Deprecated(forRemoval = true, since = "7")
     public void setParsedJSON(Object parsedJSON) {
         this.parsedJSON = parsedJSON;
     }
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
index 31f8194b3b7..c4f850307ae 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
@@ -45,8 +45,6 @@ import com.yahoo.search.result.Hit;
 import com.yahoo.search.result.HitGroup;
 import com.yahoo.search.result.NanNumber;
 import com.yahoo.tensor.Tensor;
-import org.json.JSONArray;
-import org.json.JSONObject;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -671,14 +669,6 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
             } else if (field instanceof FieldValue) {
                 // the null below is the field which has already been written
                 ((FieldValue) field).serialize(null, new JsonWriter(generator));
-            } else if (field instanceof JSONArray || field instanceof JSONObject) {
-                // org.json returns null if the object would not result in syntactically correct JSON
-                String s = field.toString();
-                if (s == null) {
-                    generator.writeNull();
-                } else {
-                    generator.writeRawValue(s);
-                }
             } else {
                 generator.writeString(field.toString());
             }