Skip to content
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

Spring modulith 1.3 upgrade #1317

Merged
merged 5 commits into from
Jan 17, 2025
Merged

Spring modulith 1.3 upgrade #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7b72356
Upgrade to Spring Modulith 1.3.1.
odrotbohm Dec 19, 2024
0a9aacf
Add Spring Modulith 1.3's header support for externalization.
odrotbohm Dec 19, 2024
cf2fe1c
Pass event into externalization target calculation.
odrotbohm Dec 19, 2024
2e07b3d
Polish tests
maciejwalkowiak Jan 16, 2025
ea70d5f
Formatting
maciejwalkowiak Jan 16, 2025
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
2 changes: 1 addition & 1 deletion spring-cloud-aws-dependencies/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
<jakarta.mail.version>2.1.0</jakarta.mail.version>
<eclipse.jakarta.mail.version>1.0.0</eclipse.jakarta.mail.version>
<bytebuddy.version>1.14.9</bytebuddy.version>
<spring-modulith.version>1.2.3</spring-modulith.version>
<spring-modulith.version>1.3.1</spring-modulith.version>
<wiremock-standalone.version>3.3.1</wiremock-standalone.version>
<amazon.s3.accessgrants>2.3.0</amazon.s3.accessgrants>
</properties>
Expand Down
4 changes: 2 additions & 2 deletions ...rc/main/java/io/awspring/cloud/modulith/events/sns/SnsEventExternalizerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,15 +61,15 @@ DelegatingEventExternalizer snsEventExternalizer(EventExternalizationConfigurati
return new DelegatingEventExternalizer(configuration, (target, payload) -> {

var routing = BrokerRouting.of(target, context);
var builder = SnsNotification.builder(payload);
var builder = SnsNotification.builder(payload).headers(configuration.getHeadersFor(payload));
var key = routing.getKey(payload);

// when routing key is set, SNS topic must be a FIFO topic
if (key != null) {
builder.groupId(key);
}

operations.sendNotification(routing.getTarget(), builder.build());
operations.sendNotification(routing.getTarget(payload), builder.build());

return CompletableFuture.completedFuture(null);
});
Expand Down
22 changes: 19 additions & 3 deletions .../test/java/io/awspring/cloud/modulith/events/sns/SnsEventPublicationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import static org.assertj.core.api.Assertions.*;
import static org.awaitility.Awaitility.*;
import static org.springframework.modulith.events.EventExternalizationConfiguration.*;

import java.util.Map;
import org.junit.jupiter.api.Test;
Expand All @@ -26,13 +27,16 @@
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.modulith.events.ApplicationModuleListener;
import org.springframework.modulith.events.EventExternalizationConfiguration;
import org.springframework.modulith.events.Externalized;
import org.springframework.test.context.DynamicPropertyRegistrar;
import org.springframework.transaction.annotation.Transactional;
import org.testcontainers.containers.localstack.LocalStackContainer;
import org.testcontainers.utility.DockerImageName;
import software.amazon.awssdk.services.sns.SnsClient;
import software.amazon.awssdk.services.sqs.SqsAsyncClient;
import software.amazon.awssdk.services.sqs.model.Message;
import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
import software.amazon.awssdk.services.sqs.model.QueueAttributeName;

/**
Expand Down Expand Up @@ -78,6 +82,13 @@ TestPublisher testPublisher(ApplicationEventPublisher publisher) {
TestListener testListener() {
return new TestListener();
}

@Bean
EventExternalizationConfiguration eventExternalizationConfiguration() {

return externalizing().select(annotatedAsExternalized())
.headers(Object.class, __ -> Map.of("testKey", "testValue")).build();
}
}

@Test // GH-344
Expand All @@ -91,15 +102,20 @@ void publishesEventToSns() {
.getQueueAttributes(r -> r.queueUrl(queueUrl).attributeNames(QueueAttributeName.QUEUE_ARN)).join()
.attributes().get(QueueAttributeName.QUEUE_ARN);

snsClient.subscribe(r -> r.topicArn(topicArn).protocol("sqs").endpoint(queueArn));
snsClient.subscribe(r -> r.attributes(Map.of("RawMessageDelivery", "true")).topicArn(topicArn).protocol("sqs")
.endpoint(queueArn));

publisher.publishEvent();

await().untilAsserted(() -> {

var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl)).join();
var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl).messageAttributeNames("testKey"))
.join();

assertThat(response.hasMessages()).isTrue();

// Assert header added
assertThat(response.messages()).extracting(Message::messageAttributes).extracting(it -> it.get("testKey"))
.extracting(MessageAttributeValue::stringValue).containsExactly("testValue");
});
}

Expand Down
4 changes: 3 additions & 1 deletion ...rc/main/java/io/awspring/cloud/modulith/events/sqs/SqsEventExternalizerConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,9 @@ DelegatingEventExternalizer sqsEventExternalizer(EventExternalizationConfigurati

return CompletableFuture.completedFuture(operations.send(sqsSendOptions -> {

var options = sqsSendOptions.queue(routing.getTarget()).payload(payload);
var options = sqsSendOptions.queue(routing.getTarget(payload))
.headers(configuration.getHeadersFor(payload)).payload(payload);

var key = routing.getKey(payload);

if (key != null) {
Expand Down
18 changes: 17 additions & 1 deletion .../test/java/io/awspring/cloud/modulith/events/sqs/SqsEventPublicationIntegrationTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@

import static org.assertj.core.api.Assertions.*;
import static org.awaitility.Awaitility.*;
import static org.springframework.modulith.events.EventExternalizationConfiguration.*;

import java.util.Map;
import org.junit.jupiter.api.Test;
Expand All @@ -26,12 +27,15 @@
import org.springframework.context.ApplicationEventPublisher;
import org.springframework.context.annotation.Bean;
import org.springframework.modulith.events.ApplicationModuleListener;
import org.springframework.modulith.events.EventExternalizationConfiguration;
import org.springframework.modulith.events.Externalized;
import org.springframework.test.context.DynamicPropertyRegistrar;
import org.springframework.transaction.annotation.Transactional;
import org.testcontainers.containers.localstack.LocalStackContainer;
import org.testcontainers.utility.DockerImageName;
import software.amazon.awssdk.services.sqs.SqsAsyncClient;
import software.amazon.awssdk.services.sqs.model.Message;
import software.amazon.awssdk.services.sqs.model.MessageAttributeValue;
import software.amazon.awssdk.services.sqs.model.QueueAttributeName;

/**
Expand Down Expand Up @@ -76,6 +80,13 @@ TestPublisher testPublisher(ApplicationEventPublisher publisher) {
TestListener testListener() {
return new TestListener();
}

@Bean
EventExternalizationConfiguration eventExternalizationConfiguration() {

return externalizing().select(annotatedAsExternalized())
.headers(Object.class, __ -> Map.of("testKey", "testValue")).build();
}
}

@Test
Expand All @@ -86,9 +97,14 @@ void publishesEventToSqs() throws Exception {
publisher.publishEvent();

await().untilAsserted(() -> {
var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl)).join();
var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl).messageAttributeNames("testKey"))
.join();

assertThat(response.hasMessages()).isTrue();

// Assert header added
assertThat(response.messages()).extracting(Message::messageAttributes).extracting(it -> it.get("testKey"))
.extracting(MessageAttributeValue::stringValue).containsExactly("testValue");
});
}

Expand Down
Loading