Move to container core due to OSGI, keep a copy in testutil for use in tests in no OSGI modules.

4 files changed, 11 insertions, 10 deletions

diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java
index aa59ef6fbf9..f62c97696ba 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/communication/http/JsonHttpResult.java
@@ -1,7 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.utils.communication.http;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -9,7 +8,7 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
 
 public class JsonHttpResult extends HttpResult {
 
-    private static final ObjectMapper mapper = Jackson.mapper();
+    private static final ObjectMapper mapper = new ObjectMapper();
 
     private JsonNode json;
     private boolean failedParsing = false;
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java
index 78932cb4272..337874246f2 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonReader.java
@@ -1,8 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.utils.staterestapi.server;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.yahoo.vespa.clustercontroller.utils.communication.http.HttpRequest;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.errors.InvalidContentException;
@@ -14,6 +14,7 @@ import java.util.Iterator;
 import java.util.Map;
 
 public class JsonReader {
+    private static final ObjectMapper mapper = new ObjectMapper();
 
     private record UnitStateImpl(String id, String reason) implements UnitState {
 
@@ -42,7 +43,7 @@ public class JsonReader {
     }
 
     public SetRequestData getStateRequestData(HttpRequest request) throws Exception {
-        JsonNode json = Jackson.mapper().readTree(request.getPostContent().toString());
+        JsonNode json = mapper.readTree(request.getPostContent().toString());
 
         final boolean probe = json.has("probe") && json.get("probe").booleanValue();
 
diff --git a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java
index 5c2c90b2b9c..50f71aa1e2e 100644
--- a/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java
+++ b/clustercontroller-utils/src/main/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/server/JsonWriter.java
@@ -1,8 +1,8 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.utils.staterestapi.server;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.yahoo.vespa.clustercontroller.utils.staterestapi.response.CurrentUnitState;
@@ -19,6 +19,8 @@ import java.util.Map;
 
 public class JsonWriter {
 
+    private static final ObjectMapper mapper = new ObjectMapper();
+
     private String pathPrefix = "/";
 
     public JsonWriter() { }
@@ -31,7 +33,7 @@ public class JsonWriter {
     }
 
     public JsonNode createJson(UnitResponse data) {
-        ObjectNode json = new ObjectNode(Jackson.mapper().getNodeFactory());
+        ObjectNode json = new ObjectNode(mapper.getNodeFactory());
         fillInJson(data, json);
         return json;
     }
@@ -92,11 +94,11 @@ public class JsonWriter {
     }
 
     public JsonNode createErrorJson(String description) {
-        return new ObjectNode(Jackson.mapper().getNodeFactory()).put("message", description);
+        return new ObjectNode(mapper.getNodeFactory()).put("message", description);
     }
 
     public JsonNode createJson(SetResponse setResponse) {
-        return new ObjectNode(Jackson.mapper().getNodeFactory()).put("wasModified", setResponse.getWasModified())
+        return new ObjectNode(mapper.getNodeFactory()).put("wasModified", setResponse.getWasModified())
                                                       .put("reason", setResponse.getReason());
     }
 
diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPITest.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPITest.java
index f5166cab25a..97d9531a28f 100644
--- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPITest.java
+++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/StateRestAPITest.java
@@ -1,7 +1,6 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.clustercontroller.utils.staterestapi;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
@@ -31,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class StateRestAPITest {
 
-    private static final ObjectMapper mapper = Jackson.mapper();
+    private static final ObjectMapper mapper = new ObjectMapper();
 
     private static void populateDummyBackend(DummyBackend backend) {
         backend.addCluster(new DummyBackend.Cluster("foo")