1 files changed, 6 insertions, 8 deletions
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 64e17873ae2..5c2c90b2b9c 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,8 +19,6 @@ import java.util.Map;
 
 public class JsonWriter {
 
-    private static final ObjectMapper mapper = new ObjectMapper();
-
     private String pathPrefix = "/";
 
     public JsonWriter() { }
@@ -33,7 +31,7 @@ public class JsonWriter {
     }
 
     public JsonNode createJson(UnitResponse data) {
-        ObjectNode json = new ObjectNode(mapper.getNodeFactory());
+        ObjectNode json = new ObjectNode(Jackson.mapper().getNodeFactory());
         fillInJson(data, json);
         return json;
     }
@@ -65,8 +63,8 @@ public class JsonWriter {
         ObjectNode stateJson = json.putObject("state");
         Map<String, UnitState> state = stateData.getStatePerType();
         state.forEach((stateType, unitState) -> stateJson.putObject(stateType)
-                                                         .put("state", unitState.getId())
-                                                         .put("reason", unitState.getReason()));
+                                                         .put("state", unitState.id())
+                                                         .put("reason", unitState.reason()));
     }
 
     public void fillInJson(Map<String, SubUnitList> subUnitMap, ObjectNode json) {
@@ -94,11 +92,11 @@ public class JsonWriter {
     }
 
     public JsonNode createErrorJson(String description) {
-        return new ObjectNode(mapper.getNodeFactory()).put("message", description);
+        return new ObjectNode(Jackson.mapper().getNodeFactory()).put("message", description);
     }
 
     public JsonNode createJson(SetResponse setResponse) {
-        return new ObjectNode(mapper.getNodeFactory()).put("wasModified", setResponse.getWasModified())
+        return new ObjectNode(Jackson.mapper().getNodeFactory()).put("wasModified", setResponse.getWasModified())
                                                       .put("reason", setResponse.getReason());
     }