Remove deprecated ctors in RendererRegistry

3 files changed, 1 insertions, 21 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 1ec90e23074..b738c697d89 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -7283,9 +7283,7 @@
       "final"
     ],
     "methods": [
-      "public void <init>()",
       "public void <init>(java.util.concurrent.Executor)",
-      "public void <init>(java.util.Collection)",
       "public void <init>(java.util.Collection, java.util.concurrent.Executor)",
       "public void deconstruct()",
       "public com.yahoo.processing.rendering.Renderer getDefaultRenderer()",
diff --git a/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java b/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java
index 2f5478d4bfe..fb379426e92 100644
--- a/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java
+++ b/container-search/src/main/java/com/yahoo/search/rendering/RendererRegistry.java
@@ -26,14 +26,6 @@ public final class RendererRegistry extends ComponentRegistry<com.yahoo.processi
     public static final ComponentId jsonRendererId = ComponentId.fromString("JsonRenderer");
     public static final ComponentId defaultRendererId = jsonRendererId;
     
-    /**
-     * Creates a registry containing the built-in renderers only
-     * @deprecated Supply external executor
-     */
-    @Deprecated(forRemoval = true, since = "7")
-    public RendererRegistry() {
-        this(Collections.emptyList());
-    }
 
     /** 
      * Creates a registry containing the built-in renderers only, using a custom executor.
@@ -44,15 +36,6 @@ public final class RendererRegistry extends ComponentRegistry<com.yahoo.processi
         this(Collections.emptyList(), executor);
     }
 
-    /**
-     * Creates a registry of the given renderers plus the built-in ones
-     * @deprecated Supply external executor
-     */
-    @Deprecated(forRemoval = true, since = "7")
-    public RendererRegistry(Collection<Renderer> renderers) {
-        this(renderers, null);
-    }
-
     /** 
      * Creates a registry of the given renderers plus the built-in ones, using a custom executor.
      * Using a custom executor is useful for tests to avoid creating new threads for each renderer registry.
diff --git a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
index 0a85c636213..576ac8449b1 100644
--- a/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
+++ b/container-search/src/main/java/com/yahoo/search/searchchain/Execution.java
@@ -538,10 +538,9 @@ public class Execution extends com.yahoo.processing.execution.Execution {
      *
      * @deprecated use fill(Result, String)
      * 
-     * TODO Remove on Vespa 9.
      * @param result the result to fill
      */
-    @Deprecated
+    @Deprecated  // TODO Remove on Vespa 9.
     public void fillAttributes(Result result) {
         fill(result, VespaBackEndSearcher.SORTABLE_ATTRIBUTES_SUMMARY_CLASS);
     }