summaryrefslogtreecommitdiffstats
path: root/docproc
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2023-11-30 09:47:10 +0100
committerjonmv <venstad@gmail.com>2023-11-30 09:47:10 +0100
commitd3937b5d44a1a13dd3b895029c7dcbfe32d3d7e1 (patch)
tree0c1c3d9d1ceabd9c0ae67c303d40ede22d76246d /docproc
parentaa207732992038ae65d73a04832ac8a3753b73a9 (diff)
Non-funcitonal changes
Diffstat (limited to 'docproc')
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/impl/DocprocService.java3
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java2
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java2
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/jdisc/RequestContext.java2
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java4
5 files changed, 5 insertions, 8 deletions
diff --git a/docproc/src/main/java/com/yahoo/docproc/impl/DocprocService.java b/docproc/src/main/java/com/yahoo/docproc/impl/DocprocService.java
index b25743fbcde..01df2415ff4 100644
--- a/docproc/src/main/java/com/yahoo/docproc/impl/DocprocService.java
+++ b/docproc/src/main/java/com/yahoo/docproc/impl/DocprocService.java
@@ -398,7 +398,6 @@ public class DocprocService extends AbstractComponent {
}
}
- private class NoCallStackException extends RuntimeException {
- }
+ private static class NoCallStackException extends RuntimeException { }
}
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
index 4c3292b557b..e686fe6254f 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
@@ -147,7 +147,7 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
public ContentChannel handleRequest(Request request, ResponseHandler handler) {
RequestContext requestContext;
if (request instanceof MbusRequest) {
- requestContext = new MbusRequestContext((MbusRequest) request, handler, docprocServiceRegistry, docFactoryRegistry, containerDocConfig);
+ requestContext = new MbusRequestContext((MbusRequest) request, handler, docFactoryRegistry, containerDocConfig);
} else {
//Other types can be added here in the future
throw new IllegalArgumentException("Request type not supported: " + request);
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
index 8bcce9e892d..3c6e63bf5e4 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
@@ -26,7 +26,7 @@ import java.util.logging.Logger;
*/
public class DocumentProcessingTask implements Runnable {
- private static Logger log = Logger.getLogger(DocumentProcessingTask.class.getName());
+ private static final Logger log = Logger.getLogger(DocumentProcessingTask.class.getName());
private final List<Processing> processings = new ArrayList<>();
private final List<Processing> processingsDone = new ArrayList<>();
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/RequestContext.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/RequestContext.java
index ce92965e2df..6ec21c507cc 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/RequestContext.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/RequestContext.java
@@ -28,7 +28,7 @@ public interface RequestContext {
void processingFailed(Exception exception);
/** Returns whether this request has timed out */
- default boolean hasExpired() { return false;}
+ default boolean hasExpired() { return false; }
void skip();
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
index e1b9670dea8..bbdabd53084 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MbusRequestContext.java
@@ -5,7 +5,6 @@ import com.yahoo.component.provider.ComponentRegistry;
import com.yahoo.concurrent.CopyOnWriteHashMap;
import com.yahoo.container.core.document.ContainerDocumentConfig;
import com.yahoo.docproc.AbstractConcreteDocumentFactory;
-import com.yahoo.docproc.impl.DocprocService;
import com.yahoo.docproc.impl.HandledProcessingException;
import com.yahoo.docproc.Processing;
import com.yahoo.docproc.impl.TransientFailureException;
@@ -56,11 +55,10 @@ public class MbusRequestContext implements RequestContext, ResponseHandler {
private final static String internalNoThrottledSourcePath = "/" + internalNoThrottledSource;
public MbusRequestContext(MbusRequest request, ResponseHandler responseHandler,
- ComponentRegistry<DocprocService> docprocServiceComponentRegistry,
ComponentRegistry<AbstractConcreteDocumentFactory> docFactoryRegistry,
ContainerDocumentConfig containerDocConfig) {
this.request = request;
- this.requestMsg = (DocumentMessage)request.getMessage();
+ this.requestMsg = (DocumentMessage) request.getMessage();
this.responseHandler = responseHandler;
this.processingFactory = new ProcessingFactory(docFactoryRegistry,
containerDocConfig, getServiceName());