diff --git a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsWorker.java b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsWorker.java index 9ee19294a9..4a1beecf61 100644 --- a/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsWorker.java +++ b/data-prepper-plugins/s3-source/src/main/java/org/opensearch/dataprepper/plugins/source/SqsWorker.java @@ -269,6 +269,9 @@ private Optional processS3Object( } private void deleteSqsMessages(final List deleteMessageBatchRequestEntryCollection) { + if (deleteMessageBatchRequestEntryCollection.size() == 0) { + return; + } final DeleteMessageBatchRequest deleteMessageBatchRequest = buildDeleteMessageBatchRequest(deleteMessageBatchRequestEntryCollection); try { final DeleteMessageBatchResponse deleteMessageBatchResponse = sqsClient.deleteMessageBatch(deleteMessageBatchRequest); @@ -288,7 +291,7 @@ private void deleteSqsMessages(final List delete if(LOG.isErrorEnabled()) { final String failedMessages = deleteMessageBatchResponse.failed().stream() - .map(failed -> toString()) + .map(failed -> failed.toString()) .collect(Collectors.joining(", ")); LOG.error("Failed to delete {} messages from SQS with errors: [{}].", failedDeleteCount, failedMessages); }