summaryrefslogtreecommitdiffstats
path: root/docproc
diff options
context:
space:
mode:
authorgjoranv <gv@verizonmedia.com>2022-03-07 17:45:03 +0100
committergjoranv <gv@verizonmedia.com>2022-03-07 17:47:28 +0100
commit25fe2c394efc2a183997576af687821a16e60015 (patch)
treea0c75eb7ec8e4830168308f5832c08971d3394db /docproc
parent93bbd6129d452fa3445688db478fea5f07f4aaae (diff)
Fix TBD comments for Processing.setDocprocServiceRegistry()
- Method will be removed
Diffstat (limited to 'docproc')
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/Processing.java4
-rw-r--r--docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java4
2 files changed, 4 insertions, 4 deletions
diff --git a/docproc/src/main/java/com/yahoo/docproc/Processing.java b/docproc/src/main/java/com/yahoo/docproc/Processing.java
index a3293b90bfe..834d63c5a86 100644
--- a/docproc/src/main/java/com/yahoo/docproc/Processing.java
+++ b/docproc/src/main/java/com/yahoo/docproc/Processing.java
@@ -140,10 +140,8 @@ public class Processing {
}
/**
- * @deprecated Use TBD instead
+ * @deprecated This method will be removed without replacement in Vespa 8.
*/
- // TODO: used to: processing.setDocprocServiceRegistry(this.documentProcessingHandler.getDocprocServiceRegistry());
- // from Processor and LoggingRequestHandler
@Deprecated(forRemoval = true, since="7")
@SuppressWarnings("removal") // TODO Vespa 8: remove
public void setDocprocServiceRegistry(ComponentRegistry<DocprocService> docprocServiceRegistry) {
diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java
index e8a2e214776..33cd6647ede 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/ProcessingFactory.java
@@ -105,8 +105,10 @@ class ProcessingFactory {
Processing processing = new Processing();
processing.addDocumentOperation(documentOperation);
processing.setServiceName(serviceName);
- // TODO Vespa 8: Use TBD instead, this method will be removed
+
+ // TODO Vespa 8: Remove statement (registry will be removed from Processing)
processing.setDocprocServiceRegistry(docprocServiceComponentRegistry);
+
processing.setVariable("route", message.getRoute());
processing.setVariable("timeout", message.getTimeRemaining());
return processing;