Revoke deprecated implementation classes in c.y.docproc from public

1 files changed, 2 insertions, 13 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 f0f85fb78dd..0c581357281 100644
--- a/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java
+++ b/application/src/main/java/com/yahoo/application/container/DocumentProcessing.java
@@ -3,8 +3,8 @@ package com.yahoo.application.container;
 
 import com.yahoo.api.annotations.Beta;
 import com.yahoo.component.ComponentSpecification;
-import com.yahoo.docproc.DocprocExecutor;
-import com.yahoo.docproc.DocprocService;
+import com.yahoo.docproc.impl.DocprocExecutor;
+import com.yahoo.docproc.impl.DocprocService;
 import com.yahoo.docproc.DocumentProcessor;
 import com.yahoo.docproc.jdisc.DocumentProcessingHandler;
 import com.yahoo.document.DocumentType;
@@ -59,13 +59,8 @@ public final class DocumentProcessing {
      * @return Progress.DONE or Progress.FAILED
      * @throws RuntimeException if one of the document processors in the chain throws, or if the calling thread is interrupted
      */
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public DocumentProcessor.Progress process(ComponentSpecification chain, com.yahoo.docproc.Processing processing) {
         DocprocExecutor executor = getExecutor(chain);
-
-        // TODO Vespa 8: Remove statement (registry will be removed from Processing)
-        processing.setDocprocServiceRegistry(handler.getDocprocServiceRegistry());
-
         return executor.processUntilDone(processing);
     }
 
@@ -82,17 +77,11 @@ public final class DocumentProcessing {
      * @return any Progress
      * @throws RuntimeException if one of the document processors in the chain throws
      */
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public DocumentProcessor.Progress processOnce(ComponentSpecification chain, com.yahoo.docproc.Processing processing) {
         DocprocExecutor executor = getExecutor(chain);
-
-        // TODO Vespa 8: Remove statement (registry will be removed from Processing)
-        processing.setDocprocServiceRegistry(handler.getDocprocServiceRegistry());
-
         return executor.process(processing);
     }
 
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private DocprocExecutor getExecutor(ComponentSpecification chain) {
         DocprocService service = handler.getDocprocServiceRegistry().getComponent(chain);
         if (service == null) {