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

6 files changed, 6 insertions, 9 deletions

diff --git a/flags/src/main/java/com/yahoo/vespa/flags/JsonNodeRawFlag.java b/flags/src/main/java/com/yahoo/vespa/flags/JsonNodeRawFlag.java
index f2bc90a487e..3441c3707fd 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/JsonNodeRawFlag.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/JsonNodeRawFlag.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.flags;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -87,7 +86,7 @@ public class JsonNodeRawFlag implements RawFlag {
         // ObjectMapper is a heavy-weight object so we construct it only when we need it
         return mapper.updateAndGet((objectMapper) -> {
             if (objectMapper != null) return objectMapper;
-            return Jackson.mapper();
+            return new ObjectMapper();
         });
     }
 
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/wire/WireFlagData.java b/flags/src/main/java/com/yahoo/vespa/flags/json/wire/WireFlagData.java
index cf2cb6795ee..5a2a4e56559 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/json/wire/WireFlagData.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/json/wire/WireFlagData.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.flags.json.wire;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -25,7 +24,7 @@ public class WireFlagData {
     @JsonProperty("rules") public List<WireRule> rules;
     @JsonProperty("attributes") public Map<String, String> defaultFetchVector;
 
-    private static final ObjectMapper mapper = Jackson.mapper();
+    private static final ObjectMapper mapper = new ObjectMapper();
 
     public byte[] serializeToBytes() {
         return uncheck(() -> mapper.writeValueAsBytes(this));
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/json/wire/WireFlagDataList.java b/flags/src/main/java/com/yahoo/vespa/flags/json/wire/WireFlagDataList.java
index 1e18b36a531..e7c3ce1a6f6 100644
--- a/flags/src/main/java/com/yahoo/vespa/flags/json/wire/WireFlagDataList.java
+++ b/flags/src/main/java/com/yahoo/vespa/flags/json/wire/WireFlagDataList.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.flags.json.wire;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -22,7 +21,7 @@ public class WireFlagDataList {
     @JsonProperty("flags")
     public List<WireFlagData> flags = new ArrayList<>();
 
-    private static final ObjectMapper mapper = Jackson.mapper();
+    private static final ObjectMapper mapper = new ObjectMapper();
 
     public void serializeToOutputStream(OutputStream outputStream) {
         uncheck(() -> mapper.writeValue(outputStream, this));
diff --git a/flags/src/test/java/com/yahoo/vespa/flags/custom/ClusterCapacityTest.java b/flags/src/test/java/com/yahoo/vespa/flags/custom/ClusterCapacityTest.java
index e078506ce21..4a5087b0f4d 100644
--- a/flags/src/test/java/com/yahoo/vespa/flags/custom/ClusterCapacityTest.java
+++ b/flags/src/test/java/com/yahoo/vespa/flags/custom/ClusterCapacityTest.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.flags.custom;
 
-import ai.vespa.json.Jackson;
+import com.yahoo.test.json.Jackson;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
diff --git a/flags/src/test/java/com/yahoo/vespa/flags/custom/SharedHostTest.java b/flags/src/test/java/com/yahoo/vespa/flags/custom/SharedHostTest.java
index 66edad3fe36..aee1860dc77 100644
--- a/flags/src/test/java/com/yahoo/vespa/flags/custom/SharedHostTest.java
+++ b/flags/src/test/java/com/yahoo/vespa/flags/custom/SharedHostTest.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.flags.custom;
 
-import ai.vespa.json.Jackson;
+import com.yahoo.test.json.Jackson;
 import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
diff --git a/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java b/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java
index 6e2b4b80d4b..14680927e95 100644
--- a/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.java
+++ b/flags/src/test/java/com/yahoo/vespa/flags/json/SerializationTest.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.flags.json;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.databind.node.JsonNodeType;
+import com.yahoo.test.json.Jackson;
 import com.yahoo.vespa.flags.json.wire.WireCondition;
 import com.yahoo.vespa.flags.json.wire.WireFlagData;
 import org.junit.jupiter.api.Test;