From 81f466444ec20a852f010624ea6fa07e50fa3e2b Mon Sep 17 00:00:00 2001 From: Tor Brede Vekterli Date: Thu, 19 May 2022 11:50:17 +0200 Subject: Remove explicit operation priority from DocumentAPI session public APIs --- .../java/com/yahoo/docproc/jdisc/messagebus/MessageFactory.java | 7 ------- .../com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java | 2 -- 2 files changed, 9 deletions(-) (limited to 'docproc/src') 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 c8a4b127c4e..013f75c317c 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 @@ -20,30 +20,23 @@ import java.util.logging.Logger; /** * @author Einar M R Rosenvinge */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 class MessageFactory { private final static Logger log = Logger.getLogger(MessageFactory.class.getName()); private final Message requestMsg; - private final DocumentProtocol.Priority priority; // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public MessageFactory(DocumentMessage requestMsg) { this.requestMsg = requestMsg; - 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.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() + // TODO: Remove on Vespa 8 "', trace level = '" + message.getTrace().getLevel() + "', time remaining = '" + message.getTimeRemaining() + "'."); return message; 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 ad8e05c7d88..5e07b26accd 100644 --- a/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java +++ b/docproc/src/test/java/com/yahoo/docproc/jdisc/DocumentProcessingHandlerTestBase.java @@ -132,10 +132,8 @@ 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); // TODO: Remove on Vespa 8 msg.getTrace().setLevel(9); msg.setTimeRemaining(60 * 1000); return driver.client().sendMessage(msg).isAccepted(); -- cgit v1.2.3