jackson 2.16 changes some of its default settings so we consolidate our use of the ObjectMapper.

Unless special options are used, use a common instance, or create via factory metod.

2 files changed, 7 insertions, 6 deletions

diff --git a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/DummyStateApi.java b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/DummyStateApi.java
index 88f1b49f92e..a73e20b8755 100644
--- a/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/DummyStateApi.java
+++ b/clustercontroller-utils/src/test/java/com/yahoo/vespa/clustercontroller/utils/staterestapi/DummyStateApi.java
@@ -125,11 +125,11 @@ public class DummyStateApi implements StateRestAPI {
                         Map<String, UnitState> m = new LinkedHashMap<>();
                         m.put("current", new UnitState() {
                             @Override
-                            public String getId() { return node.state; }
+                            public String id() { return node.state; }
                             @Override
-                            public String getReason() { return node.reason; }
+                            public String reason() { return node.reason; }
                             @Override
-                            public String toString() { return getId() +": " + getReason(); }
+                            public String toString() { return id() +": " + reason(); }
                         });
                         return m;
                     }
@@ -192,8 +192,8 @@ public class DummyStateApi implements StateRestAPI {
         if (newState.size() != 1 || !newState.containsKey("current")) {
             throw new InvalidContentException("Only state of type 'current' is allowed to be set.");
         }
-        n.state = newState.get("current").getId();
-        n.reason = newState.get("current").getReason();
+        n.state = newState.get("current").id();
+        n.reason = newState.get("current").reason();
         String reason = String.format("DummyStateAPI %s call", request.getResponseWait().getName());
         return new SetResponse(reason, true);
     }
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 97d9531a28f..f5166cab25a 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,6 +1,7 @@
 // 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;
@@ -30,7 +31,7 @@ import static org.junit.jupiter.api.Assertions.fail;
 
 public class StateRestAPITest {
 
-    private static final ObjectMapper mapper = new ObjectMapper();
+    private static final ObjectMapper mapper = Jackson.mapper();
 
     private static void populateDummyBackend(DummyBackend backend) {
         backend.addCluster(new DummyBackend.Cluster("foo")