Remove usage of org.json

1 files changed, 40 insertions, 42 deletions

diff --git a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java
index 9ddcc7a7e69..3132f3744c9 100644
--- a/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java
+++ b/container-search-gui/src/main/java/com/yahoo/search/query/gui/GUIHandler.java
@@ -1,8 +1,10 @@
 // Copyright 2018 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.search.query.gui;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.google.inject.Inject;
-
 import com.yahoo.container.QrSearchersConfig;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
@@ -11,6 +13,7 @@ import com.yahoo.prelude.IndexModel;
 import com.yahoo.prelude.querytransform.RecallSearcher;
 import com.yahoo.restapi.Path;
 import com.yahoo.search.Query;
+import com.yahoo.search.config.IndexInfoConfig;
 import com.yahoo.search.query.Model;
 import com.yahoo.search.query.Presentation;
 import com.yahoo.search.query.Ranking;
@@ -19,19 +22,12 @@ import com.yahoo.search.query.ranking.MatchPhase;
 import com.yahoo.search.query.restapi.ErrorResponse;
 import com.yahoo.search.yql.MinimalQueryInserter;
 import com.yahoo.vespa.config.search.RankProfilesConfig;
-import com.yahoo.search.config.IndexInfoConfig;
 import com.yahoo.yolean.Exceptions;
 
-import org.json.JSONException;
-import org.json.JSONObject;
 import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
 import java.util.logging.Level;
 
 
