From d3937b5d44a1a13dd3b895029c7dcbfe32d3d7e1 Mon Sep 17 00:00:00 2001 From: jonmv Date: Thu, 30 Nov 2023 09:47:10 +0100 Subject: Non-funcitonal changes --- .../main/java/com/yahoo/documentapi/Response.java | 4 ++-- .../messagebus/MessageBusAsyncSession.java | 23 +++++++++++----------- .../messagebus/protocol/ContentPolicy.java | 10 ++++------ .../messagebus/protocol/DocumentProtocol.java | 2 +- 4 files changed, 18 insertions(+), 21 deletions(-) (limited to 'documentapi') diff --git a/documentapi/src/main/java/com/yahoo/documentapi/Response.java b/documentapi/src/main/java/com/yahoo/documentapi/Response.java index eb759e2914a..63c9550474f 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/Response.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/Response.java @@ -105,10 +105,10 @@ public class Response { /** The operation was a success. */ SUCCESS, - /** The operation failed due to an unmet test-and-set condition. */ + /** The operation was not carried out due to an unmet test-and-set condition. */ CONDITION_FAILED, - /** The operation failed because its target document was not found. */ + /** The operation was not carried out because its target document was not found. */ NOT_FOUND, /** The operation failed because the cluster had insufficient storage to accept it. */ 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 4776804a686..2d1792442a0 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/MessageBusAsyncSession.java @@ -290,18 +290,17 @@ public class MessageBusAsyncSession implements MessageBusSession, AsyncSession { Message msg = reply.getMessage(); String err = getErrorMessage(reply); Response.Outcome outcome = toOutcome(reply); - switch (msg.getType()) { - case DocumentProtocol.MESSAGE_PUTDOCUMENT: - return new DocumentResponse(reqId, ((PutDocumentMessage)msg).getDocumentPut().getDocument(), err, outcome, reply.getTrace()); - case DocumentProtocol.MESSAGE_UPDATEDOCUMENT: - return new DocumentUpdateResponse(reqId, ((UpdateDocumentMessage)msg).getDocumentUpdate(), err, outcome, reply.getTrace()); - case DocumentProtocol.MESSAGE_REMOVEDOCUMENT: - return new DocumentIdResponse(reqId, ((RemoveDocumentMessage)msg).getDocumentId(), err, outcome, reply.getTrace()); - case DocumentProtocol.MESSAGE_GETDOCUMENT: - return new DocumentIdResponse(reqId, ((GetDocumentMessage)msg).getDocumentId(), err, outcome, reply.getTrace()); - default: - return new Response(reqId, err, outcome, reply.getTrace()); - } + return switch (msg.getType()) { + case DocumentProtocol.MESSAGE_PUTDOCUMENT -> + new DocumentResponse(reqId, ((PutDocumentMessage) msg).getDocumentPut().getDocument(), err, outcome, reply.getTrace()); + case DocumentProtocol.MESSAGE_UPDATEDOCUMENT -> + new DocumentUpdateResponse(reqId, ((UpdateDocumentMessage) msg).getDocumentUpdate(), err, outcome, reply.getTrace()); + case DocumentProtocol.MESSAGE_REMOVEDOCUMENT -> + new DocumentIdResponse(reqId, ((RemoveDocumentMessage) msg).getDocumentId(), err, outcome, reply.getTrace()); + case DocumentProtocol.MESSAGE_GETDOCUMENT -> + new DocumentIdResponse(reqId, ((GetDocumentMessage) msg).getDocumentId(), err, outcome, reply.getTrace()); + default -> new Response(reqId, err, outcome, reply.getTrace()); + }; } private static Response toSuccess(Reply reply, long reqId) { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ContentPolicy.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ContentPolicy.java index 03932d1b69e..5af78d97509 100644 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ContentPolicy.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/ContentPolicy.java @@ -595,13 +595,11 @@ public class ContentPolicy extends SlobrokPolicy { return !reply.hasErrors(); // For simplicity, count any reply with > 1 error. } var error = reply.getError(0); - switch (error.getCode()) { + return switch (error.getCode()) { // TODO this feels like a layering violation, but we use DocumentProtocol directly in other places in this policy anyway... - case DocumentProtocol.ERROR_TEST_AND_SET_CONDITION_FAILED: - case DocumentProtocol.ERROR_BUSY: - return false; - default: return true; - } + case DocumentProtocol.ERROR_TEST_AND_SET_CONDITION_FAILED, DocumentProtocol.ERROR_BUSY -> false; + default -> true; + }; } void handleErrorReply(Reply reply, Object untypedContext) { diff --git a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java index b53446e9d39..ec49a0c570f 100755 --- a/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java +++ b/documentapi/src/main/java/com/yahoo/documentapi/messagebus/protocol/DocumentProtocol.java @@ -157,7 +157,7 @@ public class DocumentProtocol implements Protocol { /** We failed accessing the disk, which we think is a disk hardware problem. */ public static final int ERROR_DISK_FAILURE = ErrorCode.APP_TRANSIENT_ERROR + 1007; - /** We failed during an IO operation, we dont think is a specific disk hardware problem. */ + /** We failed during an IO operation, we don't think is a specific disk hardware problem. */ public static final int ERROR_IO_FAILURE = ErrorCode.APP_TRANSIENT_ERROR + 1008; /** -- cgit v1.2.3