From 6cc469b7950f4f6f2b67596b162cd73e59c22336 Mon Sep 17 00:00:00 2001
From: Bjørn Christian Seime <bjorncs@verizonmedia.com>
Date: Thu, 21 Jan 2021 15:49:05 +0100
Subject: Deprecate LoggingRequestHandler constructors taking AccessLog

Add replacement constructors without AccessLog.
Remove use of deprecated constructors for internal handlers.
---
 .../java/com/yahoo/search/handler/SearchHandler.java    | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'container-search')

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 0337fe9eab9..2b27f60ef73 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
@@ -120,24 +120,23 @@ public class SearchHandler extends LoggingRequestHandler {
     public SearchHandler(Statistics statistics,
                          Metric metric,
                          ContainerThreadPool threadpool,
-                         AccessLog accessLog,
+                         AccessLog ignored,
                          CompiledQueryProfileRegistry queryProfileRegistry,
                          ContainerHttpConfig config,
                          ExecutionFactory executionFactory) {
-        this(statistics, metric, threadpool.executor(), accessLog, queryProfileRegistry, config, executionFactory);
+        this(statistics, metric, threadpool.executor(), ignored, queryProfileRegistry, config, executionFactory);
     }
 
     public SearchHandler(Statistics statistics,
                          Metric metric,
                          Executor executor,
-                         AccessLog accessLog,
+                         AccessLog ignored,
                          CompiledQueryProfileRegistry queryProfileRegistry,
                          ContainerHttpConfig containerHttpConfig,
                          ExecutionFactory executionFactory) {
         this(statistics,
              metric,
              executor,
-             accessLog,
              queryProfileRegistry,
              executionFactory,
              containerHttpConfig.numQueriesToTraceOnDebugAfterConstruction(),
@@ -152,14 +151,13 @@ public class SearchHandler extends LoggingRequestHandler {
     public SearchHandler(Statistics statistics,
                          Metric metric,
                          Executor executor,
-                         AccessLog accessLog,
+                         AccessLog ignored,
                          QueryProfilesConfig queryProfileConfig,
                          ContainerHttpConfig containerHttpConfig,
                          ExecutionFactory executionFactory) {
         this(statistics,
              metric,
              executor,
-             accessLog,
              QueryProfileConfigurer.createFromConfig(queryProfileConfig).compile(),
              executionFactory,
              containerHttpConfig.numQueriesToTraceOnDebugAfterConstruction(),
@@ -170,22 +168,21 @@ public class SearchHandler extends LoggingRequestHandler {
     public SearchHandler(Statistics statistics,
                          Metric metric,
                          Executor executor,
-                         AccessLog accessLog,
+                         AccessLog ignored,
                          CompiledQueryProfileRegistry queryProfileRegistry,
                          ExecutionFactory executionFactory,
                          Optional<String> hostResponseHeaderKey) {
-        this(statistics, metric, executor, accessLog, queryProfileRegistry, executionFactory, 0, hostResponseHeaderKey);
+        this(statistics, metric, executor, queryProfileRegistry, executionFactory, 0, hostResponseHeaderKey);
     }
 
     private SearchHandler(Statistics statistics,
                          Metric metric,
                          Executor executor,
-                         AccessLog accessLog,
                          CompiledQueryProfileRegistry queryProfileRegistry,
                          ExecutionFactory executionFactory,
                          long numQueriesToTraceOnDebugAfterStartup,
                          Optional<String> hostResponseHeaderKey) {
-        super(executor, accessLog, metric, true);
+        super(executor, metric, true);
         log.log(Level.FINE, "SearchHandler.init " + System.identityHashCode(this));
         this.queryProfileRegistry = queryProfileRegistry;
         this.executionFactory = executionFactory;
-- 
cgit v1.2.3