Make the main constructor take a CompiledQueryProfileRegistry

.. instead of QueryProfilesConfig

2 files changed, 24 insertions, 1 deletions

diff --git a/container-search/abi-spec.json b/container-search/abi-spec.json
index 03ddf488b16..2b4424654a2 100644
--- a/container-search/abi-spec.json
+++ b/container-search/abi-spec.json
@@ -4191,6 +4191,7 @@
       "public"
     ],
     "methods": [
+      "public void <init>(com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, com.yahoo.container.core.ContainerHttpConfig, com.yahoo.search.searchchain.ExecutionFactory)",
       "public void <init>(com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.config.QueryProfilesConfig, com.yahoo.container.core.ContainerHttpConfig, com.yahoo.search.searchchain.ExecutionFactory)",
       "public void <init>(com.yahoo.statistics.Statistics, com.yahoo.jdisc.Metric, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.compiled.CompiledQueryProfileRegistry, com.yahoo.search.searchchain.ExecutionFactory, java.util.Optional)",
       "public void <init>(com.yahoo.container.core.ChainsConfig, com.yahoo.search.config.IndexInfoConfig, com.yahoo.container.QrSearchersConfig, com.yahoo.vespa.configdefinition.SpecialtokensConfig, com.yahoo.statistics.Statistics, com.yahoo.language.Linguistics, com.yahoo.jdisc.Metric, com.yahoo.component.provider.ComponentRegistry, java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.search.query.profile.config.QueryProfilesConfig, com.yahoo.component.provider.ComponentRegistry, com.yahoo.container.core.ContainerHttpConfig)",
diff --git a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
index c8386f3c75c..c658d404adb 100644
--- a/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
+++ b/container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java
@@ -121,6 +121,28 @@ public class SearchHandler extends LoggingRequestHandler {
                          Metric metric,
                          Executor executor,
                          AccessLog accessLog,
+                         CompiledQueryProfileRegistry queryProfileRegistry,
+                         ContainerHttpConfig containerHttpConfig,
+                         ExecutionFactory executionFactory) {
+        this(statistics,
+             metric,
+             executor,
+             accessLog,
+             queryProfileRegistry,
+             executionFactory,
+             containerHttpConfig.numQueriesToTraceOnDebugAfterConstruction(),
+             containerHttpConfig.hostResponseHeaderKey().equals("") ?
+                     Optional.empty() : Optional.of(containerHttpConfig.hostResponseHeaderKey()));
+    }
+
+    /**
+     * @deprecated Use the @Inject annotated constructor instead.
+     */
+    @Deprecated // Vespa 8
+    public SearchHandler(Statistics statistics,
+                         Metric metric,
+                         Executor executor,
+                         AccessLog accessLog,
                          QueryProfilesConfig queryProfileConfig,
                          ContainerHttpConfig containerHttpConfig,
                          ExecutionFactory executionFactory) {
@@ -132,7 +154,7 @@ public class SearchHandler extends LoggingRequestHandler {
              executionFactory,
              containerHttpConfig.numQueriesToTraceOnDebugAfterConstruction(),
              containerHttpConfig.hostResponseHeaderKey().equals("") ?
-             Optional.empty() : Optional.of( containerHttpConfig.hostResponseHeaderKey()));
+                     Optional.empty() : Optional.of( containerHttpConfig.hostResponseHeaderKey()));
     }
 
     public SearchHandler(Statistics statistics,