Skip to content

Delegate ReDrive APIs to the underlying SQS client #178

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
stefan-sq wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Delegate ReDrive APIs to the underlying SQS client #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions src/main/java/com/amazon/sqs/javamessaging/AmazonSQSExtendedAsyncClientBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
import software.amazon.awssdk.services.sqs.SqsAsyncClient;
import software.amazon.awssdk.services.sqs.model.AddPermissionRequest;
import software.amazon.awssdk.services.sqs.model.AddPermissionResponse;
import software.amazon.awssdk.services.sqs.model.CancelMessageMoveTaskRequest;
import software.amazon.awssdk.services.sqs.model.CancelMessageMoveTaskResponse;
import software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityBatchRequest;
import software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityBatchResponse;
import software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityRequest;
Expand All @@ -22,6 +24,8 @@
import software.amazon.awssdk.services.sqs.model.GetQueueUrlResponse;
import software.amazon.awssdk.services.sqs.model.ListDeadLetterSourceQueuesRequest;
import software.amazon.awssdk.services.sqs.model.ListDeadLetterSourceQueuesResponse;
import software.amazon.awssdk.services.sqs.model.ListMessageMoveTasksRequest;
import software.amazon.awssdk.services.sqs.model.ListMessageMoveTasksResponse;
import software.amazon.awssdk.services.sqs.model.ListQueueTagsRequest;
import software.amazon.awssdk.services.sqs.model.ListQueueTagsResponse;
import software.amazon.awssdk.services.sqs.model.ListQueuesRequest;
Expand All @@ -38,6 +42,8 @@
import software.amazon.awssdk.services.sqs.model.SendMessageResponse;
import software.amazon.awssdk.services.sqs.model.SetQueueAttributesRequest;
import software.amazon.awssdk.services.sqs.model.SetQueueAttributesResponse;
import software.amazon.awssdk.services.sqs.model.StartMessageMoveTaskRequest;
import software.amazon.awssdk.services.sqs.model.StartMessageMoveTaskResponse;
import software.amazon.awssdk.services.sqs.model.TagQueueRequest;
import software.amazon.awssdk.services.sqs.model.TagQueueResponse;
import software.amazon.awssdk.services.sqs.model.UntagQueueRequest;
Expand Down Expand Up @@ -226,6 +232,33 @@ public CompletableFuture<UntagQueueResponse> untagQueue(final UntagQueueRequest
return amazonSqsToBeExtended.untagQueue(untagQueueRequest);
}

/**
* {@inheritDoc}
*/
@Override
public CompletableFuture<StartMessageMoveTaskResponse> startMessageMoveTask(
StartMessageMoveTaskRequest startMessageMoveTaskRequest) {
return amazonSqsToBeExtended.startMessageMoveTask(startMessageMoveTaskRequest);
}

/**
* {@inheritDoc}
*/
@Override
public CompletableFuture<ListMessageMoveTasksResponse> listMessageMoveTasks(
ListMessageMoveTasksRequest listMessageMoveTasksRequest) {
return amazonSqsToBeExtended.listMessageMoveTasks(listMessageMoveTasksRequest);
}

/**
* {@inheritDoc}
*/
@Override
public CompletableFuture<CancelMessageMoveTaskResponse> cancelMessageMoveTask(
CancelMessageMoveTaskRequest cancelMessageMoveTaskRequest) {
return amazonSqsToBeExtended.cancelMessageMoveTask(cancelMessageMoveTaskRequest);
}

/**
* {@inheritDoc}
*/
Expand Down
27 changes: 27 additions & 0 deletions src/main/java/com/amazon/sqs/javamessaging/AmazonSQSExtendedClientBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,8 @@
import software.amazon.awssdk.services.sqs.model.AddPermissionResponse;
import software.amazon.awssdk.services.sqs.model.BatchEntryIdsNotDistinctException;
import software.amazon.awssdk.services.sqs.model.BatchRequestTooLongException;
import software.amazon.awssdk.services.sqs.model.CancelMessageMoveTaskRequest;
import software.amazon.awssdk.services.sqs.model.CancelMessageMoveTaskResponse;
import software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityBatchRequest;
import software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityBatchResponse;
import software.amazon.awssdk.services.sqs.model.ChangeMessageVisibilityRequest;
Expand All @@ -48,6 +50,8 @@
import software.amazon.awssdk.services.sqs.model.InvalidMessageContentsException;
import software.amazon.awssdk.services.sqs.model.ListDeadLetterSourceQueuesRequest;
import software.amazon.awssdk.services.sqs.model.ListDeadLetterSourceQueuesResponse;
import software.amazon.awssdk.services.sqs.model.ListMessageMoveTasksRequest;
import software.amazon.awssdk.services.sqs.model.ListMessageMoveTasksResponse;
import software.amazon.awssdk.services.sqs.model.ListQueueTagsRequest;
import software.amazon.awssdk.services.sqs.model.ListQueueTagsResponse;
import software.amazon.awssdk.services.sqs.model.ListQueuesRequest;
Expand All @@ -72,6 +76,8 @@
import software.amazon.awssdk.services.sqs.model.SetQueueAttributesRequest;
import software.amazon.awssdk.services.sqs.model.SetQueueAttributesResponse;
import software.amazon.awssdk.services.sqs.model.SqsException;
import software.amazon.awssdk.services.sqs.model.StartMessageMoveTaskRequest;
import software.amazon.awssdk.services.sqs.model.StartMessageMoveTaskResponse;
import software.amazon.awssdk.services.sqs.model.TagQueueRequest;
import software.amazon.awssdk.services.sqs.model.TagQueueResponse;
import software.amazon.awssdk.services.sqs.model.TooManyEntriesInBatchRequestException;
Expand Down Expand Up @@ -1112,6 +1118,27 @@ public ListQueuesResponse listQueues() throws AwsServiceException, SdkClientExce
return amazonSqsToBeExtended.untagQueue(untagQueueRequest);
}

