Deprecate LoggingRequestHandler constructors taking AccessLog

Add replacement constructors without AccessLog.
Remove use of deprecated constructors for internal handlers.

2 files changed, 4 insertions, 10 deletions

diff --git a/container-core/src/test/java/com/yahoo/container/handler/test/MockServiceTest.java b/container-core/src/test/java/com/yahoo/container/handler/test/MockServiceTest.java
index f1a9fdcd0a3..cd5a3ce860a 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/test/MockServiceTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/test/MockServiceTest.java
@@ -3,7 +3,6 @@ package com.yahoo.container.handler.test;
 
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
-import com.yahoo.container.logging.AccessLog;
 import com.yahoo.filedistribution.fileacquirer.MockFileAcquirer;
 import org.junit.Test;
 
@@ -75,7 +74,7 @@ public class MockServiceTest {
     private HttpResponse runHandlerWithFile(com.yahoo.jdisc.http.HttpRequest.Method method, String path, File file) throws InterruptedException, IOException {
         MockserviceConfig.Builder builder = new MockserviceConfig.Builder();
         builder.file(file.getPath());
-        MockService handler = new MockService(new MockExecutor(), AccessLog.voidAccessLog(), MockFileAcquirer.returnFile(file), new MockserviceConfig(builder), null);
+        MockService handler = new MockService(new MockExecutor(), MockFileAcquirer.returnFile(file), new MockserviceConfig(builder), null);
         return handler.handle(HttpRequest.createTestRequest(path, method));
     }
 
diff --git a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java
index 734b3fa11af..34144ee8a59 100644
--- a/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java
+++ b/container-core/src/test/java/com/yahoo/container/jdisc/LoggingRequestHandlerTestCase.java
@@ -2,12 +2,9 @@
 package com.yahoo.container.jdisc;
 
 import com.google.inject.Key;
-import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.container.handler.Coverage;
 import com.yahoo.container.handler.Timing;
-import com.yahoo.container.logging.AccessLog;
 import com.yahoo.container.logging.HitCounts;
-import com.yahoo.container.logging.RequestLogHandler;
 import com.yahoo.jdisc.Container;
 import com.yahoo.jdisc.References;
 import com.yahoo.jdisc.ResourceReference;
@@ -102,8 +99,8 @@ public class LoggingRequestHandlerTestCase {
 
     static final class AccessLogTestHandler extends LoggingRequestHandler {
 
-        public AccessLogTestHandler(Executor executor, AccessLog accessLog) {
-            super(executor, accessLog);
+        public AccessLogTestHandler(Executor executor) {
+            super(executor);
         }
 
         @Override
@@ -115,10 +112,8 @@ public class LoggingRequestHandlerTestCase {
 
     @Before
     public void setUp() throws Exception {
-        ComponentRegistry<RequestLogHandler> implementers = new ComponentRegistry<>();
-        implementers.freeze();
         executor = Executors.newCachedThreadPool();
-        handler = new AccessLogTestHandler(executor, new AccessLog(implementers));
+        handler = new AccessLogTestHandler(executor);
     }
 
     @After