Skip to content

Auto-created pull request into develop from feature/test-container #131

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

Merged
mvallim merged 1 commit into from
May 29, 2026
Merged

Auto-created pull request into develop from feature/test-container #131

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
6 changes: 3 additions & 3 deletions ...ng-lib-template/src/test/java/com/amazon/sns/messaging/lib/core/ListenableFutureTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@

import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;

Expand Down Expand Up @@ -85,7 +86,7 @@ void testAddCallbackWithSuccessOnlyDoesNotThrowOnFail() {

listenableFuture.addCallback(successCallback);

org.junit.jupiter.api.Assertions.assertDoesNotThrow(() -> listenableFuture.fail(entry));
assertDoesNotThrow(() -> listenableFuture.fail(entry));
}

@Test
Expand All @@ -111,10 +112,9 @@ void testFailDoesNotInvokeSuccessCallback() {
@Test
void testAddCallbackDefaultFailureCallbackIsNoOp() {
final boolean[] called = { false };
final Consumer<ResponseSuccessEntry> successCallback = result -> called[0] = true;
final ResponseFailEntry entry = mock(ResponseFailEntry.class);

listenableFuture.addCallback(successCallback);
listenableFuture.addCallback(successCallback -> called[0] = true);
listenableFuture.fail(entry);

assertThat(called[0], is(false));
Expand Down
58 changes: 31 additions & 27 deletions ...a-messaging-lib-v1/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.amazon.sns.messaging.lib.core;

import java.util.List;
import java.util.Optional;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -114,40 +115,43 @@ protected void handleError(final PublishBatchRequest publishBatchRequest, final

AmazonSnsConsumer.LOGGER.error(throwable.getMessage(), throwable);

publishBatchRequest.getPublishBatchRequestEntries().forEach(entry -> {
final ListenableFuture<ResponseSuccessEntry, ResponseFailEntry> listenableFuture = pendingRequests.remove(entry.getId());
listenableFuture.fail(ResponseFailEntry.builder()
.withId(entry.getId())
.withCode(code)
.withMessage(message)
.withSenderFault(true)
.build());
});
publishBatchRequest.getPublishBatchRequestEntries().forEach(entry ->
Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture ->
listenableFuture.fail(ResponseFailEntry.builder()
.withId(entry.getId())
.withCode(code)
.withMessage(message)
.withSenderFault(true)
.build())
)
);
}

/**
* {@inheritDoc}
*/
@Override
protected void handleResponse(final PublishBatchResult publishBatchResult) {
publishBatchResult.getSuccessful().forEach(entry -> {
final ListenableFuture<ResponseSuccessEntry, ResponseFailEntry> listenableFuture = pendingRequests.remove(entry.getId());
listenableFuture.success(ResponseSuccessEntry.builder()
.withId(entry.getId())
.withMessageId(entry.getMessageId())
.withSequenceNumber(entry.getSequenceNumber())
.build());
});

publishBatchResult.getFailed().forEach(entry -> {
final ListenableFuture<ResponseSuccessEntry, ResponseFailEntry> listenableFuture = pendingRequests.remove(entry.getId());
listenableFuture.fail(ResponseFailEntry.builder()
.withId(entry.getId())
.withCode(entry.getCode())
.withMessage(entry.getMessage())
.withSenderFault(entry.getSenderFault())
.build());
});
publishBatchResult.getSuccessful().forEach(entry ->
Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture ->
listenableFuture.success(ResponseSuccessEntry.builder()
.withId(entry.getId())
.withMessageId(entry.getMessageId())
.withSequenceNumber(entry.getSequenceNumber())
.build())
)
);

publishBatchResult.getFailed().forEach(entry ->
Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture ->
listenableFuture.fail(ResponseFailEntry.builder()
.withId(entry.getId())
.withCode(entry.getCode())
.withMessage(entry.getMessage())
.withSenderFault(entry.getSenderFault())
.build())
)
);
}

}
Expand Down
58 changes: 31 additions & 27 deletions ...a-messaging-lib-v2/src/main/java/com/amazon/sns/messaging/lib/core/AmazonSnsConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.amazon.sns.messaging.lib.core;

import java.util.List;
import java.util.Optional;
import java.util.concurrent.BlockingQueue;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.ExecutorService;
Expand Down Expand Up @@ -116,40 +117,43 @@ protected void handleError(final PublishBatchRequest publishBatchRequest, final

AmazonSnsConsumer.LOGGER.error(throwable.getMessage(), throwable);

publishBatchRequest.publishBatchRequestEntries().forEach(entry -> {
final ListenableFuture<ResponseSuccessEntry, ResponseFailEntry> listenableFuture = pendingRequests.remove(entry.id());
listenableFuture.fail(ResponseFailEntry.builder()
.withId(entry.id())
.withCode(code)
.withMessage(message)
.withSenderFault(true)
.build());
});
publishBatchRequest.publishBatchRequestEntries().forEach(entry ->
Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture ->
listenableFuture.fail(ResponseFailEntry.builder()
.withId(entry.id())
.withCode(code)
.withMessage(message)
.withSenderFault(true)
.build())
)
);
}

/**
* {@inheritDoc}
*/
@Override
protected void handleResponse(final PublishBatchResponse publishBatchResult) {
publishBatchResult.successful().forEach(entry -> {
final ListenableFuture<ResponseSuccessEntry, ResponseFailEntry> listenableFuture = pendingRequests.remove(entry.id());
listenableFuture.success(ResponseSuccessEntry.builder()
.withId(entry.id())
.withMessageId(entry.messageId())
.withSequenceNumber(entry.sequenceNumber())
.build());
});

publishBatchResult.failed().forEach(entry -> {
final ListenableFuture<ResponseSuccessEntry, ResponseFailEntry> listenableFuture = pendingRequests.remove(entry.id());
listenableFuture.fail(ResponseFailEntry.builder()
.withId(entry.id())
.withCode(entry.code())
.withMessage(entry.message())
.withSenderFault(entry.senderFault())
.build());
});
publishBatchResult.successful().forEach(entry ->
Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture ->
listenableFuture.success(ResponseSuccessEntry.builder()
.withId(entry.id())
.withMessageId(entry.messageId())
.withSequenceNumber(entry.sequenceNumber())
.build())
)
);

publishBatchResult.failed().forEach(entry ->
Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture ->
listenableFuture.fail(ResponseFailEntry.builder()
.withId(entry.id())
.withCode(entry.code())
.withMessage(entry.message())
.withSenderFault(entry.senderFault())
.build())
)
);
}

}
Expand Down