/** {@inheritDoc} */
@Override
public StartMessageMoveTaskResponse startMessageMoveTask(
StartMessageMoveTaskRequest startMessageMoveTaskRequest) {
return amazonSqsToBeExtended.startMessageMoveTask(startMessageMoveTaskRequest);
}

/** {@inheritDoc} */
@Override
public ListMessageMoveTasksResponse listMessageMoveTasks(
ListMessageMoveTasksRequest listMessageMoveTasksRequest) {
return amazonSqsToBeExtended.listMessageMoveTasks(listMessageMoveTasksRequest);
}

/** {@inheritDoc} */
@Override
public CancelMessageMoveTaskResponse cancelMessageMoveTask(
CancelMessageMoveTaskRequest cancelMessageMoveTaskRequest) {
return amazonSqsToBeExtended.cancelMessageMoveTask(cancelMessageMoveTaskRequest);
}

@Override
public String serviceName() {
return amazonSqsToBeExtended.serviceName();
Expand Down
55 changes: 55 additions & 0 deletions src/test/java/com/amazon/sqs/javamessaging/AmazonSQSExtendedAsyncClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,11 +58,17 @@
import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
import software.amazon.awssdk.services.sqs.model.CancelMessageMoveTaskRequest;
import software.amazon.awssdk.services.sqs.model.CancelMessageMoveTaskResponse;
import software.amazon.awssdk.services.sqs.model.ListMessageMoveTasksRequest;
import software.amazon.awssdk.services.sqs.model.ListMessageMoveTasksResponse;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequest;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequestEntry;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchResponse;
import software.amazon.awssdk.services.sqs.model.SendMessageRequest;
import software.amazon.awssdk.services.sqs.model.SendMessageResponse;
import software.amazon.awssdk.services.sqs.model.StartMessageMoveTaskRequest;
import software.amazon.awssdk.services.sqs.model.StartMessageMoveTaskResponse;
import software.amazon.awssdk.utils.ImmutableMap;
import software.amazon.payloadoffloading.PayloadS3Pointer;
import software.amazon.payloadoffloading.ServerSideEncryptionFactory;
Expand Down Expand Up @@ -703,6 +709,55 @@ public void testReceiveMessage_when_ignorePayloadNotFoundIsFalse_then_messageWit
}
}

@Test
public void testStartMessageMoveTaskDelegatesToUnderlyingClient() {
StartMessageMoveTaskRequest request = StartMessageMoveTaskRequest.builder()
.sourceArn("arn:aws:sqs:us-east-1:123456789012:source-dlq")
.build();
StartMessageMoveTaskResponse expectedResponse = StartMessageMoveTaskResponse.builder()
.taskHandle("task-handle")
.build();
when(mockSqsBackend.startMessageMoveTask(isA(StartMessageMoveTaskRequest.class)))
.thenReturn(CompletableFuture.completedFuture(expectedResponse));

StartMessageMoveTaskResponse response = extendedSqsWithDefaultConfig.startMessageMoveTask(request).join();

assertEquals(expectedResponse, response);
verify(mockSqsBackend).startMessageMoveTask(request);
}

@Test
public void testListMessageMoveTasksDelegatesToUnderlyingClient() {
ListMessageMoveTasksRequest request = ListMessageMoveTasksRequest.builder()
.sourceArn("arn:aws:sqs:us-east-1:123456789012:source-dlq")
.build();
ListMessageMoveTasksResponse expectedResponse = ListMessageMoveTasksResponse.builder().build();
when(mockSqsBackend.listMessageMoveTasks(isA(ListMessageMoveTasksRequest.class)))
.thenReturn(CompletableFuture.completedFuture(expectedResponse));

ListMessageMoveTasksResponse response = extendedSqsWithDefaultConfig.listMessageMoveTasks(request).join();

assertEquals(expectedResponse, response);
verify(mockSqsBackend).listMessageMoveTasks(request);
}

