Extend ThreadedHttpReqHndlr instead of deprecated LoggingReqHndlr

6 files changed, 14 insertions, 14 deletions

diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json
index bb8317c298b..813b831b4d6 100644
--- a/container-core/abi-spec.json
+++ b/container-core/abi-spec.json
@@ -2968,7 +2968,7 @@
     "fields": []
   },
   "com.yahoo.processing.handler.AbstractProcessingHandler": {
-    "superClass": "com.yahoo.container.jdisc.LoggingRequestHandler",
+    "superClass": "com.yahoo.container.jdisc.ThreadedHttpRequestHandler",
     "interfaces": [],
     "attributes": [
       "public",
diff --git a/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java b/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java
index b8175802ff7..805da3a0a0f 100644
--- a/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java
+++ b/container-core/src/main/java/com/yahoo/container/handler/test/MockService.java
@@ -4,7 +4,7 @@ package com.yahoo.container.handler.test;
 import com.yahoo.api.annotations.Beta;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
-import com.yahoo.container.jdisc.LoggingRequestHandler;
+import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
 import com.yahoo.filedistribution.fileacquirer.FileAcquirer;
 import com.yahoo.jdisc.Metric;
 
@@ -39,7 +39,7 @@ import java.util.concurrent.TimeUnit;
  * @author Ulf Lilleengen
  */
 @Beta
-public class MockService extends LoggingRequestHandler {
+public class MockService extends ThreadedHttpRequestHandler {
 
     private final MockServiceHandler handler;
 
diff --git a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
index 9b9224e70ef..93cabc316ba 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java
@@ -12,7 +12,7 @@ import com.yahoo.container.core.ChainsConfig;
 import com.yahoo.container.jdisc.ContentChannelOutputStream;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
-import com.yahoo.container.jdisc.LoggingRequestHandler;
+import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
 import com.yahoo.container.logging.AccessLog;
 import com.yahoo.jdisc.Metric;
 import com.yahoo.jdisc.handler.ContentChannel;
@@ -43,7 +43,7 @@ import static com.yahoo.component.chain.ChainsConfigurer.prepareChainRegistry;
  * @author Tony Vaagenes
  * @author Steinar Knutsen
  */
-public abstract class AbstractProcessingHandler<COMPONENT extends Processor> extends LoggingRequestHandler {
+public abstract class AbstractProcessingHandler<COMPONENT extends Processor> extends ThreadedHttpRequestHandler {
 
     private final static CompoundName freezeListenerKey =new CompoundName("processing.freezeListener");
 
diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiRequestHandler.java b/container-core/src/main/java/com/yahoo/restapi/RestApiRequestHandler.java
index b126fbd16e4..001d00c2b37 100644
--- a/container-core/src/main/java/com/yahoo/restapi/RestApiRequestHandler.java
+++ b/container-core/src/main/java/com/yahoo/restapi/RestApiRequestHandler.java
@@ -3,7 +3,7 @@ package com.yahoo.restapi;
 
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
-import com.yahoo.container.jdisc.LoggingRequestHandler;
+import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
 import com.yahoo.container.jdisc.RequestHandlerSpec;
 import com.yahoo.jdisc.Metric;
 
@@ -12,7 +12,7 @@ import java.util.concurrent.Executor;
 /**
  * @author bjorncs
  */
-public abstract class RestApiRequestHandler<T extends RestApiRequestHandler<T>> extends LoggingRequestHandler {
+public abstract class RestApiRequestHandler<T extends RestApiRequestHandler<T>> extends ThreadedHttpRequestHandler {
 
     private final RestApi restApi;
 
@@ -24,7 +24,7 @@ public abstract class RestApiRequestHandler<T extends RestApiRequestHandler<T>>
      * Caller must ensure that provider instance does not try to access any uninitialized fields.
      */
     @SuppressWarnings("unchecked")
-    protected RestApiRequestHandler(LoggingRequestHandler.Context context, RestApiProvider<T> provider) {
+    protected RestApiRequestHandler(ThreadedHttpRequestHandler.Context context, RestApiProvider<T> provider) {
         super(context);
         this.restApi = provider.createRestApi((T)this);
     }
@@ -38,7 +38,7 @@ public abstract class RestApiRequestHandler<T extends RestApiRequestHandler<T>>
         this.restApi = provider.createRestApi((T)this);
     }
 
-    protected RestApiRequestHandler(LoggingRequestHandler.Context context, RestApi restApi) {
+    protected RestApiRequestHandler(ThreadedHttpRequestHandler.Context context, RestApi restApi) {
         super(context);
         this.restApi = restApi;
     }
diff --git a/container-core/src/main/java/com/yahoo/restapi/RestApiTestDriver.java b/container-core/src/main/java/com/yahoo/restapi/RestApiTestDriver.java
index ad943407743..bd693e47eda 100644
--- a/container-core/src/main/java/com/yahoo/restapi/RestApiTestDriver.java
+++ b/container-core/src/main/java/com/yahoo/restapi/RestApiTestDriver.java
@@ -5,7 +5,7 @@ import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.yahoo.container.jdisc.HttpRequest;
 import com.yahoo.container.jdisc.HttpResponse;
-import com.yahoo.container.jdisc.LoggingRequestHandler;
+import com.yahoo.container.jdisc.ThreadedHttpRequestHandler;
 import com.yahoo.jdisc.http.server.jetty.testutils.TestDriver;
 import com.yahoo.jdisc.test.MockMetric;
 
@@ -34,11 +34,11 @@ public class RestApiTestDriver implements AutoCloseable {
 
     public static Builder newBuilder(RestApiRequestHandler<?> handler) { return new Builder(handler); }
 
-    @FunctionalInterface public interface RestApiRequestHandlerFactory { RestApiRequestHandler<?> create(LoggingRequestHandler.Context context); }
+    @FunctionalInterface public interface RestApiRequestHandlerFactory { RestApiRequestHandler<?> create(ThreadedHttpRequestHandler.Context context); }
     public static Builder newBuilder(RestApiRequestHandlerFactory factory) { return new Builder(factory); }
 
-    public static LoggingRequestHandler.Context createHandlerTestContext() {
-        return new LoggingRequestHandler.Context(Executors.newSingleThreadExecutor(), new MockMetric());
+    public static ThreadedHttpRequestHandler.Context createHandlerTestContext() {
+        return new ThreadedHttpRequestHandler.Context(Executors.newSingleThreadExecutor(), new MockMetric());
     }
 
     public OptionalInt listenPort() {
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 4563000793d..5f46184bf89 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
@@ -97,7 +97,7 @@ public class LoggingRequestHandlerTestCase {
         }
     }
 
-    static final class AccessLogTestHandler extends LoggingRequestHandler {
+    static final class AccessLogTestHandler extends ThreadedHttpRequestHandler {
 
         public AccessLogTestHandler(Executor executor) {
             super(executor);