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.

6 files changed, 19 insertions, 18 deletions

diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java
index 226979eb2b9..8816aa6c75d 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/hostinfo/HostInfo.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.core.hostinfo;
 
+import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.DeserializationFeature;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -17,7 +18,7 @@ import java.util.logging.Logger;
 public class HostInfo {
 
     private static final Logger log = Logger.getLogger(HostInfo.class.getName());
-    private static final ObjectMapper mapper = new ObjectMapper();
+    private static final ObjectMapper mapper = Jackson.createMapper();
     private String rawCreationString = "NOT SET";
     static {
         mapper.configure(DeserializationFeature.FAIL_ON_UNKNOWN_PROPERTIES, false);
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Response.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Response.java
index 89b1cf78b3e..636d01dbfa3 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Response.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/Response.java
@@ -45,11 +45,11 @@ public class Response {
         }
 
         @Override
-        public String getId() { return id; }
+        public String id() { return id; }
         @Override
-        public String getReason() { return reason; }
+        public String reason() { return reason; }
         @Override
-        public String toString() { return getId() +": " + getReason(); }
+        public String toString() { return id() +": " + reason(); }
     }
     public static class Link implements SubUnitList {
         private final Map<String, String> links = new LinkedHashMap<>();
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequest.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequest.java
index 04a0e762331..06a74b34f96 100644
--- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequest.java
+++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequest.java
@@ -71,14 +71,14 @@ public class SetNodeStateRequest extends Request<SetResponse> {
     static NodeState getRequestedNodeState(Map<String, UnitState> newStates, Node n) throws StateRestApiException {
         UnitState newState = newStates.get("user");
         if (newState == null) throw new InvalidContentException("No new user state given in request");
-        State state = switch (newState.getId().toLowerCase()) {
+        State state = switch (newState.id().toLowerCase()) {
             case "up" -> State.UP;
             case "retired" -> State.RETIRED;
             case "maintenance" -> State.MAINTENANCE;
             case "down" -> State.DOWN;
-            default -> throw new InvalidContentException("Invalid user state '" + newState.getId() + "' given.");
+            default -> throw new InvalidContentException("Invalid user state '" + newState.id() + "' given.");
         };
-        return new NodeState(n.getType(), state).setDescription(newState.getReason());
+        return new NodeState(n.getType(), state).setDescription(newState.reason());
     }
 
     @Override
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java
index 6d05a7cd963..33b6820db4d 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/ContentClusterHtmlRendererTest.java
@@ -1,7 +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.core;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
+import ai.vespa.json.Jackson;
 import com.google.common.collect.Sets;
 import com.yahoo.vdslib.state.ClusterState;
 import com.yahoo.vespa.clustercontroller.core.hostinfo.HostInfo;
@@ -38,7 +38,7 @@ public class ContentClusterHtmlRendererTest {
 
         for (int x = 0; x < 10; x++) {
             NodeInfo nodeInfo = new DistributorNodeInfo(contentCluster, x, "dist " + x, null);
-            String json = new ObjectMapper().writeValueAsString(Map.of("vtag", Map.of("version", "release1" + (x == 2 ? "bad" : ""))));
+            String json = Jackson.mapper().writeValueAsString(Map.of("vtag", Map.of("version", "release1" + (x == 2 ? "bad" : ""))));
             nodeInfo.setHostInfo(HostInfo.createHostInfo(json));
             distributorNodeInfoByIndex.put(x, nodeInfo);
         }
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java
index 862ab36fb3c..15d1425202e 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/SetNodeStateTest.java
@@ -64,17 +64,17 @@ public class SetNodeStateTest extends StateRestApiTest {
                 final String reason) {
             newStates.put(type, new UnitState() {
                 @Override
-                public String getId() {
+                public String id() {
                     return state;
                 }
 
                 @Override
-                public String getReason() {
+                public String reason() {
                     return reason;
                 }
 
                 @Override
-                public String toString() { return getId() +": " + getReason(); }
+                public String toString() { return id() +": " + reason(); }
             });
             return this;
         }
@@ -117,9 +117,9 @@ public class SetNodeStateTest extends StateRestApiTest {
         restAPI.setUnitState(new SetUnitStateRequestImpl("music").setNewState("user", state, reason));
         for (int index : new int[]{1, 2, 3, 5, 7}) {
             UnitResponse response = restAPI.getState(new StateRequest("music/storage/" + index, 0));
-            String actualState = response.getCurrentState().getStatePerType().get("user").getId();
+            String actualState = response.getCurrentState().getStatePerType().get("user").id();
             assertThat(actualState, is(state.toLowerCase()));
-            String actualReason = response.getCurrentState().getStatePerType().get("user").getReason();
+            String actualReason = response.getCurrentState().getStatePerType().get("user").reason();
             assertThat(actualReason, is(reason));
         }
     }
@@ -264,8 +264,8 @@ public class SetNodeStateTest extends StateRestApiTest {
         Response.NodeResponse nodeResponse = (Response.NodeResponse) response;
         UnitState unitState = nodeResponse.getStatePerType().get(type);
         assertNotNull(unitState, "No such type " + type + " at path " + path);
-        assertEquals(state.toString().toLowerCase(), unitState.getId());
-        assertEquals(reason, unitState.getReason());
+        assertEquals(state.toString().toLowerCase(), unitState.id());
+        assertEquals(reason, unitState.reason());
     }
 
     private void assertSetUnitState(int index, State state, String failureReason) throws StateRestApiException {
diff --git a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequestTest.java b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequestTest.java
index 26ac5325f29..e5543de0546 100644
--- a/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequestTest.java
+++ b/clustercontroller-core/src/test/java/com/yahoo/vespa/clustercontroller/core/restapiv2/requests/SetNodeStateRequestTest.java
@@ -127,8 +127,8 @@ public class SetNodeStateRequestTest {
         NodeState storageNodeState = new NodeState(NodeType.STORAGE, storageWantedState);
         when(storageNodeInfo.getUserWantedState()).thenReturn(storageNodeState);
 
-        when(unitState.getId()).thenReturn(wantedStateString);
-        when(unitState.getReason()).thenReturn(REASON);
+        when(unitState.id()).thenReturn(wantedStateString);
+        when(unitState.reason()).thenReturn(REASON);
 
         when(cluster.calculateEffectOfNewState(any(), any(), any(), any(), any(), anyBoolean())).thenReturn(result);