@Test
public void testCancelMessageMoveTaskDelegatesToUnderlyingClient() {
CancelMessageMoveTaskRequest request = CancelMessageMoveTaskRequest.builder()
.taskHandle("task-handle")
.build();
CancelMessageMoveTaskResponse expectedResponse = CancelMessageMoveTaskResponse.builder()
.approximateNumberOfMessagesMoved(42L)
.build();
when(mockSqsBackend.cancelMessageMoveTask(isA(CancelMessageMoveTaskRequest.class)))
.thenReturn(CompletableFuture.completedFuture(expectedResponse));

CancelMessageMoveTaskResponse response = extendedSqsWithDefaultConfig.cancelMessageMoveTask(request).join();

assertEquals(expectedResponse, response);
verify(mockSqsBackend).cancelMessageMoveTask(request);
}

private DeleteMessageBatchRequest generateLargeDeleteBatchRequest(List<String> originalReceiptHandles) {
List<DeleteMessageBatchRequestEntry> deleteEntries = IntStream.range(0, originalReceiptHandles.size())
.mapToObj(i -> DeleteMessageBatchRequestEntry.builder()
Expand Down
55 changes: 55 additions & 0 deletions src/test/java/com/amazon/sqs/javamessaging/AmazonSQSExtendedClientTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,19 @@
import software.amazon.awssdk.services.sqs.model.DeleteMessageBatchRequest;
import software.amazon.awssdk.services.sqs.model.DeleteMessageBatchRequestEntry;
import software.amazon.awssdk.services.sqs.model.DeleteMessageRequest;
import software.amazon.awssdk.services.sqs.model.CancelMessageMoveTaskRequest;
import software.amazon.awssdk.services.sqs.model.CancelMessageMoveTaskResponse;
import software.amazon.awssdk.services.sqs.model.ListMessageMoveTasksRequest;
import software.amazon.awssdk.services.sqs.model.ListMessageMoveTasksResponse;
import software.amazon.awssdk.services.sqs.model.Message;
import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequest;
import software.amazon.awssdk.services.sqs.model.SendMessageBatchRequestEntry;
import software.amazon.awssdk.services.sqs.model.SendMessageRequest;
import software.amazon.awssdk.services.sqs.model.StartMessageMoveTaskRequest;
import software.amazon.awssdk.services.sqs.model.StartMessageMoveTaskResponse;
import software.amazon.awssdk.utils.ImmutableMap;
import software.amazon.awssdk.utils.StringInputStream;
import software.amazon.payloadoffloading.PayloadS3Pointer;
Expand Down Expand Up @@ -757,6 +763,55 @@ public void testReceiveMessage_when_ignorePayloadNotFoundIsFalse_then_messageWit
}
}

@Test
public void testStartMessageMoveTaskDelegatesToUnderlyingClient() {
StartMessageMoveTaskRequest request = StartMessageMoveTaskRequest.builder()
.sourceArn("arn:aws:sqs:us-east-1:123456789012:source-dlq")
.build();
StartMessageMoveTaskResponse expectedResponse = StartMessageMoveTaskResponse.builder()
.taskHandle("task-handle")
.build();
when(mockSqsBackend.startMessageMoveTask(isA(StartMessageMoveTaskRequest.class)))
.thenReturn(expectedResponse);

StartMessageMoveTaskResponse response = extendedSqsWithDefaultConfig.startMessageMoveTask(request);

assertEquals(expectedResponse, response);
verify(mockSqsBackend).startMessageMoveTask(request);
}

@Test
public void testListMessageMoveTasksDelegatesToUnderlyingClient() {
ListMessageMoveTasksRequest request = ListMessageMoveTasksRequest.builder()
.sourceArn("arn:aws:sqs:us-east-1:123456789012:source-dlq")
.build();
ListMessageMoveTasksResponse expectedResponse = ListMessageMoveTasksResponse.builder().build();
when(mockSqsBackend.listMessageMoveTasks(isA(ListMessageMoveTasksRequest.class)))
.thenReturn(expectedResponse);

ListMessageMoveTasksResponse response = extendedSqsWithDefaultConfig.listMessageMoveTasks(request);

assertEquals(expectedResponse, response);
verify(mockSqsBackend).listMessageMoveTasks(request);
}

@Test
public void testCancelMessageMoveTaskDelegatesToUnderlyingClient() {
CancelMessageMoveTaskRequest request = CancelMessageMoveTaskRequest.builder()
.taskHandle("task-handle")
.build();
CancelMessageMoveTaskResponse expectedResponse = CancelMessageMoveTaskResponse.builder()
.approximateNumberOfMessagesMoved(42L)
.build();
when(mockSqsBackend.cancelMessageMoveTask(isA(CancelMessageMoveTaskRequest.class)))
.thenReturn(expectedResponse);

CancelMessageMoveTaskResponse response = extendedSqsWithDefaultConfig.cancelMessageMoveTask(request);

assertEquals(expectedResponse, response);
verify(mockSqsBackend).cancelMessageMoveTask(request);
}

private DeleteMessageBatchRequest generateLargeDeleteBatchRequest(List<String> originalReceiptHandles) {
List<DeleteMessageBatchRequestEntry> deleteEntries = IntStream.range(0, originalReceiptHandles.size())
.mapToObj(i -> DeleteMessageBatchRequestEntry.builder()
Expand Down