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

2 files changed, 9 insertions, 7 deletions

diff --git a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
index e1aafca8d22..4f77a933a74 100644
--- a/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
+++ b/vespajlib/src/test/java/com/yahoo/slime/JsonBenchmark.java
@@ -1,11 +1,11 @@
 // Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.slime;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.core.JsonFactory;
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.core.JsonToken;
 import com.fasterxml.jackson.databind.JsonNode;
+import com.yahoo.test.json.Jackson;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
@@ -56,9 +56,10 @@ public class JsonBenchmark {
     private static long benchmarkJacksonTree(byte [] json, int numIterations) {
         long count = 0;
         // use the ObjectMapper to read the json string and create a tree
+        var mapper = Jackson.mapper();
         try {
             for (int i=0; i < numIterations; i++) {
-                JsonNode node = Jackson.mapper().readTree(json);
+                JsonNode node = mapper.readTree(json);
                 for(JsonNode item : node) {
                     count += item.get("weight").asLong();
                 }
@@ -94,11 +95,11 @@ public class JsonBenchmark {
      * slime 1000 40000  = 17.5 seconds
      * @param argv type, num elements in weigted set, num iterations
      */
-    static public void main(String argv[]) {
+    static public void main(String [] argv) {
         String type = argv[0];
-        byte [] json = createJson(Integer.valueOf(argv[1]));
+        byte [] json = createJson(Integer.parseInt(argv[1]));
         warmup(json);
-        int count = Integer.valueOf(argv[2]);
+        int count = Integer.parseInt(argv[2]);
         System.out.println(System.currentTimeMillis() + " Start");
         long start = System.currentTimeMillis();
         long numValues;
diff --git a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java
index 147cb402cb3..97229d30239 100644
--- a/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java
+++ b/vespajlib/src/test/java/com/yahoo/tensor/serialization/SerializationTestCase.java
@@ -2,11 +2,11 @@
 
 package com.yahoo.tensor.serialization;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.yahoo.io.GrowableByteBuffer;
 import com.yahoo.tensor.Tensor;
 import com.yahoo.tensor.TensorType;
+import com.yahoo.test.json.Jackson;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -45,8 +45,9 @@ public class SerializationTestCase {
 
     @Test
     public void testSerialization() throws IOException {
+        var mapper = Jackson.mapper();
         for (String test : tests) {
-            JsonNode node = Jackson.mapper().readTree(test);
+            JsonNode node = mapper.readTree(test);
             if (node.has("tensor") && node.has("binary")) {
                 System.out.println("Running test: " + test);