Skip to content

Fix: Execute all messages received from SQS #138

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
merged 1 commit into from
Jul 17, 2021
Merged

Fix: Execute all messages received from SQS #138

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
13 changes: 4 additions & 9 deletions ...ng/src/main/java/io/awspring/cloud/messaging/listener/SimpleMessageListenerContainer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -338,15 +338,10 @@ public void run() {
? groupByMessageGroupId(receiveMessageResult) : groupByMessage(receiveMessageResult);
CountDownLatch messageBatchLatch = new CountDownLatch(messageGroups.size());
for (MessageGroup messageGroup : messageGroups) {
if (isQueueRunning(this.logicalQueueName)) {
MessageGroupExecutor messageGroupExecutor = new MessageGroupExecutor(this.logicalQueueName,
messageGroup, this.queueAttributes);
getTaskExecutor()
.execute(new SignalExecutingRunnable(messageBatchLatch, messageGroupExecutor));
}
else {
messageBatchLatch.countDown();
}
MessageGroupExecutor messageGroupExecutor = new MessageGroupExecutor(this.logicalQueueName,
messageGroup, this.queueAttributes);
getTaskExecutor()
.execute(new SignalExecutingRunnable(messageBatchLatch, messageGroupExecutor));
}
try {
messageBatchLatch.await();
Expand Down
39 changes: 39 additions & 0 deletions ...rc/test/java/io/awspring/cloud/messaging/listener/SimpleMessageListenerContainerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -367,6 +367,45 @@ public void handleMessage(org.springframework.messaging.Message<?> message) thro
container.start();
}

@Test
void testAllMessageReceivedAreConsumed() throws Exception {
SimpleMessageListenerContainer container = new SimpleMessageListenerContainer();

AmazonSQSAsync sqs = mock(AmazonSQSAsync.class, withSettings().stubOnly());
container.setAmazonSqs(sqs);

CountDownLatch countDownLatch = new CountDownLatch(1);
QueueMessageHandler messageHandler = new QueueMessageHandler() {
@Override
public void handleMessage(org.springframework.messaging.Message<?> message) throws MessagingException {
countDownLatch.countDown();
}
};
container.setMessageHandler(messageHandler);
StaticApplicationContext applicationContext = new StaticApplicationContext();
applicationContext.registerSingleton("testMessageListener", TestMessageListener.class);
messageHandler.setApplicationContext(applicationContext);
container.setBeanName("testContainerName");
messageHandler.afterPropertiesSet();

mockGetQueueUrl(sqs, "testQueue", "http://testSimpleReceiveMessage.amazonaws.com");
mockGetQueueAttributesWithEmptyResult(sqs, "http://testSimpleReceiveMessage.amazonaws.com");

container.afterPropertiesSet();

when(sqs.receiveMessage(
new ReceiveMessageRequest("http://testSimpleReceiveMessage.amazonaws.com").withAttributeNames("All")
.withMessageAttributeNames("All").withMaxNumberOfMessages(10).withWaitTimeSeconds(20)))
.thenReturn(new ReceiveMessageResult().withMessages(
new Message().withBody("messageContent")));
when(sqs.getQueueAttributes(any(GetQueueAttributesRequest.class))).thenReturn(new GetQueueAttributesResult());

container.start();
container.stop();

assertThat(countDownLatch.await(1, TimeUnit.SECONDS)).isTrue();
}

@Test
void listener_withMultipleMessageHandlers_shouldBeCalled() throws Exception {
CountDownLatch countDownLatch = new CountDownLatch(2);
Expand Down