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.

1 files changed, 14 insertions, 9 deletions

diff --git a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java
index c6d907ec7fc..ed88902e094 100644
--- a/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java
+++ b/controller-api/src/main/java/com/yahoo/vespa/hosted/controller/api/application/v4/model/ProtonMetrics.java
@@ -1,14 +1,19 @@
 package com.yahoo.vespa.hosted.controller.api.application.v4.model;
 
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+
 import java.util.HashMap;
 import java.util.Map;
+import java.util.logging.Level;
 import java.util.logging.LogManager;
 import java.util.logging.Logger;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 public class ProtonMetrics {
 
+    private static final ObjectMapper jsonMapper = new ObjectMapper();
+
     private static final Logger logger = LogManager.getLogManager().getLogger(ProtonMetrics.class.getName());
 
     public static final String DOCUMENTS_ACTIVE_COUNT = "documentsActiveCount";
@@ -45,19 +50,19 @@ public class ProtonMetrics {
         return this;
     }
 
-    public JSONObject toJson() {
+    public JsonNode toJson() {
         try {
-            JSONObject protonMetrics = new JSONObject();
+            ObjectNode protonMetrics = jsonMapper.createObjectNode();
             protonMetrics.put("clusterId", clusterId);
-            JSONObject jsonMetrics = new JSONObject();
+            ObjectNode jsonMetrics = jsonMapper.createObjectNode();
             for (Map.Entry<String, Double> entry : metrics.entrySet()) {
                 jsonMetrics.put(entry.getKey(), entry.getValue());
             }
-            protonMetrics.put("metrics", jsonMetrics);
+            protonMetrics.set("metrics", jsonMetrics);
             return protonMetrics;
-        } catch (JSONException e) {
-            logger.severe("Unable to convert Proton Metrics to JSON Object");
+        } catch (Exception e) {
+            logger.log(Level.SEVERE, "Unable to convert Proton Metrics to JSON Object: " + e.getMessage(), e);
         }
-        return new JSONObject();
+        return jsonMapper.createObjectNode();
     }
 }