diff options
8 files changed, 0 insertions, 301 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 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(); diff --git a/documentapi/abi-spec.json b/documentapi/abi-spec.json index 58d91e427cf..5fe2121e5d6 100644 --- a/documentapi/abi-spec.json +++ b/documentapi/abi-spec.json @@ -37,20 +37,14 @@ ], "methods": [ "public abstract com.yahoo.documentapi.Result put(com.yahoo.document.Document)", - "public com.yahoo.documentapi.Result put(com.yahoo.document.Document, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public com.yahoo.documentapi.Result put(com.yahoo.document.DocumentPut)", - "public com.yahoo.documentapi.Result put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public com.yahoo.documentapi.Result put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.DocumentOperationParameters)", "public abstract com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId)", - "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, boolean, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", - "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, com.yahoo.documentapi.DocumentOperationParameters)", "public abstract com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId)", - "public com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId, com.yahoo.documentapi.DocumentOperationParameters)", "public com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentRemove, com.yahoo.documentapi.DocumentOperationParameters)", "public abstract com.yahoo.documentapi.Result update(com.yahoo.document.DocumentUpdate)", - "public com.yahoo.documentapi.Result update(com.yahoo.document.DocumentUpdate, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public com.yahoo.documentapi.Result update(com.yahoo.document.DocumentUpdate, com.yahoo.documentapi.DocumentOperationParameters)", "public abstract double getCurrentWindowSize()" ], @@ -588,18 +582,13 @@ ], "methods": [ "public abstract void put(com.yahoo.document.DocumentPut)", - "public void put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public void put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.DocumentOperationParameters)", "public com.yahoo.document.Document get(com.yahoo.document.DocumentId)", - "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public abstract com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.time.Duration)", - "public abstract com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority, java.time.Duration)", "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, com.yahoo.documentapi.DocumentOperationParameters, java.time.Duration)", "public abstract boolean remove(com.yahoo.document.DocumentRemove)", - "public abstract boolean remove(com.yahoo.document.DocumentRemove, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public boolean remove(com.yahoo.document.DocumentRemove, com.yahoo.documentapi.DocumentOperationParameters)", "public abstract boolean update(com.yahoo.document.DocumentUpdate)", - "public abstract boolean update(com.yahoo.document.DocumentUpdate, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public boolean update(com.yahoo.document.DocumentUpdate, com.yahoo.documentapi.DocumentOperationParameters)" ], "fields": [] @@ -1030,13 +1019,9 @@ "methods": [ "public void <init>(com.yahoo.documentapi.local.LocalDocumentAccess)", "public void put(com.yahoo.document.DocumentPut)", - "public void put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.time.Duration)", - "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority, java.time.Duration)", "public boolean remove(com.yahoo.document.DocumentRemove)", - "public boolean remove(com.yahoo.document.DocumentRemove, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public boolean update(com.yahoo.document.DocumentUpdate)", - "public boolean update(com.yahoo.document.DocumentUpdate, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public com.yahoo.documentapi.Response getNext()", "public com.yahoo.documentapi.Response getNext(int)", "public void destroy()" @@ -1078,7 +1063,6 @@ "public com.yahoo.documentapi.Result put(com.yahoo.document.Document)", "public com.yahoo.documentapi.Result put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.DocumentOperationParameters)", "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId)", - "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, boolean, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public com.yahoo.documentapi.Result get(com.yahoo.document.DocumentId, com.yahoo.documentapi.DocumentOperationParameters)", "public com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentId)", "public com.yahoo.documentapi.Result remove(com.yahoo.document.DocumentRemove, com.yahoo.documentapi.DocumentOperationParameters)", @@ -1185,16 +1169,12 @@ "public void destroy()", "public com.yahoo.messagebus.Reply syncSend(com.yahoo.messagebus.Message)", "public void put(com.yahoo.document.DocumentPut)", - "public void put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public void put(com.yahoo.document.DocumentPut, com.yahoo.documentapi.DocumentOperationParameters)", "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.time.Duration)", - "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, java.lang.String, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority, java.time.Duration)", "public com.yahoo.document.Document get(com.yahoo.document.DocumentId, com.yahoo.documentapi.DocumentOperationParameters, java.time.Duration)", "public boolean remove(com.yahoo.document.DocumentRemove)", - "public boolean remove(com.yahoo.document.DocumentRemove, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public boolean remove(com.yahoo.document.DocumentRemove, com.yahoo.documentapi.DocumentOperationParameters)", "public boolean update(com.yahoo.document.DocumentUpdate)", - "public boolean update(com.yahoo.document.DocumentUpdate, com.yahoo.documentapi.messagebus.protocol.DocumentProtocol$Priority)", "public boolean update(com.yahoo.document.DocumentUpdate, com.yahoo.documentapi.DocumentOperationParameters)", "public java.lang.String getRoute()", "public void setRoute(java.lang.String)", diff --git a/documentapi/src/main/java/com/yahoo/documentapi/AsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/AsyncSession.java index 5a63a403de3..c297b61fc91 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/AsyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/AsyncSession.java @@ -37,25 +37,6 @@ public interface AsyncSession extends Session { Result put(Document document); /** - * <p>Puts a document. This method returns immediately.</p> - * - * <p>If this result is a success, this - * call will cause one or more {@link DocumentResponse} objects to appear within the timeout time of this session. - * The response returned later will either be a success, or contain the document submitted here. - * If it was not a success, this method has no further effects.</p> - * - * @param document the Document to put - * @param priority the priority with which to send the operation - * @return the synchronous result of this operation - * @deprecated specifying explicit operation priority is deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - default Result put(Document document, DocumentProtocol.Priority priority) { - return put(new DocumentPut(document), parameters().withPriority(priority)); - } - - /** * <p>Puts a document, with optional conditions on the operation. This method returns immediately.</p> * * <p>If this result is a success, this @@ -79,25 +60,6 @@ public interface AsyncSession extends Session { * If it was not a success, this method has no further effects.</p> * * @param documentPut the DocumentPut to perform - * @param priority the priority with which to send the operation - * @return the synchronous result of this operation - * @deprecated specifying explicit operation priority is deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - default Result put(DocumentPut documentPut, DocumentProtocol.Priority priority) { - return put(documentPut, parameters().withPriority(priority)); - } - - /** - * <p>Puts a document, with optional conditions on the operation. This method returns immediately.</p> - * - * <p>If this result is a success, this - * call will cause one or more {@link DocumentResponse} objects to appear within the timeout time of this session. - * The response returned later will either be a success, or contain the document submitted here. - * If it was not a success, this method has no further effects.</p> - * - * @param documentPut the DocumentPut to perform * @param parameters parameters for the operation * @return the synchronous result of this operation */ @@ -128,45 +90,6 @@ public interface AsyncSession extends Session { * If it was not a success, this method has no further effects.</p> * * @param id the id of the document to get - * @param priority The priority with which to perform this operation. - * @return the synchronous result of this operation - * @throws UnsupportedOperationException if this access implementation does not support retrieving - * @deprecated The 'headersonly' flag has no effect. Specifying explicit operation priority is deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - default Result get(DocumentId id, boolean headersOnly, DocumentProtocol.Priority priority) { - return get(id); - } - - /** - * <p>Gets a document. This method returns immediately.</p> - * - * <p>If this result is a success, this - * call will cause one or more {@link DocumentResponse} objects to appear within the timeout time of this session. - * The response returned later will contain the requested document if it is a success. - * If it was not a success, this method has no further effects.</p> - * - * @param id the id of the document to get - * @param priority The priority with which to perform this operation. - * @return the synchronous result of this operation - * @throws UnsupportedOperationException if this access implementation does not support retrieving - * @deprecated specifying explicit operation priority is deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - default Result get(DocumentId id, DocumentProtocol.Priority priority) { - return get(id, parameters().withPriority(priority)); - } - - /** - * <p>Gets a document. This method returns immediately.</p> - * - * <p>If this result is a success, this - * call will cause one or more {@link DocumentResponse} objects to appear within the timeout time of this session. - * The response returned later will contain the requested document if it is a success. - * If it was not a success, this method has no further effects.</p> - * - * @param id the id of the document to get * @param parameters parameters for the operation * @return the synchronous result of this operation * @throws UnsupportedOperationException if this access implementation does not support retrieving @@ -194,26 +117,6 @@ public interface AsyncSession extends Session { * <p>Removes a document if it is present. This method returns immediately.</p> * * <p>If this result is a success, this - * call will cause one or more {@link DocumentIdResponse} objects to apprear within the timeout time of this session. - * The response returned later will either be a success, or contain the document id submitted here. - * If it was not a success, this method has no further effects.</p> - * - * @param id the id of the document to remove - * @param priority The priority with which to perform this operation. - * @return the synchronous result of this operation - * @throws UnsupportedOperationException if this access implementation does not support removal - * @deprecated specifying explicit operation priority is deprecated. Use methods without priority parameter. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - default Result remove(DocumentId id, DocumentProtocol.Priority priority) { - return remove(id, parameters().withPriority(priority)); - } - - /** - * <p>Removes a document if it is present. This method returns immediately.</p> - * - * <p>If this result is a success, this * call will cause one or more {@link DocumentIdResponse} objects to appear within the timeout time of this session. * The response returned later will either be a success, or contain the document id submitted here. * If it was not a success, this method has no further effects.</p> @@ -267,26 +170,6 @@ public interface AsyncSession extends Session { * If it was not a success, this method has no further effects.</p> * * @param update the updates to perform - * @param priority The priority with which to perform this operation. - * @return the synchronous result of this operation - * @throws UnsupportedOperationException if this access implementation does not support update - * @deprecated specifying explicit operation priority is deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - default Result update(DocumentUpdate update, DocumentProtocol.Priority priority) { - return update(update, parameters().withPriority(priority)); - } - - /** - * <p>Updates a document. This method returns immediately.</p> - * - * <p>If this result is a success, this - * call will cause one or more {@link DocumentUpdateResponse} within the timeout time of this session. - * The returned response returned later will either be a success or contain the update submitted here. - * If it was not a success, this method has no further effects.</p> - * - * @param update the updates to perform * @param parameters parameters for the operation * @return the synchronous result of this operation * @throws UnsupportedOperationException if this access implementation does not support update diff --git a/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java index 02a1634f8ec..01d67c8e1d9 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/SyncSession.java @@ -34,19 +34,6 @@ public interface SyncSession extends Session { * Puts a document. When this method returns, the document is safely received. * * @param documentPut the DocumentPut operation - * @param priority the priority with which to perform this operation - * @deprecated specifying explicit operation priority is deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - default void put(DocumentPut documentPut, DocumentProtocol.Priority priority) { - put(documentPut, parameters().withPriority(priority)); - } - - /** - * Puts a document. When this method returns, the document is safely received. - * - * @param documentPut the DocumentPut operation * @param parameters parameters for the operation */ default void put(DocumentPut documentPut, DocumentOperationParameters parameters) { @@ -63,22 +50,6 @@ public interface SyncSession extends Session { default Document get(DocumentId id) { return get(id, null); } /** - * Gets a document with an unspecified timeout - * - * @param id the id of the document to get - * @param fieldSet a comma-separated list of fields to retrieve - * @param priority the priority with which to perform this operation - * @return the document with this id, or null if there is none - * @throws UnsupportedOperationException thrown if this does not support retrieving - * @deprecated specifying explicit operation priority is deprecated. Set fieldSet via - * {@link #get(DocumentId, DocumentOperationParameters, Duration)} instead. - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - default Document get(DocumentId id, String fieldSet, DocumentProtocol.Priority priority) { - return get(id, fieldSet, priority, null); - } - - /** * Gets a document with timeout. * * @param id the id of the document to get @@ -93,21 +64,6 @@ public interface SyncSession extends Session { * Gets a document with timeout. * * @param id the id of the document to get - * @param fieldSet a comma-separated list of fields to retrieve - * @param priority the priority with which to perform this operation - * @param timeout timeout. If timeout is null, an unspecified default will be used - * @return the known document having this id, or null if there is no document having this id - * @throws UnsupportedOperationException thrown if this access does not support retrieving - * @throws DocumentAccessException on any messagebus error, including timeout ({@link com.yahoo.messagebus.ErrorCode#TIMEOUT}) - * @deprecated specifying explicit operation priority is deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - Document get(DocumentId id, String fieldSet, DocumentProtocol.Priority priority, Duration timeout); - - /** - * Gets a document with timeout. - * - * @param id the id of the document to get * @param parameters parameters for the operation * @param timeout timeout. If timeout is null, an unspecified default will be used * @return the known document having this id, or null if there is no document having this id @@ -130,18 +86,6 @@ public interface SyncSession extends Session { * Removes a document if it is present. * * @param documentRemove document remove operation - * @param priority the priority with which to perform this operation - * @return true if the document with this id was removed, false otherwise. - * @throws UnsupportedOperationException thrown if this access does not support removal - * @deprecated specifying explicit operation priority is deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - boolean remove(DocumentRemove documentRemove, DocumentProtocol.Priority priority); - - /** - * Removes a document if it is present. - * - * @param documentRemove document remove operation * @param parameters parameters for the operation * @return true if the document with this id was removed, false otherwise. * @throws UnsupportedOperationException thrown if this access does not support removal @@ -166,21 +110,6 @@ public interface SyncSession extends Session { * Updates a document. * * @param update the updates to perform. - * @param priority the priority with which to perform this operation - * @return false if the updates could not be applied as the document does not exist and - * {@link DocumentUpdate#setCreateIfNonExistent(boolean) create-if-non-existent} is not set. - * @throws DocumentAccessException on update error, including but not limited to: 1. timeouts, - * 2. the document exists but the {@link DocumentUpdate#setCondition(TestAndSetCondition) condition} - * is not met. - * @deprecated specifying explicit operation priority is deprecated - */ - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - boolean update(DocumentUpdate update, DocumentProtocol.Priority priority); - - /** - * Updates a document. - * - * @param update the updates to perform. * @param parameters parameters for the operation * @return false if the updates could not be applied as the document does not exist and * {@link DocumentUpdate#setCreateIfNonExistent(boolean) create-if-non-existent} is not set. diff --git a/documentapi/src/main/java/com/yahoo/documentapi/local/LocalSyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/local/LocalSyncSession.java index e4f615b7d63..62ad3a34a74 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/local/LocalSyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/local/LocalSyncSession.java @@ -33,25 +33,11 @@ public class LocalSyncSession implements SyncSession { } @Override - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public void put(DocumentPut documentPut, DocumentProtocol.Priority priority) { - access.documents.put(documentPut.getId(), documentPut.getDocument()); - } - - @Override public Document get(DocumentId id, Duration timeout) { return access.documents.get(id); } @Override - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public Document get(DocumentId id, String fieldSet, DocumentProtocol.Priority priority, Duration timeout) { - return access.documents.get(id); - } - - @Override public boolean remove(DocumentRemove documentRemove) { if (documentRemove.getCondition().isPresent()) { throw new UnsupportedOperationException("test-and-set is not supported."); @@ -61,13 +47,6 @@ public class LocalSyncSession implements SyncSession { } @Override - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public boolean remove(DocumentRemove documentRemove, DocumentProtocol.Priority priority) { - return remove(documentRemove); - } - - @Override public boolean update(DocumentUpdate update) { Document document = access.documents.get(update.getId()); if (document == null) { @@ -78,18 +57,6 @@ public class LocalSyncSession implements SyncSession { } @Override - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public boolean update(DocumentUpdate update, DocumentProtocol.Priority pri) { - Document document = access.documents.get(update.getId()); - if (document == null) { - return false; - } - update.applyTo(document); - return true; - } - - @Override public Response getNext() { throw new UnsupportedOperationException("Queue not supported."); } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java index 8809e05caf3..a4444d9fd50 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java @@ -110,10 +110,8 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { } @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public Result put(DocumentPut documentPut, DocumentOperationParameters parameters) { PutDocumentMessage msg = new PutDocumentMessage(documentPut); - msg.setPriority(parameters.priority().orElse(DocumentProtocol.Priority.NORMAL_3)); return send(msg, parameters); } @@ -123,18 +121,9 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { } @Override - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public Result get(DocumentId id, boolean headersOnly, DocumentProtocol.Priority pri) { - return get(id, pri); - } - - @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public Result get(DocumentId id, DocumentOperationParameters parameters) { // TODO Vespa 8: change to DocumentOnly.NAME GetDocumentMessage msg = new GetDocumentMessage(id, parameters.fieldSet().orElse(AllFields.NAME)); - msg.setPriority(parameters.priority().orElse(DocumentProtocol.Priority.NORMAL_1)); return send(msg, parameters); } @@ -144,10 +133,8 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { } @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public Result remove(DocumentRemove remove, DocumentOperationParameters parameters) { RemoveDocumentMessage msg = new RemoveDocumentMessage(remove); - msg.setPriority(parameters.priority().orElse(DocumentProtocol.Priority.NORMAL_2)); return send(msg, parameters); } @@ -157,10 +144,8 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { } @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public Result update(DocumentUpdate update, DocumentOperationParameters parameters) { UpdateDocumentMessage msg = new UpdateDocumentMessage(update); - msg.setPriority(parameters.priority().orElse(DocumentProtocol.Priority.NORMAL_2)); return send(msg, parameters); } diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java index 1b0a6db3d53..809d43bbb4d 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusSyncSession.java @@ -126,17 +126,8 @@ public class MessageBusSyncSession implements MessageBusSession, SyncSession, Re } @Override - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public void put(DocumentPut documentPut, DocumentProtocol.Priority priority) { - put(documentPut, parameters().withPriority(priority)); - } - - @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public void put(DocumentPut documentPut, DocumentOperationParameters parameters) { PutDocumentMessage msg = new PutDocumentMessage(documentPut); - msg.setPriority(parameters.priority().orElse(DocumentProtocol.Priority.NORMAL_3)); Reply reply = syncSend(msg, parameters); if (reply.hasErrors()) { throw new DocumentAccessException(MessageBusAsyncSession.getErrorMessage(reply), reply.getErrorCodes()); @@ -149,18 +140,9 @@ public class MessageBusSyncSession implements MessageBusSession, SyncSession, Re } @Override - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public Document get(DocumentId id, String fieldSet, DocumentProtocol.Priority pri, Duration timeout) { - return get(id, parameters().withFieldSet(fieldSet).withPriority(pri), timeout); - } - - @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public Document get(DocumentId id, DocumentOperationParameters parameters, Duration timeout) { // TODO Vespa 8: change to DocumentOnly.NAME GetDocumentMessage msg = new GetDocumentMessage(id, parameters.fieldSet().orElse(AllFields.NAME)); - msg.setPriority(parameters.priority().orElse(DocumentProtocol.Priority.NORMAL_1)); Reply reply = syncSend(msg, timeout != null ? timeout : defaultTimeout, parameters); if (reply.hasErrors()) { @@ -183,17 +165,8 @@ public class MessageBusSyncSession implements MessageBusSession, SyncSession, Re } @Override - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public boolean remove(DocumentRemove documentRemove, DocumentProtocol.Priority pri) { - return remove(documentRemove, parameters().withPriority(pri)); - } - - @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public boolean remove(DocumentRemove documentRemove, DocumentOperationParameters parameters) { RemoveDocumentMessage msg = new RemoveDocumentMessage(documentRemove.getId()); - msg.setPriority(parameters.priority().orElse(DocumentProtocol.Priority.NORMAL_2)); msg.setCondition(documentRemove.getCondition()); Reply reply = syncSend(msg, parameters); if (reply.hasErrors()) { @@ -211,17 +184,8 @@ public class MessageBusSyncSession implements MessageBusSession, SyncSession, Re } @Override - @Deprecated(forRemoval = true) // TODO: Remove on Vespa 8 - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 - public boolean update(DocumentUpdate update, DocumentProtocol.Priority pri) { - return update(update, parameters().withPriority(pri)); - } - - @Override - @SuppressWarnings("removal") // TODO: Remove on Vespa 8 public boolean update(DocumentUpdate update, DocumentOperationParameters parameters) { UpdateDocumentMessage msg = new UpdateDocumentMessage(update); - msg.setPriority(parameters.priority().orElse(DocumentProtocol.Priority.NORMAL_2)); Reply reply = syncSend(msg, parameters); if (reply.hasErrors()) { throw new DocumentAccessException(MessageBusAsyncSession.getErrorMessage(reply), reply.getErrorCodes()); |