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

2 files changed, 4 insertions, 6 deletions

diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java
index 9bb8c743823..37683b1055e 100644
--- a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.java
+++ b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/HitsVerificationBenchmark.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.search.predicate.benchmarks;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.yahoo.search.predicate.Config;
@@ -46,7 +45,7 @@ public class HitsVerificationBenchmark {
 
     public static void main(String[] rawArgs) throws IOException {
         Optional<BenchmarkArguments> wrappedArgs = getArguments(rawArgs);
-        if (!wrappedArgs.isPresent()) return;
+        if (wrappedArgs.isEmpty()) return;
         BenchmarkArguments args = wrappedArgs.get();
         Map<String, Object> output = new TreeMap<>();
         addArgsToOutput(output, args);
@@ -146,7 +145,7 @@ public class HitsVerificationBenchmark {
 
     private static void writeOutputToStandardOut(Map<String, Object> output) {
         try {
-            ObjectMapper objectMapper = Jackson.createMapper();
+            ObjectMapper objectMapper = new ObjectMapper();
             objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
             objectMapper.writeValue(System.out, output);
         } catch (IOException e) {
diff --git a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java
index 986bf76de48..4ee96466f38 100644
--- a/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.java
+++ b/predicate-search/src/main/java/com/yahoo/search/predicate/benchmarks/PredicateIndexBenchmark.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.search.predicate.benchmarks;
 
-import ai.vespa.json.Jackson;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.google.common.collect.Iterators;
@@ -56,7 +55,7 @@ public class PredicateIndexBenchmark {
 
     public static void main(String[] rawArgs) throws IOException {
         Optional<BenchmarkArguments> optionalArgs = getBenchmarkArguments(rawArgs);
-        if (!optionalArgs.isPresent()) return;
+        if (optionalArgs.isEmpty()) return;
         BenchmarkArguments args = optionalArgs.get();
 
         putBenchmarkArgumentsToOutput(args);
@@ -240,7 +239,7 @@ public class PredicateIndexBenchmark {
 
     private static void writeOutputToStandardOut() {
         try {
-            ObjectMapper objectMapper = Jackson.createMapper();
+            ObjectMapper objectMapper = new ObjectMapper();
             objectMapper.enable(SerializationFeature.INDENT_OUTPUT);
             objectMapper.writeValue(System.out, output);
         } catch (IOException e) {