summaryrefslogtreecommitdiffstats
path: root/container-search/src
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2020-05-19 23:25:46 +0200
committergjoranv <gv@verizonmedia.com>2020-05-22 14:33:57 +0200
commit1c388b496607030bc01b0a3d6640f550831c39dd (patch)
treeca29cdd6c6f629a43b6e5c42740705fde30efcad /container-search/src
parent57b2222304dbec9df28db42eaf360f700dfcef18 (diff)
Make the main constructor take a CompiledQueryProfileRegistry
.. instead of QueryProfilesConfig
Diffstat (limited to 'container-search/src')
-rw-r--r--container-search/src/main/java/com/yahoo/search/handler/SearchHandler.java24
1 files changed, 23 insertions, 1 deletions
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,