Remove deprecated APIs exposing Jackson types

3 files changed, 4 insertions, 43 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 1e205322169..54cdb4ea929 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -7249,10 +7249,7 @@
       "public"
     ],
     "methods": [
-      "public void <init>(com.fasterxml.jackson.core.JsonGenerator, boolean)",
-      "public void <init>(com.fasterxml.jackson.core.JsonGenerator, boolean, boolean)",
       "protected void <init>(boolean, boolean, boolean)",
-      "public void <init>(com.fasterxml.jackson.core.JsonGenerator, boolean, boolean, boolean)",
       "public void accept(java.lang.String, java.lang.Object)",
       "public void accept(java.lang.String, byte[], int, int)",
       "protected boolean shouldRender(java.lang.String, java.lang.Object)",
@@ -7272,7 +7269,6 @@
     "methods": [
       "public void <init>()",
       "public void <init>(java.util.concurrent.Executor)",
-      "protected static com.fasterxml.jackson.databind.ObjectMapper createJsonCodec()",
       "public void init()",
       "public void beginResponse(java.io.OutputStream)",
       "protected void renderTrace(com.yahoo.processing.execution.Execution$Trace)",
@@ -7293,8 +7289,7 @@
       "public void endResponse()",
       "public java.lang.String getEncoding()",
       "public java.lang.String getMimeType()",
-      "protected com.yahoo.search.rendering.JsonRenderer$FieldConsumer createFieldConsumer(boolean)",
-      "protected com.yahoo.search.rendering.JsonRenderer$FieldConsumer createFieldConsumer(com.fasterxml.jackson.core.JsonGenerator, boolean)"
+      "protected com.yahoo.search.rendering.JsonRenderer$FieldConsumer createFieldConsumer(boolean)"
     ],
     "fields": []
   },
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
index d5303d205a0..ae76747fb6d 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java
@@ -57,7 +57,6 @@ import java.math.BigInteger;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayDeque;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.Deque;
 import java.util.Map;
 import java.util.Optional;
@@ -174,18 +173,7 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
         generatorFactory.setCodec(createJsonCodec());
     }
 
-    /**
-     * Create the codec used for rendering instances of {@link TreeNode}. This
-     * method will be invoked when creating the first renderer instance, but not
-     * for each fresh clone used by individual results.
-     *
-     * @deprecated Will be removed in Vespa 8. Override the individual render methods of {@link JsonRenderer} to alter
-     *             rendering behaviour. Override {@link #createFieldConsumer(boolean)} and sub-class {@link FieldConsumer}
-     *             to alter rendering of hit fields.
-     * @return an object mapper for the internal JsonFactory
-     */
-    @Deprecated(forRemoval = true, since = "7") // TODO Vespa 8 make private
-    protected static ObjectMapper createJsonCodec() {
+    private static ObjectMapper createJsonCodec() {
         return new ObjectMapper().disable(FLUSH_AFTER_WRITE_VALUE);
     }
 
@@ -545,13 +533,6 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
         return createFieldConsumer(generator, fieldConsumerSettings);
     }
 
-    /** @deprecated Will be removed in Vespa 8. Use {@link #createFieldConsumer(boolean)} instead. */
-    @Deprecated(forRemoval = true, since = "7") // TODO Vespa 8 remove method
-    protected FieldConsumer createFieldConsumer(JsonGenerator generator, boolean debugRendering) {
-        fieldConsumerSettings.debugRendering = debugRendering;
-        return createFieldConsumer(generator, fieldConsumerSettings);
-    }
-
     private FieldConsumer createFieldConsumer(JsonGenerator generator, FieldConsumerSettings settings) {
         return new FieldConsumer(generator, settings);
     }
@@ -574,26 +555,12 @@ public class JsonRenderer extends AsynchronousSectionedRenderer<Result> {
         private final FieldConsumerSettings settings;
         private MutableBoolean hasFieldsField;
 
-        /** @deprecated Will be removed in Vespa 8. Use {@link #FieldConsumer(boolean, boolean, boolean)} instead. */
-        @Deprecated(forRemoval = true, since = "7") // TODO Vespa 8 Remove
-        public FieldConsumer(JsonGenerator generator, boolean debugRendering) {
-            this(generator, debugRendering, false);
-        }
-
-        /** @deprecated Will be removed in Vespa 8. Use {@link #FieldConsumer(boolean, boolean, boolean)} instead. */
-        @Deprecated(forRemoval = true, since = "7") // TODO Vespa 8 Remove
-        public FieldConsumer(JsonGenerator generator, boolean debugRendering, boolean tensorShortForm) {
-            this(generator, debugRendering, tensorShortForm, false);
-        }
-
         /** Invoke this from your constructor when sub-classing {@link FieldConsumer} */
         protected FieldConsumer(boolean debugRendering, boolean tensorShortForm, boolean jsonMaps) {
             this(null, debugRendering, tensorShortForm, jsonMaps);
         }
 
-        /** @deprecated Will be removed in Vespa 8. Use {@link #FieldConsumer(boolean, boolean, boolean)} instead. */
-        @Deprecated(forRemoval = true, since = "7") // TODO Vespa 8 remove
-        public FieldConsumer(JsonGenerator generator, boolean debugRendering, boolean tensorShortForm, boolean jsonMaps) {
+        private FieldConsumer(JsonGenerator generator, boolean debugRendering, boolean tensorShortForm, boolean jsonMaps) {
             this.generator = generator;
             this.settings = new FieldConsumerSettings();
             this.settings.debugRendering = debugRendering;
diff --git a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
index bad3cc7284d..2eed540310f 100644
--- a/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
+++ b/container-search/src/test/java/com/yahoo/search/rendering/JsonRendererTestCase.java
@@ -408,7 +408,7 @@ public class JsonRendererTestCase {
         assertEqualJson(expected, summary);
     }
 
-    @SuppressWarnings({"unchecked", "removal"})
+    @SuppressWarnings({"unchecked"})
     @Test
     public void testTracingWithEmptySubtree() throws IOException, InterruptedException, ExecutionException {
         String expected =  "{"
@@ -1437,7 +1437,6 @@ public class JsonRendererTestCase {
         return render(execution, r);
     }
 
-    @SuppressWarnings("removal")
     private String render(Execution execution, Result r) throws InterruptedException, ExecutionException {
         ByteArrayOutputStream bs = new ByteArrayOutputStream();
         CompletableFuture<Boolean> f = renderer.renderResponse(bs, r, execution, null);