From 42794e42e8ce223705e0a8e0e3e9293d65adaf6c Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorn.christian@seime.no>
Date: Mon, 1 Feb 2021 23:51:00 +0100
Subject: Revert "Remove org.json usage [run-systemtest]"

---
 bundle-plugin-test/test-bundles/main/pom.xml                      | 5 +++++
 .../main/src/main/java/com/yahoo/test/SimpleSearcher.java         | 8 ++++++++
 2 files changed, 13 insertions(+)

(limited to 'bundle-plugin-test/test-bundles/main')

diff --git a/bundle-plugin-test/test-bundles/main/pom.xml b/bundle-plugin-test/test-bundles/main/pom.xml
index 190e1c9d90f..c9c9ea270eb 100644
--- a/bundle-plugin-test/test-bundles/main/pom.xml
+++ b/bundle-plugin-test/test-bundles/main/pom.xml
@@ -15,6 +15,11 @@
   <version>7-SNAPSHOT</version>
   <packaging>container-plugin</packaging>
   <dependencies>
+    <dependency>
+      <groupId>org.json</groupId>
+      <artifactId>json</artifactId>
+      <scope>provided</scope>
+    </dependency>
     <dependency>
       <groupId>com.yahoo.vespa</groupId>
       <artifactId>jrt</artifactId>
diff --git a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher.java b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher.java
index ae9644aa010..dddca3f4d59 100644
--- a/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher.java
+++ b/bundle-plugin-test/test-bundles/main/src/main/java/com/yahoo/test/SimpleSearcher.java
@@ -8,6 +8,8 @@ import com.yahoo.search.Searcher;
 import com.yahoo.search.result.Hit;
 import com.yahoo.search.searchchain.Execution;
 import com.yahoo.text.BooleanParser;
+import org.json.JSONException;
+import org.json.JSONObject;
 
 /**
  * A searcher adding a new hit.
@@ -17,13 +19,19 @@ import com.yahoo.text.BooleanParser;
 public class SimpleSearcher extends Searcher {
 
     public Result search(Query query,Execution execution) {
+        try {
             BooleanParser.parseBoolean("true");
             XMLString xmlString = new XMLString("<sampleXmlString/>");
 
             Hit hit = new Hit("Hello world!");
+            hit.setField("json", new JSONObject().put("price", 42).toString());
 
             Result result = execution.search(query);
             result.hits().add(hit);
             return result;
+
+        } catch (JSONException e) {
+            throw new RuntimeException(e);
+        }
     }
 }
-- 
cgit v1.2.3