2 files changed, 5 insertions, 17 deletions

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 50d7acb4064..caaff318cdd 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,10 +5,10 @@ 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.DocprocService;
-import com.yahoo.docproc.HandledProcessingException;
+import com.yahoo.docproc.impl.DocprocService;
+import com.yahoo.docproc.impl.HandledProcessingException;
 import com.yahoo.docproc.Processing;
-import com.yahoo.docproc.TransientFailureException;
+import com.yahoo.docproc.impl.TransientFailureException;
 import com.yahoo.docproc.jdisc.RequestContext;
 import com.yahoo.document.DocumentOperation;
 import com.yahoo.documentapi.messagebus.protocol.DocumentMessage;
@@ -53,7 +53,6 @@ public class MbusRequestContext implements RequestContext, ResponseHandler {
     public final static String internalNoThrottledSource = "internalNoThrottledSource";
     private final static String internalNoThrottledSourcePath = "/" + internalNoThrottledSource;
 
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public MbusRequestContext(MbusRequest request, ResponseHandler responseHandler,
                               ComponentRegistry<DocprocService> docprocServiceComponentRegistry,
                               ComponentRegistry<AbstractConcreteDocumentFactory> docFactoryRegistry,
@@ -61,7 +60,7 @@ public class MbusRequestContext implements RequestContext, ResponseHandler {
         this.request = request;
         this.requestMsg = (DocumentMessage)request.getMessage();
         this.responseHandler = responseHandler;
-        this.processingFactory = new ProcessingFactory(docprocServiceComponentRegistry, docFactoryRegistry,
+        this.processingFactory = new ProcessingFactory(docFactoryRegistry,
                                                        containerDocConfig, getServiceName());
         this.messageFactory = newMessageFactory(requestMsg);
     }
@@ -112,7 +111,6 @@ public class MbusRequestContext implements RequestContext, ResponseHandler {
     }
 
     @Override
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public void processingFailed(Exception exception) {
         ErrorCode errorCode;
         if (exception instanceof TransientFailureException) {
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 33cd6647ede..52f112f9b43 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
@@ -8,7 +8,6 @@ import com.yahoo.component.ComponentId;
 import com.yahoo.component.provider.ComponentRegistry;
 import com.yahoo.container.core.document.ContainerDocumentConfig;
 import com.yahoo.docproc.AbstractConcreteDocumentFactory;
-import com.yahoo.docproc.DocprocService;
 import com.yahoo.docproc.Processing;
 import com.yahoo.document.Document;
 import com.yahoo.document.DocumentOperation;
@@ -27,18 +26,13 @@ import com.yahoo.messagebus.Message;
 class ProcessingFactory {
 
     private final static Logger log = Logger.getLogger(ProcessingFactory.class.getName());
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
-    private final ComponentRegistry<DocprocService> docprocServiceComponentRegistry;
     private final ComponentRegistry<AbstractConcreteDocumentFactory> docFactoryRegistry;
     private final ContainerDocumentConfig containerDocConfig;
     private final String serviceName;
 
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
-    public ProcessingFactory(ComponentRegistry<DocprocService> docprocServiceComponentRegistry,
-                             ComponentRegistry<AbstractConcreteDocumentFactory> docFactoryRegistry,
+    public ProcessingFactory(ComponentRegistry<AbstractConcreteDocumentFactory> docFactoryRegistry,
                              ContainerDocumentConfig containerDocConfig,
                              String serviceName) {
-        this.docprocServiceComponentRegistry = docprocServiceComponentRegistry;
         this.docFactoryRegistry = docFactoryRegistry;
         this.containerDocConfig = containerDocConfig;
         this.serviceName = serviceName;
@@ -100,15 +94,11 @@ class ProcessingFactory {
         return null;
     }
 
-    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private Processing createProcessing(DocumentOperation documentOperation, Message message) {
         Processing processing = new Processing();
         processing.addDocumentOperation(documentOperation);
         processing.setServiceName(serviceName);
 
-        // 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;