Remove usage of org.json:json

Remove most usage of org.json:json Maven artifact.
This library does not have a compatible license.
Some usage is still left as it's part of our container-search public API.
We'll need a major release to fix that.
See https://github.com/vespa-engine/vespa/issues/14762 for more details.

3 files changed, 50 insertions, 51 deletions

diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java
index 3cd9f526387..60e8e3deee5 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/node/NodeMetricGatherer.java
@@ -9,13 +9,11 @@ import ai.vespa.metricsproxy.metric.model.MetricsPacket;
 import ai.vespa.metricsproxy.metric.model.ServiceId;
 import ai.vespa.metricsproxy.service.SystemPollerProvider;
 import ai.vespa.metricsproxy.service.VespaServices;
+import com.fasterxml.jackson.databind.JsonNode;
 import com.google.inject.Inject;
 import com.yahoo.container.jdisc.state.CoredumpGatherer;
 import com.yahoo.container.jdisc.state.FileWrapper;
 import com.yahoo.container.jdisc.state.HostLifeGatherer;
-import com.yahoo.yolean.Exceptions;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -54,10 +52,10 @@ public class NodeMetricGatherer {
         List<MetricsPacket.Builder> metricPacketBuilders = new ArrayList<>();
         metricPacketBuilders.addAll(gatherServiceHealthMetrics(vespaServices));
 
-        JSONObject coredumpPacket = CoredumpGatherer.gatherCoredumpMetrics(fileWrapper);
+        JsonNode coredumpPacket = CoredumpGatherer.gatherCoredumpMetrics(fileWrapper);
         addObjectToBuilders(metricPacketBuilders, coredumpPacket);
         if (SystemPollerProvider.runningOnLinux()) {
-            JSONObject packet = HostLifeGatherer.getHostLifePacket(fileWrapper);
+            JsonNode packet = HostLifeGatherer.getHostLifePacket(fileWrapper);
             addObjectToBuilders(metricPacketBuilders, packet);
         }
 
@@ -69,24 +67,20 @@ public class NodeMetricGatherer {
         ).collect(Collectors.toList());
     }
 
