From 1f4036d9bab5370bb78305b1e898aa1a608fb751 Mon Sep 17 00:00:00 2001 From: gjoranv Date: Sat, 15 Jan 2022 00:16:45 +0100 Subject: Extend ThreadedHttpReqHndlr instead of deprecated LoggingReqHndlr --- .../main/java/com/yahoo/container/handler/test/MockService.java | 4 ++-- .../com/yahoo/processing/handler/AbstractProcessingHandler.java | 4 ++-- .../src/main/java/com/yahoo/restapi/RestApiRequestHandler.java | 8 ++++---- .../src/main/java/com/yahoo/restapi/RestApiTestDriver.java | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) (limited to 'container-core/src/main/java') 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 extends LoggingRequestHandler { +public abstract class AbstractProcessingHandler 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> extends LoggingRequestHandler { +public abstract class RestApiRequestHandler> extends ThreadedHttpRequestHandler { private final RestApi restApi; @@ -24,7 +24,7 @@ public abstract class RestApiRequestHandler> * Caller must ensure that provider instance does not try to access any uninitialized fields. */ @SuppressWarnings("unchecked") - protected RestApiRequestHandler(LoggingRequestHandler.Context context, RestApiProvider provider) { + protected RestApiRequestHandler(ThreadedHttpRequestHandler.Context context, RestApiProvider provider) { super(context); this.restApi = provider.createRestApi((T)this); } @@ -38,7 +38,7 @@ public abstract class RestApiRequestHandler> 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() { -- cgit v1.2.3