@@ -42,6 +38,8 @@ import java.util.logging.Level;
  */
 public class GUIHandler extends LoggingRequestHandler {
 
+    private static final ObjectMapper jsonMapper = new ObjectMapper();
+
     private final IndexModel indexModel;
     private final RankProfilesConfig rankProfilesConfig;
 
@@ -112,7 +110,7 @@ public class GUIHandler extends LoggingRequestHandler {
             InputStream is;
             if (this.path.equals("config.json")){
                 String json = "{}";
-                try { json = getGUIConfig(); } catch (JSONException e) { /*Something happened while parsing JSON */ }
+                try { json = getGUIConfig(); } catch (IOException e) { /*Something happened while parsing JSON */ }
                 is = new ByteArrayInputStream(json.getBytes());
             } else{
                 is = GUIHandler.class.getClassLoader().getResourceAsStream("gui/"+this.path);
@@ -160,50 +158,50 @@ public class GUIHandler extends LoggingRequestHandler {
             return "text/html";
         }
 
-        private String getGUIConfig() throws JSONException {
-            JSONObject json = new JSONObject();
-            json.put("ranking_properties", Arrays.asList("propertyname"));
-            json.put("ranking_features", Arrays.asList("featurename"));
+        private String getGUIConfig() throws IOException {
+            ObjectNode json = jsonMapper.createObjectNode();
+            json.set("ranking_properties", jsonMapper.createArrayNode().add("propertyname"));
+            json.set("ranking_features", jsonMapper.createArrayNode().add("featurename"));
 
-            List<String> sources = new ArrayList<>();
+            ArrayNode sources = jsonMapper.createArrayNode();
 
             try {
-                sources = new ArrayList<>(indexModel.getMasterClusters().keySet());
+                indexModel.getMasterClusters().keySet().forEach(sources::add);
             } catch (NullPointerException ex){ /* clusters are not set */ }
-            json.put("model_sources", sources);
+            json.set("model_sources", sources);
 
-            List<String> rankProfiles = new ArrayList<>();
+            ArrayNode rankProfiles = jsonMapper.createArrayNode();
             try {
                 rankProfilesConfig.rankprofile().forEach(rankProfile -> rankProfiles.add(rankProfile.name()));
             } catch (NullPointerException ex){ /* rankprofiles are not set*/ }
-            json.put("ranking_profile", rankProfiles);
+            json.set("ranking_profile", rankProfiles);
 
 
             // Creating map from parent to children for GUI: parameter --> child-parameters
-            HashMap<String, List<String>> childMap = new HashMap<>();
-            childMap.put(Model.MODEL, Arrays.asList(Model.DEFAULT_INDEX, Model.ENCODING, Model.LANGUAGE, Model.QUERY_STRING, Model.RESTRICT, Model.SEARCH_PATH, Model.SOURCES, Model.TYPE));
-            childMap.put(Ranking.RANKING, Arrays.asList(Ranking.LOCATION, Ranking.FEATURES, Ranking.LIST_FEATURES, Ranking.PROFILE, Ranking.PROPERTIES, Ranking.SORTING, Ranking.FRESHNESS, Ranking.QUERYCACHE, Ranking.MATCH_PHASE));
-            childMap.put(Ranking.RANKING +"."+ Ranking.MATCH_PHASE, Arrays.asList(MatchPhase.MAX_HITS, MatchPhase.ATTRIBUTE, MatchPhase.ASCENDING, Ranking.DIVERSITY));
-            childMap.put(Ranking.RANKING +"."+ Ranking.MATCH_PHASE +"."+Ranking.DIVERSITY, Arrays.asList(Diversity.ATTRIBUTE, Diversity.MINGROUPS));
-            childMap.put(Presentation.PRESENTATION, Arrays.asList(Presentation.BOLDING, Presentation.FORMAT, Presentation.SUMMARY, "template", Presentation.TIMING ));
-            childMap.put("trace", Arrays.asList("timestamps"));
-            childMap.put("tracelevel", Arrays.asList("rules"));
-            childMap.put("metrics", Arrays.asList("ignore"));
-            childMap.put("collapse", Arrays.asList("summary"));
-            childMap.put("pos", Arrays.asList("ll", "radius", "bb", "attribute"));
-            childMap.put("streaming", Arrays.asList("userid", "groupname", "selection", "priority", "maxbucketspervisitor"));
-            childMap.put("rules", Arrays.asList("off", "rulebase"));
-            json.put("childMap", childMap);
-
-            List<String> levelZeroParameters = Arrays.asList(MinimalQueryInserter.YQL.toString(), Query.HITS.toString(), Query.OFFSET.toString(),
-                                "queryProfile", Query.NO_CACHE.toString(), Query.GROUPING_SESSION_CACHE.toString(),
-                                Query.SEARCH_CHAIN.toString(), Query.TIMEOUT.toString(), "trace", "tracelevel",
-                                Query.TRACE_LEVEL.toString(), Query.EXPLAIN_LEVEL.toString(), "explainlevel", Model.MODEL, Ranking.RANKING, "collapse", "collapsesize","collapsefield",
-                                Presentation.PRESENTATION, "pos", "streaming", "rules", RecallSearcher.recallName.toString(), "user",
-                                "metrics", "");
-            json.put("levelZeroParameters", levelZeroParameters);
-
-            return json.toString();
+            ObjectNode childMap = jsonMapper.createObjectNode();
+            childMap.set(Model.MODEL, jsonMapper.createArrayNode().add(Model.DEFAULT_INDEX).add(Model.ENCODING).add(Model.LANGUAGE).add(Model.QUERY_STRING).add(Model.RESTRICT).add(Model.SEARCH_PATH).add(Model.SOURCES).add(Model.TYPE));
+            childMap.set(Ranking.RANKING, jsonMapper.createArrayNode().add(Ranking.LOCATION).add(Ranking.FEATURES).add(Ranking.LIST_FEATURES).add(Ranking.PROFILE).add(Ranking.PROPERTIES).add(Ranking.SORTING).add(Ranking.FRESHNESS).add(Ranking.QUERYCACHE).add(Ranking.MATCH_PHASE));
+            childMap.set(Ranking.RANKING +"."+ Ranking.MATCH_PHASE, jsonMapper.createArrayNode().add(MatchPhase.MAX_HITS).add(MatchPhase.ATTRIBUTE).add(MatchPhase.ASCENDING).add(Ranking.DIVERSITY));
+            childMap.set(Ranking.RANKING +"."+ Ranking.MATCH_PHASE +"."+Ranking.DIVERSITY, jsonMapper.createArrayNode().add(Diversity.ATTRIBUTE).add(Diversity.MINGROUPS));
+            childMap.set(Presentation.PRESENTATION, jsonMapper.createArrayNode().add(Presentation.BOLDING).add(Presentation.FORMAT).add(Presentation.SUMMARY).add("template").add(Presentation.TIMING ));
+            childMap.set("trace", jsonMapper.createArrayNode().add("timestamps"));
+            childMap.set("tracelevel", jsonMapper.createArrayNode().add("rules"));
+            childMap.set("metrics", jsonMapper.createArrayNode().add("ignore"));
+            childMap.set("collapse", jsonMapper.createArrayNode().add("summary"));
+            childMap.set("pos", jsonMapper.createArrayNode().add("ll").add("radius").add("bb").add("attribute"));
+            childMap.set("streaming", jsonMapper.createArrayNode().add("userid").add("groupname").add("selection").add("priority").add("maxbucketspervisitor"));
+            childMap.set("rules", jsonMapper.createArrayNode().add("off").add("rulebase"));
+            json.set("childMap", childMap);
+
+            ArrayNode levelZeroParameters = jsonMapper.createArrayNode().add(MinimalQueryInserter.YQL.toString()).add(Query.HITS.toString()).add(Query.OFFSET.toString())
+                                .add("queryProfile").add(Query.NO_CACHE.toString()).add(Query.GROUPING_SESSION_CACHE.toString())
+                                .add(Query.SEARCH_CHAIN.toString()).add(Query.TIMEOUT.toString()).add("trace").add("tracelevel")
+                                .add(Query.TRACE_LEVEL.toString()).add(Query.EXPLAIN_LEVEL.toString()).add("explainlevel").add(Model.MODEL).add(Ranking.RANKING).add("collapse").add("collapsesize").add("collapsefield")
+                                .add(Presentation.PRESENTATION).add("pos").add("streaming").add("rules").add(RecallSearcher.recallName.toString()).add("user")
+                                .add("metrics").add("");
+            json.set("levelZeroParameters", levelZeroParameters);
+
+            return jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(json);
         }
     }
 }
\ No newline at end of file