summaryrefslogtreecommitdiffstats
path: root/container-core/src/main/java/com/yahoo/processing
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-01-21 15:49:05 +0100
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-01-21 16:54:09 +0100
commit6cc469b7950f4f6f2b67596b162cd73e59c22336 (patch)
treeb19e9a8bf8c1bda395da8862494c3edafabf9b4e /container-core/src/main/java/com/yahoo/processing
parentbe7847731521fb516269b65905029c1639d4aec8 (diff)
Deprecate LoggingRequestHandler constructors taking AccessLog
Add replacement constructors without AccessLog. Remove use of deprecated constructors for internal handlers.
Diffstat (limited to 'container-core/src/main/java/com/yahoo/processing')
-rw-r--r--container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java24
1 files changed, 8 insertions, 16 deletions
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 6ab71c9a9dc..a4b2db74300 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
@@ -13,7 +13,6 @@ 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.VespaHeaders;
import com.yahoo.container.logging.AccessLog;
import com.yahoo.jdisc.Metric;
import com.yahoo.jdisc.handler.ContentChannel;
@@ -29,15 +28,8 @@ import com.yahoo.processing.rendering.Renderer;
import com.yahoo.processing.request.CompoundName;
import com.yahoo.processing.request.ErrorMessage;
import com.yahoo.processing.request.Properties;
-import com.yahoo.processing.response.Data;
-import com.yahoo.processing.response.DataList;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
import java.util.concurrent.Executor;
import static com.yahoo.component.chain.ChainsConfigurer.prepareChainRegistry;
@@ -68,9 +60,9 @@ public abstract class AbstractProcessingHandler<COMPONENT extends Processor> ext
public AbstractProcessingHandler(ChainRegistry<COMPONENT> chainRegistry,
ComponentRegistry<Renderer> renderers,
Executor executor,
- AccessLog accessLog,
+ AccessLog ignored,
Metric metric) {
- super(executor, accessLog, metric, true);
+ super(executor, metric, true);
renderingExecutor = executor;
this.chainRegistry = chainRegistry;
this.renderers = renderers;
@@ -87,16 +79,16 @@ public abstract class AbstractProcessingHandler<COMPONENT extends Processor> ext
public AbstractProcessingHandler(ChainRegistry<COMPONENT> chainRegistry,
ComponentRegistry<Renderer> renderers,
Executor executor,
- AccessLog accessLog) {
- this(chainRegistry, renderers, executor, accessLog, null);
+ AccessLog ignored) {
+ this(chainRegistry, renderers, executor, ignored, null);
}
public AbstractProcessingHandler(ChainsConfig processingChainsConfig,
ComponentRegistry <COMPONENT> chainedComponents,
ComponentRegistry<Renderer> renderers,
Executor executor,
- AccessLog accessLog) {
- this(processingChainsConfig, chainedComponents, renderers, executor, accessLog, null);
+ AccessLog ignored) {
+ this(processingChainsConfig, chainedComponents, renderers, executor, ignored, null);
}
@Inject
@@ -104,9 +96,9 @@ public abstract class AbstractProcessingHandler<COMPONENT extends Processor> ext
ComponentRegistry<COMPONENT> chainedComponents,
ComponentRegistry<Renderer> renderers,
Executor executor,
- AccessLog accessLog,
+ AccessLog ignored,
Metric metric) {
- this(createChainRegistry(processingChainsConfig, chainedComponents), renderers, executor, accessLog, metric);
+ this(createChainRegistry(processingChainsConfig, chainedComponents), renderers, executor, ignored, metric);
}
/** Throws UnsupportedOperationException: Call handle(request, channel instead) */