Deprecate classes in com.yahoo.docproc that will be revoked from public API

29 files changed, 72 insertions, 4 deletions

diff --git a/docproc/src/main/java/com/yahoo/docproc/Call.java b/docproc/src/main/java/com/yahoo/docproc/Call.java
index c640dbcf832..bb277e5ebfe 100644
--- a/docproc/src/main/java/com/yahoo/docproc/Call.java
+++ b/docproc/src/main/java/com/yahoo/docproc/Call.java
@@ -132,6 +132,7 @@ public class Call implements Cloneable {
     }
 
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private void unwrapSchemaMapping(Processing processing) {
         final List<DocumentOperation> documentOperations = processing.getDocumentOperations();
 
diff --git a/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java b/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java
index e54d5fa2ff5..0e7a217efbe 100644
--- a/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/DocprocExecutor.java
@@ -22,7 +22,9 @@ import static java.util.stream.Collectors.groupingBy;
  * An executor executed incoming processings on its CallStack
  *
  * @author Einar M R Rosenvinge
+ * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
+@Deprecated(forRemoval = true, since = "7")
 public class DocprocExecutor {
 
     private final static String METRIC_NAME_DOCUMENTS_PROCESSED = "documents_processed";
diff --git a/docproc/src/main/java/com/yahoo/docproc/DocprocService.java b/docproc/src/main/java/com/yahoo/docproc/DocprocService.java
index 8cb78bd718f..c6956f44f52 100644
--- a/docproc/src/main/java/com/yahoo/docproc/DocprocService.java
+++ b/docproc/src/main/java/com/yahoo/docproc/DocprocService.java
@@ -29,8 +29,10 @@ import java.util.logging.Logger;
  * <p>This class is thread safe.</p>
  *
  * @author bratseth
+ * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
-//TODO: Vespa 8: This class and a lot of other in this package should not be part of PublicAPI
+@SuppressWarnings("removal") // TODO Vespa 8: remove
+@Deprecated(forRemoval = true, since = "7")
 public class DocprocService extends AbstractComponent {
 
     private static final Logger log = Logger.getLogger(DocprocService.class.getName());
diff --git a/docproc/src/main/java/com/yahoo/docproc/DocumentOperationWrapper.java b/docproc/src/main/java/com/yahoo/docproc/DocumentOperationWrapper.java
index 02d0d05b279..4530af29600 100644
--- a/docproc/src/main/java/com/yahoo/docproc/DocumentOperationWrapper.java
+++ b/docproc/src/main/java/com/yahoo/docproc/DocumentOperationWrapper.java
@@ -5,7 +5,9 @@ import com.yahoo.document.DocumentOperation;
 
 /**
  * @author Einar M R Rosenvinge
+ * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
+@Deprecated(forRemoval = true, since = "7")
 public interface DocumentOperationWrapper {
 
     DocumentOperation getWrappedDocumentOperation();
diff --git a/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java b/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java
index 877ecf52789..ae7c1358a4f 100644
--- a/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java
+++ b/docproc/src/main/java/com/yahoo/docproc/DocumentProcessor.java
@@ -42,6 +42,7 @@ import java.util.logging.Logger;
  */
 public abstract class DocumentProcessor extends ChainedComponent {
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     static Logger log = Logger.getLogger(DocprocService.class.getName());
 
     /** Schema map for doctype-fieldnames */
diff --git a/docproc/src/main/java/com/yahoo/docproc/HandledProcessingException.java b/docproc/src/main/java/com/yahoo/docproc/HandledProcessingException.java
index fc53e00a2c0..2872d53f558 100644
--- a/docproc/src/main/java/com/yahoo/docproc/HandledProcessingException.java
+++ b/docproc/src/main/java/com/yahoo/docproc/HandledProcessingException.java
@@ -6,7 +6,9 @@ package com.yahoo.docproc;
  * not stacktrace.
  *
  * @author Mathias Mølster Lidal
+ * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
+@Deprecated(forRemoval = true, since = "7")
 public class HandledProcessingException extends RuntimeException {
 
     public HandledProcessingException(String message) {
diff --git a/docproc/src/main/java/com/yahoo/docproc/Processing.java b/docproc/src/main/java/com/yahoo/docproc/Processing.java
index 616ad3c9241..3e092038e69 100644
--- a/docproc/src/main/java/com/yahoo/docproc/Processing.java
+++ b/docproc/src/main/java/com/yahoo/docproc/Processing.java
@@ -40,9 +40,11 @@ public class Processing {
     private Map<String, Object> context = null;
 
     /** The endpoint of this processing. */
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private ProcessingEndpoint endpoint = null;
 
     /** The registry of docproc services. */
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private ComponentRegistry<DocprocService> docprocServiceRegistry = null;
 
     private boolean operationsGotten = false;
@@ -77,6 +79,7 @@ public class Processing {
      * @param callStack         the document processors to call in this processing.
      * @param endp              the endpoint of this processing
      */
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     Processing(String service, DocumentOperation documentOperation, CallStack callStack, ProcessingEndpoint endp) {
         this.service = service;
         this.documentOperations = new ArrayList<>(1);
@@ -99,7 +102,8 @@ public class Processing {
         this(service, documentOperation, callStack, null);
     }
 
-    @SuppressWarnings("unused")
+    // TODO Vespa 8: remove "removal"
+    @SuppressWarnings({"unused", "removal"})
     private Processing(String service, List<DocumentOperation> documentOpsAndUpdates, CallStack callStack, ProcessingEndpoint endp, boolean unused) {
         this.service = service;
         this.documentOperations = new ArrayList<>(documentOpsAndUpdates.size());
@@ -108,6 +112,7 @@ public class Processing {
         this.endpoint = endp;
     }
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     static Processing createProcessingFromDocumentOperations(String service, List<DocumentOperation> documentOpsAndUpdates, CallStack callStack, ProcessingEndpoint endp) {
         return new Processing(service, documentOpsAndUpdates, callStack, endp, false);
     }
@@ -128,10 +133,19 @@ public class Processing {
         return new Processing(service, documentsAndUpdates, callStack, null, false);
     }
 
+    @Deprecated(forRemoval = true, since="7")
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public ComponentRegistry<DocprocService> getDocprocServiceRegistry() {
         return docprocServiceRegistry;
     }
 
+    /**
+     * @deprecated  Use GVL TBD instead
+     */
+    // TODO GVL: 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) {
         this.docprocServiceRegistry = docprocServiceRegistry;
     }
@@ -152,7 +166,11 @@ 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 GVL TBD instead
      */
+    // TODO GVL: used to getService().getDocumentTypeManager() in subclasses of DocumentProcessor
+    @Deprecated(forRemoval = true, since="7")
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public DocprocService getService() {
         if (docprocServiceRegistry != null) {
             return docprocServiceRegistry.getComponent(getServiceName());
@@ -203,6 +221,7 @@ public class Processing {
      *
      * @return the ProcessingEndpoint, or null
      */
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     ProcessingEndpoint getEndpoint() {
         return endpoint;
     }
@@ -212,6 +231,7 @@ public class Processing {
      *
      * @param endpoint the ProcessingEndpoint to use
      */
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     void setEndpoint(ProcessingEndpoint endpoint) {
         this.endpoint = endpoint;
     }
diff --git a/docproc/src/main/java/com/yahoo/docproc/ProcessingEndpoint.java b/docproc/src/main/java/com/yahoo/docproc/ProcessingEndpoint.java
index d478ad24bd7..00b0bc7c7c7 100644
--- a/docproc/src/main/java/com/yahoo/docproc/ProcessingEndpoint.java
+++ b/docproc/src/main/java/com/yahoo/docproc/ProcessingEndpoint.java
@@ -3,7 +3,9 @@ package com.yahoo.docproc;
 
 /**
  * @author Einar M R Rosenvinge
+ * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
+@Deprecated(forRemoval = true, since = "7")
 public interface ProcessingEndpoint {
 
     void processingDone(Processing processing);
diff --git a/docproc/src/main/java/com/yahoo/docproc/TransientFailureException.java b/docproc/src/main/java/com/yahoo/docproc/TransientFailureException.java
index ce165c49530..a88158cc367 100644
--- a/docproc/src/main/java/com/yahoo/docproc/TransientFailureException.java
+++ b/docproc/src/main/java/com/yahoo/docproc/TransientFailureException.java
@@ -6,7 +6,9 @@ package com.yahoo.docproc;
  * Caller is welcome to try the call again later.
  *
  * @author Einar M R Rosenvinge
+ * @deprecated  Will be removed in Vespa 8. Only for internal use.
  */
+@Deprecated(forRemoval = true, since = "7")
 public class TransientFailureException extends RuntimeException {
 
     public TransientFailureException(String s) {
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 2affcf12809..a949ec5ecf3 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingHandler.java
@@ -43,6 +43,7 @@ import static com.yahoo.component.chain.model.ChainsModelBuilder.buildFromConfig
 public class DocumentProcessingHandler extends AbstractRequestHandler {
 
     private static final Logger log = Logger.getLogger(DocumentProcessingHandler.class.getName());
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private final ComponentRegistry<DocprocService> docprocServiceRegistry;
     private final ComponentRegistry<AbstractConcreteDocumentFactory> docFactoryRegistry;
     private final ChainRegistry<DocumentProcessor> chainRegistry = new ChainRegistry<>();
@@ -51,6 +52,7 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
     private final ContainerDocumentConfig containerDocConfig;
     private final DocumentTypeManager documentTypeManager;
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private DocumentProcessingHandler(ComponentRegistry<DocprocService> docprocServiceRegistry,
                                       ComponentRegistry<DocumentProcessor> documentProcessorComponentRegistry,
                                       ComponentRegistry<AbstractConcreteDocumentFactory> docFactoryRegistry,
@@ -83,6 +85,7 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
         return (maxThreads > 0) ? maxThreads : Runtime.getRuntime().availableProcessors();
     }
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     DocumentProcessingHandler(ComponentRegistry<DocprocService> docprocServiceRegistry,
                               ComponentRegistry<DocumentProcessor> documentProcessorComponentRegistry,
                               ComponentRegistry<AbstractConcreteDocumentFactory> docFactoryRegistry,
@@ -115,11 +118,13 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
     }
 
     @Override
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     protected void destroy() {
         laterExecutor.shutdown();
         docprocServiceRegistry.allComponents().forEach(docprocService -> docprocService.deconstruct());
     }
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public ComponentRegistry<DocprocService> getDocprocServiceRegistry() {
         return docprocServiceRegistry;
     }
@@ -135,6 +140,7 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
     }
 
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private static CallStack convertToCallStack(Chain<DocumentProcessor> chain, Metric metric) {
         CallStack stack = new CallStack(chain.getId().stringValue(), metric);
         for (DocumentProcessor processor : chain.components()) {
@@ -145,6 +151,7 @@ public class DocumentProcessingHandler extends AbstractRequestHandler {
     }
 
     @Override
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public ContentChannel handleRequest(Request request, ResponseHandler handler) {
         RequestContext requestContext;
         if (request instanceof MbusRequest) {
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 655703d10ee..e629953ccff 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/DocumentProcessingTask.java
@@ -34,9 +34,11 @@ public class DocumentProcessingTask implements Runnable {
     private final DocumentProcessingHandler docprocHandler;
     private final RequestContext requestContext;
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private final DocprocService service;
     private final ThreadPoolExecutor executor;
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public DocumentProcessingTask(RequestContext requestContext, DocumentProcessingHandler docprocHandler,
                                   DocprocService service, ThreadPoolExecutor executor) {
         this.requestContext = requestContext;
@@ -65,6 +67,7 @@ public class DocumentProcessingTask implements Runnable {
                 return;
             }
 
+            @SuppressWarnings("removal") // TODO Vespa 8: remove
             DocprocExecutor executor = service.getExecutor();
             DocumentProcessor.Progress progress = process(executor);
 
@@ -88,6 +91,7 @@ public class DocumentProcessingTask implements Runnable {
      *
      * @param executor the DocprocService to use for processing
      */
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private DocumentProcessor.Progress process(DocprocExecutor executor) {
         Iterator<Processing> iterator = processings.iterator();
         List<Tuple2<DocumentProcessor.Progress, Processing>> later = new ArrayList<>();
@@ -184,6 +188,7 @@ public class DocumentProcessingTask implements Runnable {
                '}';
     }
 
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     private static void logProcessingFailure(Processing processing, Exception exception) {
         //LOGGING ONLY:
         String errorMsg = processing + " failed at " + processing.callStack().getLastPopped();
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 70d908b8e27..50d7acb4064 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
@@ -53,6 +53,7 @@ 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,
@@ -111,6 +112,7 @@ 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 a17be4de9a5..e8a2e214776 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
@@ -27,11 +27,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,
                              ContainerDocumentConfig containerDocConfig,
@@ -98,10 +100,12 @@ 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: Use TBD instead, this method will be removed
         processing.setDocprocServiceRegistry(docprocServiceComponentRegistry);
         processing.setVariable("route", message.getRoute());
         processing.setVariable("timeout", message.getTimeRemaining());
diff --git a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java
index 99317c8c8dd..d54ab012b3b 100644
--- a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java
+++ b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocument.java
@@ -42,6 +42,7 @@ import java.util.Set;
  *
  * @author Vegard Havdal
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class ProxyDocument extends Document implements DocumentOperationWrapper {
 
     private final Map<String, String> fieldMap;
diff --git a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java
index 1ff2ed74456..68af456829d 100644
--- a/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java
+++ b/docproc/src/main/java/com/yahoo/docproc/proxy/ProxyDocumentUpdate.java
@@ -18,6 +18,7 @@ import java.util.Map;
  * 
  * @author vegardh
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class ProxyDocumentUpdate extends DocumentUpdate implements DocumentOperationWrapper {
 
     private DocumentUpdate docU;
diff --git a/docproc/src/main/java/com/yahoo/docproc/util/package-info.java b/docproc/src/main/java/com/yahoo/docproc/util/package-info.java
index a2d9312550b..ae68d79bb0e 100644
--- a/docproc/src/main/java/com/yahoo/docproc/util/package-info.java
+++ b/docproc/src/main/java/com/yahoo/docproc/util/package-info.java
@@ -1,6 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 @ExportPackage
-@PublicApi
+@PublicApi  // TODO Vespa 8: revoke from public api
 package com.yahoo.docproc.util;
 
 import com.yahoo.api.annotations.PublicApi;
diff --git a/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java b/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java
index 494909fd769..6f3d332a17c 100644
--- a/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/CallbackTestCase.java
@@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author Einar M R Rosenvinge
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class CallbackTestCase {
 
     private DocumentPut put1;
diff --git a/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java b/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java
index ce0fa7e37cf..6a0d7727393 100644
--- a/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/DocumentProcessingAbstractTestCase.java
@@ -15,6 +15,7 @@ import static org.junit.Assert.assertEquals;
  *
  * @author bratseth
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public abstract class DocumentProcessingAbstractTestCase {
 
     /**
diff --git a/docproc/src/test/java/com/yahoo/docproc/EmptyProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/EmptyProcessingTestCase.java
index 763c5244b44..14a6dc3c2d5 100644
--- a/docproc/src/test/java/com/yahoo/docproc/EmptyProcessingTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/EmptyProcessingTestCase.java
@@ -4,8 +4,9 @@ package com.yahoo.docproc;
 import org.junit.Test;
 
 /**
- * @author <a href="mailto:einarmr@yahoo-inc.com">Einar M R Rosenvinge</a>
+ * @author Einar M R Rosenvinge
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class EmptyProcessingTestCase {
 
     @Test
diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java
index 8e268d6b0b0..669621bb926 100644
--- a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingTestCase.java
@@ -15,6 +15,7 @@ import static org.junit.Assert.assertEquals;
  *
  * @author bratseth
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class FailingDocumentProcessingTestCase {
 
     /**
diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java
index 5dc28ce8fe5..6293ac8e9f4 100644
--- a/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/FailingDocumentProcessingWithoutExceptionTestCase.java
@@ -16,6 +16,7 @@ import static org.junit.Assert.assertEquals;
  *
  * @author Einar M. R. Rosenvinge
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class FailingDocumentProcessingWithoutExceptionTestCase {
 
     /**
diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java
index 2e64934d3a9..4da76484c1f 100644
--- a/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/FailingPermanentlyDocumentProcessingTestCase.java
@@ -20,6 +20,7 @@ import static org.junit.Assert.assertTrue;
  *
  * @author Einar M. R. Rosenvinge
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class FailingPermanentlyDocumentProcessingTestCase {
 
     /**
diff --git a/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java
index fd88cd60fcc..c4442fadad3 100644
--- a/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/FailingWithErrorTestCase.java
@@ -15,6 +15,7 @@ import static org.junit.Assert.fail;
 /**
  * @author Einar M R Rosenvinge
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class FailingWithErrorTestCase {
 
     @Test
diff --git a/docproc/src/test/java/com/yahoo/docproc/NotAcceptingNewProcessingsTestCase.java b/docproc/src/test/java/com/yahoo/docproc/NotAcceptingNewProcessingsTestCase.java
index 6b3e373f8f3..7b1cee20d17 100644
--- a/docproc/src/test/java/com/yahoo/docproc/NotAcceptingNewProcessingsTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/NotAcceptingNewProcessingsTestCase.java
@@ -9,6 +9,7 @@ import static org.junit.Assert.fail;
 /**
  * @author Einar M R Rosenvinge
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class NotAcceptingNewProcessingsTestCase {
 
     @Test
diff --git a/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java b/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java
index 1419ec1985a..9afce98dda1 100644
--- a/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/ProcessingUpdateTestCase.java
@@ -35,6 +35,7 @@ public class ProcessingUpdateTestCase {
     private DocumentTypeManager dtm;
 
     @Test
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public void testProcessingUpdates() {
         DocumentType articleType = new DocumentType("article");
         Field bodyField = new Field("body", DataType.STRING);
diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java
index c8527158969..84d0cad7a4e 100644
--- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessingTestCase.java
@@ -20,6 +20,7 @@ public class SimpleDocumentProcessingTestCase extends DocumentProcessingAbstract
      * on some documents
      */
     @Test
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public void testSimpleProcessing() {
         // Set up service programmatically
         DocprocService service = new DocprocService("simple");
diff --git a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java
index 7d5dd11216e..e23c1d2e7fd 100644
--- a/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/SimpleDocumentProcessorTestCase.java
@@ -23,6 +23,7 @@ import static org.junit.Assert.assertTrue;
 /**
  * @author Einar M R Rosenvinge
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class SimpleDocumentProcessorTestCase {
 
     private static DocprocService setupDocprocService(SimpleDocumentProcessor processor, Metric metric) {
diff --git a/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java b/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java
index d5029afe7ec..44c0347aa1f 100644
--- a/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/TransientFailureTestCase.java
@@ -14,6 +14,7 @@ import static org.junit.Assert.assertEquals;
 /**
  * @author Einar M R Rosenvinge
  */
+@SuppressWarnings("removal") // TODO Vespa 8: remove
 public class TransientFailureTestCase {
 
     DocumentType type;
diff --git a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java
index e60cfeec155..b26c5200ea9 100644
--- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java
@@ -55,6 +55,7 @@ public abstract class DocumentProcessingHandlerTestBase {
     private final List<MbusServerProvider> serviceProviders = new ArrayList<>();
 
     @Before
+    @SuppressWarnings("removal") // TODO Vespa 8: remove
     public void createHandler() {
         documentTypeManager.register(getType());
 
@@ -71,6 +72,7 @@ public abstract class DocumentProcessingHandlerTestBase {
                                         protocol);
 
         ContainerBuilder builder = driver.parent().newContainerBuilder();
+        @SuppressWarnings("removal") // TODO Vespa 8: remove
         ComponentRegistry<DocprocService> registry = new ComponentRegistry<>();
 
         handler = new DocumentProcessingHandler(registry,