DeleteMessage Signature modification

Author: ggallotti

gxqueue/src/main/java/com/genexus/messaging/queue/Convert.java

@@ -19,7 +19,8 @@ public class Convert {
 
 	protected static SimpleQueueMessage toSimpleQueueMessage(SdtMessage msg) {
 		return new SimpleQueueMessage() {{
-			setMessageId(msg.getgxTv_SdtMessage_Messageid());
+			String id = msg.getgxTv_SdtMessage_Messageid();
+			setMessageId((id.isEmpty())? java.util.UUID.randomUUID().toString() :id);
 			setMessageBody(msg.getgxTv_SdtMessage_Messagebody());
 			setMessageHandleId(msg.getgxTv_SdtMessage_Messagehandleid());
 			if (msg.getgxTv_SdtMessage_Messageattributes() != null) {

gxqueue/src/main/java/com/genexus/messaging/queue/SimpleMessageQueue.java

@@ -115,33 +115,38 @@ public GXBaseCollection<SdtMessage> getMessages(SdtMessageOptions receiveOptions
 		return receivedMessagesResult;
 	}
 
-	public SdtMessageResult deleteMessage(String messageHandleId, GXBaseCollection<SdtMessages_Message>[] errorMessagesArr, boolean[] success) {
+	public SdtMessageResult deleteMessage(SdtMessage msg, GXBaseCollection<SdtMessages_Message>[] errorMessagesArr, boolean[] success) {
 		GXBaseCollection<SdtMessages_Message> errorMessages = errorMessagesArr[0];
 		errorMessages.clear();
 		SdtMessageResult sdtDelete = new SdtMessageResult();
+		if (msg == null || msg.getgxTv_SdtMessage_Messagehandleid().isEmpty()) {
+			sdtDelete.setgxTv_SdtMessageResult_Messagestatus(DeleteMessageResult.FAILED);
+			appendErrorMessage(errorMessages, 1, "Message HandledId property cannot be empty");
+			return sdtDelete;
+		}
+
 		try {
 			validQueue();
-			DeleteMessageResult deletedMessage = queue.deleteMessage(messageHandleId);
+			DeleteMessageResult deletedMessage = queue.deleteMessage(msg.getgxTv_SdtMessage_Messagehandleid());
 			sdtDelete.setgxTv_SdtMessageResult_Messageid(deletedMessage.getMessageId());
 			sdtDelete.setgxTv_SdtMessageResult_Servermessageid(deletedMessage.getMessageServerId());
 			sdtDelete.setgxTv_SdtMessageResult_Messagestatus(deletedMessage.getMessageDeleteStatus());
 			success[0] = true;
 		} catch (Exception ex) {
 			queueErrorMessagesSetup(ex, errorMessages);
-			logger.error(String.format("Could not delete Message '%s' from Queue ", messageHandleId), ex);
+			logger.error(String.format("Could not delete Message '%s' from Queue", msg.getgxTv_SdtMessage_Messagehandleid()), ex);
 		}
 		return sdtDelete;
 	}
 
-	public GXBaseCollection<SdtMessageResult> deleteMessages(GXSimpleCollection<String> msgHandlesToDelete, GXBaseCollection<SdtMessages_Message>[] errorMessagesArr, boolean[] success) {
+	public GXBaseCollection<SdtMessageResult> deleteMessages(GXBaseCollection<SdtMessage> msgHandlesToDelete, GXBaseCollection<SdtMessages_Message>[] errorMessagesArr, boolean[] success) {
 		GXBaseCollection<SdtMessages_Message> errorMessages = errorMessagesArr[0];
 		errorMessages.clear();
-
 		try {
 			validQueue();
 			List<String> handles = new ArrayList<>();
-			for (String hnd : msgHandlesToDelete) {
-				handles.add(hnd);
+			for (SdtMessage msg : msgHandlesToDelete) {
+				handles.add(msg.getgxTv_SdtMessage_Messagehandleid());
 			}
 			List<DeleteMessageResult> deletedMessage = queue.deleteMessages(handles);
 			success[0] = true;
@@ -155,10 +160,15 @@ public GXBaseCollection<SdtMessageResult> deleteMessages(GXSimpleCollection<Stri
 
 	protected void queueErrorMessagesSetup(Exception ex, GXBaseCollection<SdtMessages_Message> messages) {
 		if (messages != null && ex != null) {
-			StructSdtMessages_Message struct = new StructSdtMessages_Message();
-			struct.setType((byte) 1);
-			struct.setDescription(ex.getMessage());
+			appendErrorMessage(messages, 1, ex.getMessage());
 		}
 	}
 
+	private void appendErrorMessage(GXBaseCollection<SdtMessages_Message> messages, int errorType, String errMessage) {
+		SdtMessages_Message struct = new SdtMessages_Message();
+		struct.setgxTv_SdtMessages_Message_Type((byte) errorType);
+		struct.setgxTv_SdtMessages_Message_Description(errMessage);
+		messages.add(struct);
+	}
+
 }

gxqueueawssqs/src/test/java/com/genexus/messaging/queue/aws/TestQueueBase.java

@@ -93,6 +93,17 @@ public void sendMessage() {
 		Assert.assertNotEquals("", sendResult.getMessageServerId());
 	}
 
+	@Test
+	public void sendMessageWithNoId() {
+		SimpleQueueMessage msg = createMessage();
+		msg.setMessageId("");
+		SendMessageResult sendResult = queue.sendMessage(msg);
+		Assert.assertNotNull(sendResult);
+		Assert.assertEquals(SendMessageResult.SENT, sendResult.getMessageSentStatus());
+		Assert.assertNotEquals("", sendResult.getMessageId());
+		Assert.assertNotEquals("", sendResult.getMessageServerId());
+	}
+
 	/*@Test
 	public void sendMessageWithFactoryQueue() {
 		try {