Remove usage of org.json

5 files changed, 53 insertions, 39 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index 5a1496bf507..431a694fcd8 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -2,6 +2,8 @@
 package com.yahoo.vespa.hosted.controller.restapi.application;
 
 import ai.vespa.hosted.api.Signatures;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.base.Joiner;
 import com.google.common.collect.ImmutableSet;
 import com.google.inject.Inject;
@@ -100,9 +102,6 @@ import com.yahoo.vespa.hosted.controller.versions.VersionStatus;
 import com.yahoo.vespa.hosted.controller.versions.VespaVersion;
 import com.yahoo.vespa.serviceview.bindings.ApplicationView;
 import com.yahoo.yolean.Exceptions;
-import org.json.JSONArray;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import javax.ws.rs.ForbiddenException;
 import javax.ws.rs.InternalServerErrorException;
@@ -151,6 +150,8 @@ import static java.util.stream.Collectors.toUnmodifiableList;
 @SuppressWarnings("unused") // created by injection
 public class ApplicationApiHandler extends LoggingRequestHandler {
 
+    private static final ObjectMapper jsonMapper = new ObjectMapper();
+
     private static final String OPTIONAL_PREFIX = "/api";
 
     private final Controller controller;
@@ -789,15 +790,15 @@ public class ApplicationApiHandler extends LoggingRequestHandler {
 
     private JsonResponse buildResponseFromProtonMetrics(List<ProtonMetrics> protonMetrics) {
         try {
-            var jsonObject = new JSONObject();
-            var jsonArray = new JSONArray();
+            var jsonObject = jsonMapper.createObjectNode();
+            var jsonArray = jsonMapper.createArrayNode();
             for (ProtonMetrics metrics : protonMetrics) {
-                jsonArray.put(metrics.toJson());
+                jsonArray.add(metrics.toJson());
             }
-            jsonObject.put("metrics", jsonArray);
-            return new JsonResponse(200, jsonObject.toString());
-        } catch (JSONException e) {
-            log.severe("Unable to build JsonResponse with Proton data");
+            jsonObject.set("metrics", jsonArray);
+            return new JsonResponse(200, jsonMapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonObject));
+        } catch (JsonProcessingException e) {
+            log.log(Level.SEVERE, "Unable to build JsonResponse with Proton data: " + e.getMessage(), e);
             return new JsonResponse(500, "");
         }
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java
index bda5a708a94..2bf6eb39089 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/ContainerTester.java
@@ -9,6 +9,7 @@ import com.yahoo.config.provision.ApplicationName;
 import com.yahoo.container.http.filter.FilterChainRepository;
 import com.yahoo.jdisc.http.filter.SecurityRequestFilter;
 import com.yahoo.jdisc.http.filter.SecurityRequestFilterChain;
+import com.yahoo.test.json.JsonTestHelper;
 import com.yahoo.vespa.athenz.api.AthenzDomain;
 import com.yahoo.vespa.athenz.api.AthenzIdentity;
 import com.yahoo.vespa.hosted.controller.Controller;
@@ -65,6 +66,10 @@ public class ContainerTester {
                              .addRoleMember(action, identity);
     }
 
+    public void assertJsonResponse(Supplier<Request> request, File responseFile) {
+        assertResponse(request.get(), responseFile, 200, false, true);
+    }
+
     public void assertResponse(Supplier<Request> request, File responseFile) {
         assertResponse(request.get(), responseFile);
     }
@@ -82,6 +87,10 @@ public class ContainerTester {
     }
 
     public void assertResponse(Request request, File responseFile, int expectedStatusCode, boolean removeWhitespace) {
+        assertResponse(request, responseFile, expectedStatusCode, removeWhitespace, false);
+    }
+
+    private void assertResponse(Request request, File responseFile, int expectedStatusCode, boolean removeWhitespace, boolean compareJson) {
         String expectedResponse = readTestFile(responseFile.toString());
         expectedResponse = include(expectedResponse);
         if (removeWhitespace) expectedResponse = expectedResponse.replaceAll("(\"[^\"]*\")|\\s*", "$1"); // Remove whitespace
@@ -106,7 +115,11 @@ public class ContainerTester {
                         expectedResponsePattern, responseString);
             }
         } else {
-            assertEquals(responseFile.toString(), expectedResponse, responseString);
+            if (compareJson) {
+                JsonTestHelper.assertJsonEquals(expectedResponse, responseString);
+            } else {
+                assertEquals(responseFile.toString(), expectedResponse, responseString);
+            }
         }
         assertEquals("Status code", expectedStatusCode, response.getStatus());
     }
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index 434c83898ee..63ad8004473 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -514,7 +514,7 @@ public class ApplicationApiTest extends ControllerContainerTest {
         updateMetrics();
 
         // GET metrics
-        tester.assertResponse(request("/application/v4/tenant/tenant2/application/application1/environment/dev/region/us-east-1/instance/default/metrics", GET)
+        tester.assertJsonResponse(request("/application/v4/tenant/tenant2/application/application1/environment/dev/region/us-east-1/instance/default/metrics", GET)
                         .userIdentity(USER_ID),
                                 new File("proton-metrics.json"));
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
index 828e2856cae..c43abf276c5 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java
@@ -4,6 +4,7 @@ package com.yahoo.vespa.hosted.controller.restapi.application;
 import com.yahoo.component.Version;
 import com.yahoo.config.provision.zone.ZoneId;
 import com.yahoo.container.jdisc.HttpResponse;
+import com.yahoo.test.json.JsonTestHelper;
 import com.yahoo.vespa.hosted.controller.api.application.v4.model.DeployOptions;
 import com.yahoo.vespa.hosted.controller.api.integration.configserver.ConfigServerException;
 import com.yahoo.vespa.hosted.controller.api.integration.deployment.ApplicationVersion;
@@ -12,8 +13,6 @@ import com.yahoo.vespa.hosted.controller.api.integration.deployment.TestReport;
 import com.yahoo.vespa.hosted.controller.application.ApplicationPackage;
 import com.yahoo.vespa.hosted.controller.deployment.ApplicationPackageBuilder;
 import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
-import org.json.JSONException;
-import org.json.JSONObject;
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
@@ -180,12 +179,10 @@ public class JobControllerApiHandlerHelperTest {
                        "jobs-direct-deployment.json");
     }
 
-    private void compare(HttpResponse response, String expected) throws JSONException, IOException {
+    private void compare(HttpResponse response, String expected) throws IOException {
         ByteArrayOutputStream baos = new ByteArrayOutputStream();
         response.render(baos);
-        JSONObject actualJSON = new JSONObject(new String(baos.toByteArray()));
-        JSONObject expectedJSON = new JSONObject(expected);
-        assertEquals(expectedJSON.toString(), actualJSON.toString());
+        JsonTestHelper.assertJsonEquals(expected, baos.toString());
     }
 
     private void assertResponse(HttpResponse response, String fileName) {
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/proton-metrics.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/proton-metrics.json
index a7e5b3918d8..3fba9b3c91c 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/proton-metrics.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/proton-metrics.json
@@ -1,23 +1,26 @@
 {
-  "metrics": [{
-    "clusterId": "content/doc/",
-    "metrics": {
-      "resourceMemoryUsageAverage": 0.103482,
-      "documentsReadyCount": 11430,
-      "documentDiskUsage": 44021,
-      "resourceDiskUsageAverage": 0.0168421,
-      "documentsTotalCount": 11430,
-      "documentsActiveCount": 11430
+  "metrics": [
+    {
+      "clusterId": "content/doc/",
+      "metrics": {
+        "resourceMemoryUsageAverage": 0.103482,
+        "documentsReadyCount": 11430.0,
+        "documentDiskUsage": 44021.0,
+        "resourceDiskUsageAverage": 0.0168421,
+        "documentsTotalCount": 11430.0,
+        "documentsActiveCount": 11430.0
+      }
+    },
+    {
+      "clusterId": "content/music/",
+      "metrics": {
+        "resourceMemoryUsageAverage": 0.00912,
+        "documentsReadyCount": 32000.0,
+        "documentDiskUsage": 90113.0,
+        "resourceDiskUsageAverage": 0.23912,
+        "documentsTotalCount": 32210.0,
+        "documentsActiveCount": 32210.0
+      }
     }
-  }, {
-    "clusterId": "content/music/",
-    "metrics": {
-      "resourceMemoryUsageAverage": 0.00912,
-      "documentsReadyCount": 32000,
-      "documentDiskUsage": 90113,
-      "resourceDiskUsageAverage": 0.23912,
-      "documentsTotalCount": 32210,
-      "documentsActiveCount": 32210
-    }
-  }]
-}
\ No newline at end of file
+  ]
+}