Skip to content

Auto-created pull request into release/1.2.0 from develop #76

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 2 commits into from
May 29, 2026
Merged

Auto-created pull request into release/1.2.0 from develop #76

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
818d190
test(integration): improve tests
mvallim May 29, 2026
ce56d10
Merge pull request #75 from mvallim/feature/test-container
mvallim May 29, 2026
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/sqs/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
30 changes: 15 additions & 15 deletions ...a-messaging-lib-v1/src/main/java/com/amazon/sqs/messaging/lib/core/AmazonSqsConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,43 +113,43 @@ protected void handleError(final SendMessageBatchRequest publishBatchRequest, fi

LOGGER.error("Error processing batch request: {}", message, throwable);

publishBatchRequest.getEntries().forEach(entry -> {
Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture -> {
publishBatchRequest.getEntries().forEach(entry ->
Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture ->
listenableFuture.fail(ResponseFailEntry.builder()
.withId(entry.getId())
.withCode(code)
.withMessage(message)
.withSenderFault(true)
.build());
});
});
.build())
)
);
}

/**
* {@inheritDoc}
*/
@Override
protected void handleResponse(final SendMessageBatchResult publishBatchResult) {
publishBatchResult.getSuccessful().forEach(entry -> {
Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture -> {
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());
});
});
.build())
)
);

publishBatchResult.getFailed().forEach(entry -> {
Optional.ofNullable(pendingRequests.remove(entry.getId())).ifPresent(listenableFuture -> {
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());
});
});
.build())
)
);
}

}
Expand Down
2 changes: 1 addition & 1 deletion ...ng-lib-v1/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerAsyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class AmazonSqsProducerAsyncTest {
private AmazonSQS amazonSQS;

@BeforeEach
public void before() {
void before() {
final QueueProperty queueProperty = QueueProperty.builder()
.fifo(false)
.linger(50L)
Expand Down
2 changes: 1 addition & 1 deletion ...ing-lib-v1/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerSyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ class AmazonSqsProducerSyncTest {
private AmazonSQS amazonSQS;

@BeforeEach
public void before() {
void before() {
final QueueProperty queueProperty = QueueProperty.builder()
.fifo(true)
.linger(50L)
Expand Down
30 changes: 15 additions & 15 deletions ...a-messaging-lib-v2/src/main/java/com/amazon/sqs/messaging/lib/core/AmazonSqsConsumer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,43 +115,43 @@ protected void handleError(final SendMessageBatchRequest publishBatchRequest, fi

LOGGER.error("Error processing batch request: {}", message, throwable);

publishBatchRequest.entries().forEach(entry -> {
Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture -> {
publishBatchRequest.entries().forEach(entry ->
Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture ->
listenableFuture.fail(ResponseFailEntry.builder()
.withId(entry.id())
.withCode(code)
.withMessage(message)
.withSenderFault(true)
.build());
});
});
.build())
)
);
}

/**
* {@inheritDoc}
*/
@Override
protected void handleResponse(final SendMessageBatchResponse publishBatchResult) {
publishBatchResult.successful().forEach(entry -> {
Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture -> {
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());
});
});
.build())
)
);

publishBatchResult.failed().forEach(entry -> {
Optional.ofNullable(pendingRequests.remove(entry.id())).ifPresent(listenableFuture -> {
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());
});
});
.build())
)
);
}

}
Expand Down
2 changes: 1 addition & 1 deletion ...ng-lib-v2/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerAsyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ class AmazonSqsProducerAsyncTest {
private SqsClient amazonSQS;

@BeforeEach
public void before() {
void before() {
final QueueProperty queueProperty = QueueProperty.builder()
.fifo(false)
.linger(50L)
Expand Down
2 changes: 1 addition & 1 deletion ...ing-lib-v2/src/test/java/com/amazon/sqs/messaging/lib/core/AmazonSqsProducerSyncTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ class AmazonSqsProducerSyncTest {
private SqsClient amazonSQS;

@BeforeEach
public void before() {
void before() {
final QueueProperty queueProperty = QueueProperty.builder()
.fifo(true)
.linger(50L)
Expand Down