diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-05-05 13:00:19 +0200 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2022-06-08 11:45:21 +0200 |
commit | 4660644a541e4b9d1ec98de02db0c406c5f4dc30 (patch) | |
tree | 76dd6a664cb20e2d915a99c7a69d5f2dc589d7b9 /container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java | |
parent | e70380aaa5890d9d3a4c83630f0e49b82093bfc4 (diff) |
Remove deprecated APIs exposing Jackson types
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/rendering/JsonRenderer.java | 37 |
1 files changed, 2 insertions, 35 deletions
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; |