diff options
7 files changed, 19 insertions, 19 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())) { diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java index f0f36b06f8b..91e3b5205c1 100644 --- a/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java +++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java @@ -24,7 +24,7 @@ import java.util.Iterator; * * @author bjorncs */ -@SuppressWarnings("removal") // TODO: Remove on Vespa 8 +@SuppressWarnings("removal") // TODO: Remove on Vespa 9 public class DocumentRetriever { private final ClusterList clusterList; @@ -128,7 +128,7 @@ public class DocumentRetriever { private Message createDocumentRequest(String docid) { GetDocumentMessage msg = new GetDocumentMessage(new DocumentId(docid), params.fieldSet); - msg.setPriority(params.priority); // TODO: Remove on Vespa 8 + msg.setPriority(params.priority); // TODO: Remove on Vespa 9 msg.setRetryEnabled(!params.noRetry); return msg; } diff --git a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java index 7f529fb5b86..d6e55a26a39 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespafeeder/VespaFeederTestCase.java @@ -56,7 +56,7 @@ public class VespaFeederTestCase { assertTrue(arguments.isVerbose()); assertFalse(config.createifnonexistent()); - assertEquals("LOW_1", arguments.getPriority()); + assertEquals("LOW_1", arguments.getPriority()); // TODO remove on Vespa 9 assertEquals("benchmark", arguments.getMode()); assertEquals("foo.xml", arguments.getFiles().get(0)); assertEquals("bar.xml", arguments.getFiles().get(1)); @@ -152,14 +152,14 @@ public class VespaFeederTestCase { } @Test - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 + @SuppressWarnings("removal") // TODO: Remove on Vespa 9 public void feedFile() throws Exception { FeedFixture f = new FeedFixture(); Arguments arguments = new Arguments("--file src/test/files/myfeed.xml --priority LOW_1".split(" "), f.sessionFactory); new VespaFeeder(arguments, f.typeManager).parseFiles(System.in, f.printStream); assertEquals(3, f.sessionFactory.messages.size()); - assertEquals(DocumentProtocol.Priority.LOW_1, ((PutDocumentMessage)f.sessionFactory.messages.get(0)).getPriority()); // TODO: Remove on Vespa 8 + assertEquals(DocumentProtocol.Priority.LOW_1, ((PutDocumentMessage)f.sessionFactory.messages.get(0)).getPriority()); // TODO: Remove on Vespa 9 assertEquals("id:test:news::foo", ((PutDocumentMessage) f.sessionFactory.messages.get(0)).getDocumentPut().getDocument().getId().toString()); DocumentUpdate update = ((UpdateDocumentMessage) f.sessionFactory.messages.get(1)).getDocumentUpdate(); assertEquals("id:test:news::foo", update.getId().toString()); @@ -176,10 +176,10 @@ public class VespaFeederTestCase { assertJsonFeedState(feedFixture); } - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 + @SuppressWarnings("removal") // TODO: Remove on Vespa 9 protected void assertJsonFeedState(FeedFixture feedFixture) { assertEquals(3, feedFixture.sessionFactory.messages.size()); - assertEquals(DocumentProtocol.Priority.LOW_1, ((PutDocumentMessage)feedFixture.sessionFactory.messages.get(0)).getPriority()); // TODO: Remove on Vespa 8 + assertEquals(DocumentProtocol.Priority.LOW_1, ((PutDocumentMessage)feedFixture.sessionFactory.messages.get(0)).getPriority()); // TODO: Remove on Vespa 9 assertEquals("id:test:news::foo", ((PutDocumentMessage) feedFixture.sessionFactory.messages.get(0)).getDocumentPut().getDocument().getId().toString()); DocumentUpdate update = ((UpdateDocumentMessage) feedFixture.sessionFactory.messages.get(1)).getDocumentUpdate(); assertEquals("id:test:news::foo", update.getId().toString()); diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java index 5ded5ff524b..ce555e2c0f5 100644 --- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java +++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java @@ -130,7 +130,7 @@ public class DocumentRetrieverTest { } @Test - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 + @SuppressWarnings("removal") // TODO: Remove on Vespa 9 public void testSendSingleMessage() throws DocumentRetrieverException { ClientParameters params = createParameters() .setDocumentIds(asIterator(DOC_ID_1)) @@ -147,7 +147,7 @@ public class DocumentRetrieverTest { documentRetriever.retrieveDocuments(); verify(mockedSession, times(1)).syncSend(argThat((ArgumentMatcher<GetDocumentMessage>) o -> - o.getPriority().equals(DocumentProtocol.Priority.HIGH_1) && + o.getPriority().equals(DocumentProtocol.Priority.HIGH_1) && // TODO remove on Vespa 9 !o.getRetryEnabled())); assertContainsDocument(DOC_ID_1); } |