diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-12-15 07:28:08 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-12-15 07:28:08 +0100 |
commit | b8b4ee56ddced94d2440d56ca052a59c9afa6d12 (patch) | |
tree | d0523c9df7ff50f57672f01d8d49ab2356fc2a02 /container-core/src/main/java/com/yahoo/container/jdisc | |
parent | 7a325afb6a7c8ccda3fff28b778e76eedd9b77b4 (diff) |
Revert "Move the Context class to ThreadedHttpRequestHandler [run-systemtest]"
Diffstat (limited to 'container-core/src/main/java/com/yahoo/container/jdisc')
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/LoggingRequestHandler.java | 38 | ||||
-rw-r--r-- | container-core/src/main/java/com/yahoo/container/jdisc/ThreadedHttpRequestHandler.java | 44 |
2 files changed, 38 insertions, 44 deletions
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 ed884d104ed..717bde1eb5e 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,6 +29,44 @@ 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 3cd20f64ca1..0c3c1e2120b 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,7 +2,6 @@ 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; @@ -48,11 +47,6 @@ 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()); @@ -256,42 +250,4 @@ 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; } - - } - } |