aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/main/java/com/yahoo/processing
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@gmail.com>2020-06-02 08:44:21 +0200
committerJon Bratseth <bratseth@gmail.com>2020-06-02 08:44:21 +0200
commitac03f1b821c15062986c6542d248b19c66a17db9 (patch)
treed22523a69073f8d747ac09b614cd88f0ec117106 /container-core/src/main/java/com/yahoo/processing
parent2e3d463d90a4834b65446415e1f92389091716ab (diff)
Explicitly inherit summary features
Diffstat (limited to 'container-core/src/main/java/com/yahoo/processing')
-rw-r--r--container-core/src/main/java/com/yahoo/processing/handler/AbstractProcessingHandler.java3
-rw-r--r--container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java5
-rw-r--r--container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java1
3 files changed, 4 insertions, 5 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 72a5fbdce55..6ab71c9a9dc 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
@@ -164,8 +164,7 @@ public abstract class AbstractProcessingHandler<COMPONENT extends Processor> ext
private static Renderer selectRenderer(com.yahoo.processing.Request processingRequest,
ComponentRegistry<Renderer> renderers, Renderer defaultRenderer) {
Renderer renderer = null;
- // TODO: Support setting a particular renderer instead of just selecting
- // by name?
+ // TODO: Support setting a particular renderer instead of just selecting by name?
String rendererId = processingRequest.properties().getString("format");
if (rendererId != null && !"".equals(rendererId)) {
renderer = renderers.getComponent(ComponentSpecification.fromString(rendererId));
diff --git a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java
index 1504a0e861b..d1ccc88d34f 100644
--- a/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java
+++ b/container-core/src/main/java/com/yahoo/processing/handler/ProcessingHandler.java
@@ -13,12 +13,12 @@ import com.yahoo.processing.rendering.Renderer;
import java.util.concurrent.Executor;
/**
- * A jDisc request handler which invokes a processing chain to produce the response.
+ * A request handler which invokes a processing chain to produce the response.
*
* @author Tony Vaagenes
- * @since 5.1.7
*/
public class ProcessingHandler extends AbstractProcessingHandler<Processor> {
+
public ProcessingHandler(ChainRegistry<Processor> chainRegistry,
ComponentRegistry<Renderer> renderers,
Executor executor,
@@ -51,4 +51,5 @@ public class ProcessingHandler extends AbstractProcessingHandler<Processor> {
Metric metric) {
super(processingChainsConfig, chainedComponents, renderers, executor, accessLog, metric);
}
+
}
diff --git a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java
index ba246f26639..fdc3b63fc92 100644
--- a/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java
+++ b/container-core/src/main/java/com/yahoo/processing/rendering/AsynchronousSectionedRenderer.java
@@ -29,7 +29,6 @@ import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.RejectedExecutionException;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
-import java.util.logging.Level;
import java.util.logging.Logger;
/**