Bump full removal of priorities to Vespa 9

Streaming search still uses this to ensure low latencies, and
we don't have a replacement for priorities for this use case yet.

4 files changed, 10 insertions, 10 deletions

diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
index b50164aefc0..6aa0a6b9e57 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSession.java
@@ -660,7 +660,7 @@ public class MessageBusVisitorSession implements VisitorSession {
             msg.setParameters(params.getLibraryParameters());
             msg.setRoute(params.getRoute());
             msg.setMaxBucketsPerVisitor(params.getMaxBucketsPerVisitor());
-            msg.setPriority(params.getPriority()); // TODO: remove on Vespa 8
+            msg.setPriority(params.getPriority()); // TODO: remove on Vespa 9
 
             msg.setRetryEnabled(false);
 
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java
index d04a5db3974..4ad017a1a83 100755
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentMessage.java
@@ -45,7 +45,7 @@ public abstract class DocumentMessage extends Message {
      * @return The priority.
      * @deprecated explicit operation priority is deprecated
      */
-    @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8
+    @Deprecated(forRemoval = true) // TODO: Remove on Vespa 9
     public DocumentProtocol.Priority getPriority() { return priority; }
 
     /**
@@ -54,14 +54,14 @@ public abstract class DocumentMessage extends Message {
      * @param priority The priority to set.
      * @deprecated specifying explicit operation priority is deprecated
      */
-    @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8
+    @Deprecated(forRemoval = true) // TODO: Remove on Vespa 9
     public void setPriority(DocumentProtocol.Priority priority) {
         this.priority = priority;
     }
 
     @Override
     public int getApproxSize() {
-        return 4 + 1; // type + priority // TODO update on Vespa 8 to not include deprecated fields
+        return 4 + 1; // type + priority // TODO update on Vespa 9 to not include deprecated fields
     }
 
     @Override
diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
index 158ccc417c7..05c686694b4 100644
--- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
+++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/RoutableFactories60.java
@@ -60,7 +60,7 @@ public abstract class RoutableFactories60 {
          */
         protected abstract DocumentMessage doDecode(DocumentDeserializer deserializer);
 
-        @SuppressWarnings("removal") // TODO: Remove on Vespa 8
+        @SuppressWarnings("removal") // TODO: Remove on Vespa 9
         public boolean encode(Routable obj, DocumentSerializer out) {
             if (!(obj instanceof DocumentMessage)) {
                 throw new AssertionError(
@@ -68,14 +68,14 @@ public abstract class RoutableFactories60 {
                         "routable type " + obj.getType() + "(" + obj.getClass().getName() + ").");
             }
             DocumentMessage msg = (DocumentMessage)obj;
-            out.putByte(null, (byte)(msg.getPriority().getValue())); // TODO: encode default value on Vespa 8
+            out.putByte(null, (byte)(msg.getPriority().getValue())); // TODO: encode default value on Vespa 9
             out.putInt(null, 0); // Ignored load type. 0 is legacy "default" load type ID.
             return doEncode(msg, out);
         }
 
-        @SuppressWarnings("removal") // TODO: Remove on Vespa 8
+        @SuppressWarnings("removal") // TODO: Remove on Vespa 9
         public Routable decode(DocumentDeserializer in) {
-            byte pri = in.getByte(null); // TODO: ignore on Vespa 8
+            byte pri = in.getByte(null); // TODO: ignore on Vespa 9
             in.getInt(null); // Ignored load type
             DocumentMessage msg = doDecode(in);
             if (msg != null) {
diff --git a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
index 94499ce8230..874bad6034a 100755
--- a/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
+++ b/documentapi/src/test/java/com/yahoo/documentapi/messagebus/MessageBusVisitorSessionTestCase.java
@@ -476,7 +476,7 @@ public class MessageBusVisitorSessionTestCase {
         return params;
     }
 
-    @SuppressWarnings("removal") // TODO: Remove on Vespa 8
+    @SuppressWarnings("removal") // TODO: Remove on Vespa 9
     private String createVisitorToString(CreateVisitorMessage msg) {
         StringBuilder sb = new StringBuilder();
         sb.append("CreateVisitorMessage(buckets=[\n");
@@ -523,7 +523,7 @@ public class MessageBusVisitorSessionTestCase {
         if (msg.getMaxBucketsPerVisitor() != 1) {
             sb.append("max buckets per visitor=").append(msg.getMaxBucketsPerVisitor()).append("\n");
         }
-        if (msg.getPriority() != DocumentProtocol.Priority.NORMAL_3) { // TODO: remove on Vespa 8
+        if (msg.getPriority() != DocumentProtocol.Priority.NORMAL_3) { // TODO: remove on Vespa 9
             sb.append("priority=").append(msg.getPriority()).append("\n");
         }
         if (!"DumpVisitor".equals(msg.getLibraryName())) {