Merge pull request #21942 from vespa-engine/vekterli/deprecate-document-api-pri-methods

Deprecate DocumentAPI methods using explicit operation priority [run-systemtest]

2 files changed, 7 insertions, 4 deletions

diff --git a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java
index 1959ae8f339..4668942b61e 100644
--- a/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java
+++ b/docproc/src/main/java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java
@@ -28,23 +28,25 @@ class MessageFactory {
     private final LoadType loadType;
     private final DocumentProtocol.Priority priority;
 
+    @SuppressWarnings("removal") // TODO: Remove on Vespa 8
     public MessageFactory(DocumentMessage requestMsg) {
         this.requestMsg = requestMsg;
         loadType = requestMsg.getLoadType();
-        priority = requestMsg.getPriority();
+        priority = requestMsg.getPriority(); // TODO: Remove on Vespa 8
     }
 
+    @SuppressWarnings("removal") // TODO: Remove on Vespa 8
     public DocumentMessage fromDocumentOperation(Processing processing, DocumentOperation documentOperation) {
         DocumentMessage message = newMessage(documentOperation);
         message.setLoadType(loadType);
-        message.setPriority(priority);
+        message.setPriority(priority); // TODO: Remove on Vespa 8
         message.setRoute(requestMsg.getRoute());
         message.setTimeReceivedNow();
         message.setTimeRemaining(requestMsg.getTimeRemainingNow());
         message.getTrace().setLevel(requestMsg.getTrace().getLevel());
         log.log(Level.FINE, () -> "Created '" + message.getClass().getName() +
                                   "', route = '" + message.getRoute() +
-                                  "', priority = '" + message.getPriority().name() +
+                                  "', priority = '" + message.getPriority().name() + // TODO: Remove on Vespa 8
                                   "', load type = '" + message.getLoadType() +
                                   "', trace level = '" + message.getTrace().getLevel() +
                                   "', time remaining = '" + message.getTimeRemaining() + "'.");
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 b26c5200ea9..de5cbfa505b 100644
--- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java
+++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java
@@ -135,9 +135,10 @@ public abstract class DocumentProcessingHandlerTestBase {
 
     protected abstract DocumentType getType();
 
+    @SuppressWarnings("removal") // TODO: Remove on Vespa 8
     public boolean sendMessage(String destinationChainName, DocumentMessage msg) {
         msg.setRoute(Route.parse("test/chain." + destinationChainName + " " + remoteServer.connectionSpec()));
-        msg.setPriority(DocumentProtocol.Priority.HIGH_1);
+        msg.setPriority(DocumentProtocol.Priority.HIGH_1); // TODO: Remove on Vespa 8
         msg.setLoadType(LoadType.DEFAULT);
         msg.getTrace().setLevel(9);
         msg.setTimeRemaining(60 * 1000);