Merge pull request #21582 from vespa-engine/remove-TBD

Update docproc TBD comments

3 files changed, 12 insertions, 8 deletions

diff --git a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java
index f89e79c4cfa..f0f85fb78dd 100644
--- a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java
+++ b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java
@@ -62,8 +62,10 @@ public final class DocumentProcessing {
     @SuppressWarnings("removal") // TODO Vespa 8: remove
     public DocumentProcessor.Progress process(ComponentSpecification chain, com.yahoo.docproc.Processing processing) {
         DocprocExecutor executor = getExecutor(chain);
-        // TODO Vespa 8: Use TBD instead, this method will be removed
+
+        // TODO Vespa 8: Remove statement (registry will be removed from Processing)
         processing.setDocprocServiceRegistry(handler.getDocprocServiceRegistry());
+
         return executor.processUntilDone(processing);
     }
 
@@ -83,8 +85,10 @@ public final class DocumentProcessing {
     @SuppressWarnings("removal") // TODO Vespa 8: remove
     public DocumentProcessor.Progress processOnce(ComponentSpecification chain, com.yahoo.docproc.Processing processing) {
         DocprocExecutor executor = getExecutor(chain);
-        // TODO Vespa 8: Use TBD instead, this method will be removed
+
+        // TODO Vespa 8: Remove statement (registry will be removed from Processing)
         processing.setDocprocServiceRegistry(handler.getDocprocServiceRegistry());
+
         return executor.process(processing);
     }
 
diff --git a/docproc/src/main/java/com/yahoo/docproc/Processing.java b/docproc/src/main/java/com/yahoo/docproc/Processing.java
index 47ebb6a7988..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) {
@@ -166,9 +164,9 @@ public class Processing {
      * if #getServiceName returns a name that is not registered in {@link com.yahoo.docproc.DocprocService}.
      *
      * @return the service processing this, or null if unknown.
-     * @deprecated  Use TBD instead
+     * @deprecated  Formerly used to retrieve the {@link com.yahoo.document.DocumentTypeManager},
+     *              which can now be directly injected via your component constructor.
      */
-    // TODO: used to getService().getDocumentTypeManager() in subclasses of DocumentProcessor
     @Deprecated(forRemoval = true, since="7")
     @SuppressWarnings("removal") // TODO Vespa 8: remove
     public DocprocService getService() {
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;