-    protected static void addObjectToBuilders(List<MetricsPacket.Builder> builders, JSONObject object)  {
-        try {
-            MetricsPacket.Builder builder = new MetricsPacket.Builder(ServiceId.toServiceId(object.getString("application")));
-            builder.timestamp(object.getLong("timestamp"));
-            if (object.has("status_code")) builder.statusCode(object.getInt("status_code"));
-            if (object.has("status_msg")) builder.statusMessage(object.getString("status_msg"));
-            if (object.has("metrics")) {
-                JSONObject metrics = object.getJSONObject("metrics");
-                Iterator<?> keys = metrics.keys();
-                while(keys.hasNext()) {
-                    String key = (String) keys.next();
-                    builder.putMetric(MetricId.toMetricId(key), metrics.getLong(key));
-                }
+    protected static void addObjectToBuilders(List<MetricsPacket.Builder> builders, JsonNode object)  {
+        MetricsPacket.Builder builder = new MetricsPacket.Builder(ServiceId.toServiceId(object.get("application").textValue()));
+        builder.timestamp(object.get("timestamp").longValue());
+        if (object.has("status_code")) builder.statusCode(object.get("status_code").intValue());
+        if (object.has("status_msg")) builder.statusMessage(object.get("status_msg").textValue());
+        if (object.has("metrics")) {
+            JsonNode metrics = object.get("metrics");
+            Iterator<?> keys = metrics.fieldNames();
+            while(keys.hasNext()) {
+                String key = (String) keys.next();
+                builder.putMetric(MetricId.toMetricId(key), metrics.get(key).longValue());
             }
-            builders.add(builder);
-        } catch (JSONException e) {
-            Exceptions.toMessageString(e);
         }
+        builders.add(builder);
     }
 
 }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java
index 1cab1a859a9..6e7bb37d761 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteHealthMetricFetcher.java
@@ -2,9 +2,10 @@
 package ai.vespa.metricsproxy.service;
 
 import ai.vespa.metricsproxy.metric.HealthMetric;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
 import java.util.logging.Level;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.io.IOException;
 import java.util.logging.Logger;
@@ -15,6 +16,7 @@ import java.util.logging.Logger;
  * @author Jo Kristian Bergum
  */
 public class RemoteHealthMetricFetcher extends HttpMetricFetcher {
+    private static final ObjectMapper jsonMapper = new ObjectMapper();
     private final static Logger log = Logger.getLogger(RemoteHealthMetricFetcher.class.getPackage().getName());
 
     private final static String HEALTH_PATH = STATE_PATH + "health";
@@ -54,16 +56,16 @@ public class RemoteHealthMetricFetcher extends HttpMetricFetcher {
             return HealthMetric.getUnknown("Empty response from status page");
         }
         try {
-            JSONObject o = new JSONObject(data);
-            JSONObject status = o.getJSONObject("status");
-            String code = status.getString("code");
+            JsonNode o = jsonMapper.readTree(data);
+            JsonNode status = o.get("status");
+            String code = status.get("code").textValue();
             String message = "";
             if (status.has("message")) {
-                message = status.getString("message");
+                message = status.get("message").textValue();
             }
             return HealthMetric.get(code, message);
 
-        } catch (JSONException e) {
+        } catch (IOException e) {
             log.log(Level.FINE, "Failed to parse json response from metrics page:" + e + ":" + data);
             return HealthMetric.getUnknown("Not able to parse json from status page");
         }
diff --git a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java
index 442ebc0d38d..c2935761179 100644
--- a/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java
+++ b/metrics-proxy/src/main/java/ai/vespa/metricsproxy/service/RemoteMetricsFetcher.java
@@ -4,9 +4,9 @@ package ai.vespa.metricsproxy.service;
 import ai.vespa.metricsproxy.metric.Metric;
 import ai.vespa.metricsproxy.metric.Metrics;
 import ai.vespa.metricsproxy.metric.model.DimensionId;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ArrayNode;
 
 import java.io.IOException;
 import java.util.Collections;
@@ -23,6 +23,8 @@ import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId;
  */
 public class RemoteMetricsFetcher extends HttpMetricFetcher {
 
+    private static final ObjectMapper jsonMapper = new ObjectMapper();
+
     final static String METRICS_PATH = STATE_PATH + "metrics";
 
     RemoteMetricsFetcher(VespaService service, int port) {
@@ -57,21 +59,21 @@ public class RemoteMetricsFetcher extends HttpMetricFetcher {
         return remoteMetrics;
     }
 
-    private Metrics parse(String data) throws JSONException {
-        JSONObject o = new JSONObject(data);
+    private Metrics parse(String data) throws IOException {
+        JsonNode o = jsonMapper.readTree(data);
         if (!(o.has("metrics"))) {
             return new Metrics(); //empty
         }
 
-        JSONObject metrics = o.getJSONObject("metrics");
-        JSONArray values;
+        JsonNode metrics = o.get("metrics");
+        ArrayNode values;
         long timestamp;
 
         try {
-            JSONObject snapshot = metrics.getJSONObject("snapshot");
-            timestamp = (long) snapshot.getDouble("to");
-            values = metrics.getJSONArray("values");
-        } catch (JSONException e) {
+            JsonNode snapshot = metrics.get("snapshot");
+            timestamp = (long) snapshot.get("to").doubleValue();
+            values = (ArrayNode) metrics.get("values");
+        } catch (Exception e) {
             // snapshot might not have been produced. Do not throw exception into log
             return new Metrics();
         }
@@ -81,29 +83,29 @@ public class RemoteMetricsFetcher extends HttpMetricFetcher {
 
         Map<DimensionId, String> noDims = Collections.emptyMap();
         Map<String, Map<DimensionId, String>> uniqueDimensions = new HashMap<>();
-        for (int i = 0; i < values.length(); i++) {
-            JSONObject metric = values.getJSONObject(i);
-            String name = metric.getString("name");
+        for (int i = 0; i < values.size(); i++) {
+            JsonNode metric = values.get(i);
+            String name = metric.get("name").textValue();
             String description = "";
 
             if (metric.has("description")) {
-                description = metric.getString("description");
+                description = metric.get("description").textValue();
             }
 
             Map<DimensionId, String> dim = noDims;
             if (metric.has("dimensions")) {
-                JSONObject dimensions = metric.getJSONObject("dimensions");
+                JsonNode dimensions = metric.get("dimensions");
                 StringBuilder sb = new StringBuilder();
-                for (Iterator<?> it = dimensions.keys(); it.hasNext(); ) {
+                for (Iterator<?> it = dimensions.fieldNames(); it.hasNext(); ) {
                     String k = (String) it.next();
-                    String v = dimensions.getString(k);
+                    String v = dimensions.get(k).textValue();
                     sb.append(toDimensionId(k)).append(v);
                 }
                 if ( ! uniqueDimensions.containsKey(sb.toString())) {
                     dim = new HashMap<>();
-                    for (Iterator<?> it = dimensions.keys(); it.hasNext(); ) {
+                    for (Iterator<?> it = dimensions.fieldNames(); it.hasNext(); ) {
                         String k = (String) it.next();
-                        String v = dimensions.getString(k);
+                        String v = dimensions.get(k).textValue();
                         dim.put(toDimensionId(k), v);
                     }
                     uniqueDimensions.put(sb.toString(), Collections.unmodifiableMap(dim));
@@ -111,10 +113,11 @@ public class RemoteMetricsFetcher extends HttpMetricFetcher {
                 dim = uniqueDimensions.get(sb.toString());
             }
 
-            JSONObject aggregates = metric.getJSONObject("values");
-            for (Iterator<?> it = aggregates.keys(); it.hasNext(); ) {
+            JsonNode aggregates = metric.get("values");
+            for (Iterator<?> it = aggregates.fieldNames(); it.hasNext(); ) {
                 String aggregator = (String) it.next();
-                Number value = (Number) aggregates.get(aggregator);
+                Number value = aggregates.get(aggregator).numberValue();
+                if (value == null) throw new IllegalArgumentException("Value for aggregator '" + aggregator + "' is missing");
                 StringBuilder metricName = (new StringBuilder()).append(name).append(".").append(aggregator);
                 m.add(new Metric(metricName.toString(), value, timestamp, dim, description));
             }