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 | |
parent | 7a325afb6a7c8ccda3fff28b778e76eedd9b77b4 (diff) |
Revert "Move the Context class to ThreadedHttpRequestHandler [run-systemtest]"
4 files changed, 59 insertions, 66 deletions
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java index d826941ca08..c4f506d81ba 100755 --- a/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java +++ b/config-model/src/main/java/com/yahoo/vespa/model/container/ContainerCluster.java @@ -178,7 +178,7 @@ public abstract class ContainerCluster<CONTAINER extends Container> addSimpleComponent("com.yahoo.container.jdisc.metric.MetricConsumerProviderProvider"); addSimpleComponent("com.yahoo.container.jdisc.metric.MetricProvider"); addSimpleComponent("com.yahoo.container.jdisc.metric.MetricUpdater"); - addSimpleComponent(com.yahoo.container.jdisc.ThreadedHttpRequestHandler.Context.class); + addSimpleComponent(com.yahoo.container.jdisc.LoggingRequestHandler.Context.class); addSimpleComponent(com.yahoo.metrics.simple.MetricManager.class.getName(), null, MetricProperties.BUNDLE_SYMBOLIC_NAME); addSimpleComponent(com.yahoo.metrics.simple.jdisc.JdiscMetricsFactory.class.getName(), null, MetricProperties.BUNDLE_SYMBOLIC_NAME); addSimpleComponent("com.yahoo.container.jdisc.state.StateMonitor"); diff --git a/container-core/abi-spec.json b/container-core/abi-spec.json index a42dbbdd5d4..a6783d1e5f5 100644 --- a/container-core/abi-spec.json +++ b/container-core/abi-spec.json @@ -725,6 +725,22 @@ ], "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": [], @@ -733,10 +749,11 @@ "abstract" ], "methods": [ - "public void <init>(com.yahoo.container.jdisc.ThreadedHttpRequestHandler$Context)", + "public static com.yahoo.container.jdisc.LoggingRequestHandler$Context testOnlyContext()", + "public void <init>(com.yahoo.container.jdisc.LoggingRequestHandler$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.ThreadedHttpRequestHandler$Context, boolean)", + "public void <init>(com.yahoo.container.jdisc.LoggingRequestHandler$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)", @@ -858,22 +875,6 @@ ], "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": [ @@ -902,15 +903,13 @@ "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)", - "public static com.yahoo.container.jdisc.ThreadedHttpRequestHandler$Context testOnlyContext()" + "protected com.yahoo.jdisc.http.HttpRequest asHttpRequest(com.yahoo.jdisc.Request)" ], "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 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; } - - } - } |