diff options
author | gjoranv <gv@verizonmedia.com> | 2021-12-14 16:39:15 +0100 |
---|---|---|
committer | gjoranv <gv@verizonmedia.com> | 2021-12-16 00:08:15 +0100 |
commit | 69cc74e83ab403bcbb17e2cf1816f6b85e7d3f96 (patch) | |
tree | a4aaebe35da2179fd1a47ba53bbcc5d2920b8b01 /container-core | |
parent | 054bc0a48ac9a358d7058f36f8861be11013fb58 (diff) |
Move the Context class to ThreadedHttpRequestHandler
- Add new ctor that takes a Context
Diffstat (limited to 'container-core')
3 files changed, 65 insertions, 58 deletions
diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json index c3c946ab537..194aa9ad0e4 100644 --- a/container-core/abi-spec.json +++ b/container-core/abi-spec.json @@ -725,22 +725,6 @@ ], "fields": [] }, - "com.yahoo.container.jdisc.LoggingRequestHandler$Context": { - "superClass": "java.lang.Object", - "interfaces": [], - "attributes": [ - "public" - ], - "methods": [ - "public void <init>(java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.jdisc.Metric)", - "public void <init>(java.util.concurrent.Executor, com.yahoo.jdisc.Metric)", - "public void <init>(com.yahoo.container.jdisc.LoggingRequestHandler$Context)", - "public java.util.concurrent.Executor getExecutor()", - "public com.yahoo.container.logging.AccessLog getAccessLog()", - "public com.yahoo.jdisc.Metric getMetric()" - ], - "fields": [] - }, "com.yahoo.container.jdisc.LoggingRequestHandler": { "superClass": "com.yahoo.container.jdisc.ThreadedHttpRequestHandler", "interfaces": [], @@ -749,11 +733,10 @@ "abstract" ], "methods": [ - "public static com.yahoo.container.jdisc.LoggingRequestHandler$Context testOnlyContext()", - "public void <init>(com.yahoo.container.jdisc.LoggingRequestHandler$Context)", + "public void <init>(com.yahoo.container.jdisc.ThreadedHttpRequestHandler$Context)", "public void <init>(java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog)", "public void <init>(java.util.concurrent.Executor)", - "public void <init>(com.yahoo.container.jdisc.LoggingRequestHandler$Context, boolean)", + "public void <init>(com.yahoo.container.jdisc.ThreadedHttpRequestHandler$Context, boolean)", "public void <init>(java.util.concurrent.Executor, com.yahoo.jdisc.Metric)", "public void <init>(java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.jdisc.Metric)", "public void <init>(java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.jdisc.Metric, boolean)", @@ -875,6 +858,22 @@ ], "fields": [] }, + "com.yahoo.container.jdisc.ThreadedHttpRequestHandler$Context": { + "superClass": "java.lang.Object", + "interfaces": [], + "attributes": [ + "public" + ], + "methods": [ + "public void <init>(java.util.concurrent.Executor, com.yahoo.container.logging.AccessLog, com.yahoo.jdisc.Metric)", + "public void <init>(java.util.concurrent.Executor, com.yahoo.jdisc.Metric)", + "public void <init>(com.yahoo.container.jdisc.ThreadedHttpRequestHandler$Context)", + "public java.util.concurrent.Executor getExecutor()", + "public com.yahoo.container.logging.AccessLog getAccessLog()", + "public com.yahoo.jdisc.Metric getMetric()" + ], + "fields": [] + }, "com.yahoo.container.jdisc.ThreadedHttpRequestHandler$LazyContentChannel": { "superClass": "java.lang.Object", "interfaces": [ @@ -903,13 +902,15 @@ "methods": [ "public void <init>(java.util.concurrent.Executor)", "public void <init>(java.util.concurrent.Executor, com.yahoo.jdisc.Metric)", + "public void <init>(com.yahoo.container.jdisc.ThreadedHttpRequestHandler$Context)", "public void <init>(java.util.concurrent.Executor, com.yahoo.jdisc.Metric, boolean)", "public abstract com.yahoo.container.jdisc.HttpResponse handle(com.yahoo.container.jdisc.HttpRequest)", "public com.yahoo.container.jdisc.HttpResponse handle(com.yahoo.container.jdisc.HttpRequest, com.yahoo.jdisc.handler.ContentChannel)", "public final void handleRequest(com.yahoo.jdisc.Request, com.yahoo.jdisc.handler.BufferedContentChannel, com.yahoo.jdisc.handler.ResponseHandler)", "protected void addDateHeader(com.yahoo.container.jdisc.HttpResponse, long)", "protected com.yahoo.container.jdisc.LoggingCompletionHandler createLoggingCompletionHandler(long, long, com.yahoo.container.jdisc.HttpResponse, com.yahoo.container.jdisc.HttpRequest, com.yahoo.container.jdisc.ContentChannelOutputStream)", - "protected com.yahoo.jdisc.http.HttpRequest asHttpRequest(com.yahoo.jdisc.Request)" + "protected com.yahoo.jdisc.http.HttpRequest asHttpRequest(com.yahoo.jdisc.Request)", + "public static com.yahoo.container.jdisc.ThreadedHttpRequestHandler$Context testOnlyContext()" ], "fields": [ "public static final java.lang.String CONTENT_TYPE", diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java index 717bde1eb5e..ed884d104ed 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java @@ -29,44 +29,6 @@ import java.util.logging.Level; // TODO Vespa 8: Remove deprecated constructors public abstract class LoggingRequestHandler extends ThreadedHttpRequestHandler { - public static class Context { - - final Executor executor; - final Metric metric; - - /** @deprecated Use {@link #Context(Executor, Metric)} instead */ - @Deprecated(forRemoval = true, since = "7") - public Context(Executor executor, AccessLog ignored, Metric metric) { - this(executor, metric); - } - - @Inject - public Context(Executor executor, Metric metric) { - this.executor = executor; - this.metric = metric; - } - - public Context(Context other) { - this.executor = other.executor; - this.metric = other.metric; - } - - public Executor getExecutor() { return executor; } - @Deprecated(forRemoval = true, since = "7") public AccessLog getAccessLog() { return null; } - public Metric getMetric() { return metric; } - - } - - public static Context testOnlyContext() { - return new Context(new Executor() { - @Override - public void execute(Runnable command) { - command.run(); - } - }, - null); - } - @Inject public LoggingRequestHandler(Context ctx) { this(ctx.executor, ctx.metric); diff --git a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java index 0c3c1e2120b..3cd20f64ca1 100644 --- a/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java +++ b/container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java @@ -2,6 +2,7 @@ package com.yahoo.container.jdisc; import com.google.inject.Inject; +import com.yahoo.container.logging.AccessLog; import com.yahoo.jdisc.Metric; import com.yahoo.jdisc.Request; import com.yahoo.jdisc.handler.BufferedContentChannel; @@ -47,6 +48,11 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler this(executor, metric, false); } + // TODO: move Inject annotation here! + public ThreadedHttpRequestHandler(Context context) { + this(context.executor, context.metric); + } + public ThreadedHttpRequestHandler(Executor executor, Metric metric, boolean allowAsyncResponse) { super(executor, metric, allowAsyncResponse); log = Logger.getLogger(this.getClass().getName()); @@ -250,4 +256,42 @@ public abstract class ThreadedHttpRequestHandler extends ThreadedRequestHandler } + public static Context testOnlyContext() { + return new Context(new Executor() { + @Override + public void execute(Runnable command) { + command.run(); + } + }, + null); + } + + public static class Context { + + final Executor executor; + final Metric metric; + + /** @deprecated Use {@link #Context(Executor, Metric)} instead */ + @Deprecated(forRemoval = true, since = "7") + public Context(Executor executor, AccessLog ignored, Metric metric) { + this(executor, metric); + } + + @Inject + public Context(Executor executor, Metric metric) { + this.executor = executor; + this.metric = metric; + } + + public Context(Context other) { + this.executor = other.executor; + this.metric = other.metric; + } + + public Executor getExecutor() { return executor; } + @Deprecated(forRemoval = true, since = "7") public AccessLog getAccessLog() { return null; } + public Metric getMetric() { return metric; } + + } + } |