Merge branch 'feature/master/sqs-batch-manager' into joviegas/receive_buffer_queue

Author: joviegas

services/sqs/src/test/java/software/amazon/awssdk/services/sqs/batchmanager/BaseSqsBatchManagerTest.java

@@ -32,6 +32,7 @@
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
+import java.util.function.Consumer;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
 import software.amazon.awssdk.core.exception.SdkClientException;
@@ -47,7 +48,7 @@
 
 public abstract class BaseSqsBatchManagerTest {
 
-    private static final String DEFAULT_QUEUE_URL = "SomeQueueUrl";
+    protected static final String DEFAULT_QUEUE_URL = "SomeQueueUrl";
     private static final int DEFAULT_MAX_BATCH_OPEN = 200;
 
 
@@ -293,25 +294,6 @@ public abstract List<CompletableFuture<SendMessageResponse>> createAndSendSendMe
 
     public abstract List<CompletableFuture<ChangeMessageVisibilityResponse>> createAndSendChangeVisibilityRequests();
 
-    SendMessageRequest createSendMessageRequest(String messageBody) {
-        return SendMessageRequest.builder()
-                                 .messageBody(messageBody)
-                                 .queueUrl(DEFAULT_QUEUE_URL)
-                                 .build();
-    }
-
-    DeleteMessageRequest createDeleteMessageRequest() {
-        return DeleteMessageRequest.builder()
-                                   .queueUrl(DEFAULT_QUEUE_URL)
-                                   .build();
-    }
-
-    ChangeMessageVisibilityRequest createChangeVisibilityRequest() {
-        return ChangeMessageVisibilityRequest.builder()
-                                             .queueUrl(DEFAULT_QUEUE_URL)
-                                             .build();
-    }
-
     private String getMd5Hash(String message) {
         byte[] expectedMd5;
         expectedMd5 = Md5Utils.computeMD5Hash(message.getBytes(StandardCharsets.UTF_8));

services/sqs/src/test/java/software/amazon/awssdk/services/sqs/batchmanager/SqsAsyncBatchManagerTest.java

@@ -78,41 +78,26 @@ public void tearDown() {
 
     @Override
     public List<CompletableFuture<SendMessageResponse>> createAndSendSendMessageRequests(String message1, String message2) {
-        List<SendMessageRequest> requests = new ArrayList<>();
-        requests.add(createSendMessageRequest(message1));
-        requests.add(createSendMessageRequest(message2));
-
         List<CompletableFuture<SendMessageResponse>> responses = new ArrayList<>();
-        for (SendMessageRequest request : requests) {
-            responses.add(batchManager.sendMessage(request));
-        }
+        responses.add(batchManager.sendMessage(builder -> builder.queueUrl(DEFAULT_QUEUE_URL).messageBody(message1)));
+        responses.add(batchManager.sendMessage(builder -> builder.queueUrl(DEFAULT_QUEUE_URL).messageBody(message2)));
         return responses;
     }
 
     @Override
     public List<CompletableFuture<DeleteMessageResponse>> createAndSendDeleteMessageRequests() {
         List<DeleteMessageRequest> requests = new ArrayList<>();
-        requests.add(createDeleteMessageRequest());
-        requests.add(createDeleteMessageRequest());
         List<CompletableFuture<DeleteMessageResponse>> responses = new ArrayList<>();
-
-        for (DeleteMessageRequest request : requests) {
-            responses.add(batchManager.deleteMessage(request));
-        }
+        responses.add(batchManager.deleteMessage(builder -> builder.queueUrl(DEFAULT_QUEUE_URL)));
+        responses.add(batchManager.deleteMessage(builder -> builder.queueUrl(DEFAULT_QUEUE_URL)));
         return responses;
     }
 
     @Override
     public List<CompletableFuture<ChangeMessageVisibilityResponse>> createAndSendChangeVisibilityRequests() {
-        List<ChangeMessageVisibilityRequest> requests = new ArrayList<>();
-        requests.add(createChangeVisibilityRequest());
-        requests.add(createChangeVisibilityRequest());
-
         List<CompletableFuture<ChangeMessageVisibilityResponse>> responses = new ArrayList<>();
-        for (ChangeMessageVisibilityRequest request : requests) {
-            responses.add(batchManager.changeMessageVisibility(request));
-        }
-
+        responses.add(batchManager.changeMessageVisibility(builder -> builder.queueUrl(DEFAULT_QUEUE_URL)));
+        responses.add(batchManager.changeMessageVisibility(builder -> builder.queueUrl(DEFAULT_QUEUE_URL)));
         return responses;
     }
 }