From f3f8deb3b36efd9d854786aef05092cfed71ba21 Mon Sep 17 00:00:00 2001 From: Oliver Drotbohm Date: Thu, 23 Jan 2025 12:56:36 +0100 Subject: [PATCH] GH-1024 - Remove AWS support in favor of Spring Cloud AWS. Follow-up of GH-671. --- spring-modulith-events/pom.xml | 2 - .../spring-modulith-events-aws-sns/pom.xml | 90 -------- .../SnsEventExternalizerConfiguration.java | 86 -------- .../modulith/events/aws/sns/package-info.java | 5 - .../src/main/resources/META-INF/LICENSE | 202 ------------------ .../src/main/resources/META-INF/NOTICE | 6 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...rnalizerConfigurationIntegrationTests.java | 64 ------ .../SnsEventPublicationIntegrationTests.java | 171 --------------- .../src/test/resources/application.properties | 1 - .../src/test/resources/logback.xml | 16 -- .../spring-modulith-events-aws-sqs/pom.xml | 84 -------- .../SqsEventExternalizerConfiguration.java | 84 -------- .../modulith/events/aws/sqs/package-info.java | 5 - .../src/main/resources/META-INF/LICENSE | 202 ------------------ .../src/main/resources/META-INF/NOTICE | 6 - ...ot.autoconfigure.AutoConfiguration.imports | 1 - ...rnalizerConfigurationIntegrationTests.java | 64 ------ .../SqsEventPublicationIntegrationTests.java | 151 ------------- .../src/test/resources/application.properties | 2 - .../src/test/resources/logback.xml | 16 -- .../antora/modules/ROOT/pages/appendix.adoc | 12 -- .../antora/modules/ROOT/pages/events.adoc | 12 -- 23 files changed, 1283 deletions(-) delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sns/pom.xml delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sns/src/main/java/org/springframework/modulith/events/aws/sns/SnsEventExternalizerConfiguration.java delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sns/src/main/java/org/springframework/modulith/events/aws/sns/package-info.java delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/LICENSE delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/NOTICE delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sns/src/test/java/org/springframework/modulith/events/aws/sns/SnsEventExternalizerConfigurationIntegrationTests.java delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sns/src/test/java/org/springframework/modulith/events/aws/sns/SnsEventPublicationIntegrationTests.java delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sns/src/test/resources/application.properties delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sns/src/test/resources/logback.xml delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sqs/pom.xml delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sqs/src/main/java/org/springframework/modulith/events/aws/sqs/SqsEventExternalizerConfiguration.java delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sqs/src/main/java/org/springframework/modulith/events/aws/sqs/package-info.java delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/LICENSE delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/NOTICE delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sqs/src/test/java/org/springframework/modulith/events/aws/sqs/SqsEventExternalizerConfigurationIntegrationTests.java delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sqs/src/test/java/org/springframework/modulith/events/aws/sqs/SqsEventPublicationIntegrationTests.java delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sqs/src/test/resources/application.properties delete mode 100644 spring-modulith-events/spring-modulith-events-aws-sqs/src/test/resources/logback.xml diff --git a/spring-modulith-events/pom.xml b/spring-modulith-events/pom.xml index 09e4d1d6..d733693c 100644 --- a/spring-modulith-events/pom.xml +++ b/spring-modulith-events/pom.xml @@ -16,8 +16,6 @@ spring-modulith-events-amqp spring-modulith-events-api - spring-modulith-events-aws-sns - spring-modulith-events-aws-sqs spring-modulith-events-core spring-modulith-events-jackson spring-modulith-events-jdbc diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/pom.xml b/spring-modulith-events/spring-modulith-events-aws-sns/pom.xml deleted file mode 100644 index 9b790713..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sns/pom.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - 4.0.0 - - - org.springframework.modulith - spring-modulith-events - 1.4.0-SNAPSHOT - - - Spring Modulith - Events - AWS SNS support - spring-modulith-events-aws-sns - - - org.springframework.modulith.events.aws.sns - - - - - - org.springframework.modulith - spring-modulith-api - ${project.version} - - - - org.springframework.modulith - spring-modulith-events-core - ${project.version} - - - - io.awspring.cloud - spring-cloud-aws-sns - - - - - - org.springframework.modulith - spring-modulith-starter-jdbc - ${project.version} - test - - - - com.h2database - h2 - test - - - - org.springframework.boot - spring-boot-starter-json - test - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.springframework.boot - spring-boot-testcontainers - test - - - - io.awspring.cloud - spring-cloud-aws-starter-sns - test - - - - io.awspring.cloud - spring-cloud-aws-starter-sqs - test - - - - org.testcontainers - localstack - test - - - - - diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/src/main/java/org/springframework/modulith/events/aws/sns/SnsEventExternalizerConfiguration.java b/spring-modulith-events/spring-modulith-events-aws-sns/src/main/java/org/springframework/modulith/events/aws/sns/SnsEventExternalizerConfiguration.java deleted file mode 100644 index f7e9fa65..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sns/src/main/java/org/springframework/modulith/events/aws/sns/SnsEventExternalizerConfiguration.java +++ /dev/null @@ -1,86 +0,0 @@ -/* - * Copyright 2023-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.modulith.events.aws.sns; - -import io.awspring.cloud.sns.core.SnsNotification; -import io.awspring.cloud.sns.core.SnsOperations; -import io.awspring.cloud.sns.core.SnsTemplate; - -import java.util.concurrent.CompletableFuture; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Bean; -import org.springframework.context.expression.BeanFactoryResolver; -import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.modulith.events.EventExternalizationConfiguration; -import org.springframework.modulith.events.config.EventExternalizationAutoConfiguration; -import org.springframework.modulith.events.support.BrokerRouting; -import org.springframework.modulith.events.support.DelegatingEventExternalizer; - -/** - * Auto-configuration to set up a {@link DelegatingEventExternalizer} to externalize events to SNS. - * - * @author Maciej Walkowiak - * @author Oliver Drotbohm - * @since 1.1 - */ -@AutoConfiguration -@AutoConfigureAfter(EventExternalizationAutoConfiguration.class) -@ConditionalOnClass(SnsTemplate.class) -@ConditionalOnProperty(name = "spring.modulith.events.externalization.enabled", - havingValue = "true", - matchIfMissing = true) -class SnsEventExternalizerConfiguration { - - private static final Logger logger = LoggerFactory.getLogger(SnsEventExternalizerConfiguration.class); - - @Bean - DelegatingEventExternalizer snsEventExternalizer(EventExternalizationConfiguration configuration, - SnsOperations operations, BeanFactory factory) { - - logger.debug("Registering domain event externalization to SNS…"); - - logger.warn(""" - The module 'spring-modulith-events-aws-sns' is deprecated since the version 1.3 of Spring Modulith. - To continue using AWS SNS integration, migrate to 'io.awspring.cloud:spring-cloud-aws-modulith-events-sns'. - """); - - var context = new StandardEvaluationContext(); - context.setBeanResolver(new BeanFactoryResolver(factory)); - - return new DelegatingEventExternalizer(configuration, (target, payload) -> { - - var routing = BrokerRouting.of(target, context); - var builder = SnsNotification.builder(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(payload), builder.build()); - - return CompletableFuture.completedFuture(null); - }); - } -} diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/src/main/java/org/springframework/modulith/events/aws/sns/package-info.java b/spring-modulith-events/spring-modulith-events-aws-sns/src/main/java/org/springframework/modulith/events/aws/sns/package-info.java deleted file mode 100644 index 5d6526cf..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sns/src/main/java/org/springframework/modulith/events/aws/sns/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * AWS SNS event externalization support. - */ -@org.springframework.lang.NonNullApi -package org.springframework.modulith.events.aws.sns; diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/LICENSE b/spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/LICENSE deleted file mode 100644 index d6456956..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/NOTICE b/spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/NOTICE deleted file mode 100644 index ba40f053..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -Spring Modulith ${project.version} -Copyright (c) 2021-2024 Broadcom, Inc. - -This product is licensed to you under the Apache License, Version 2.0 -(the "License"). You may not use this product except in compliance with -the License. diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 16c99bfe..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sns/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.springframework.modulith.events.aws.sns.SnsEventExternalizerConfiguration diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/src/test/java/org/springframework/modulith/events/aws/sns/SnsEventExternalizerConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-aws-sns/src/test/java/org/springframework/modulith/events/aws/sns/SnsEventExternalizerConfigurationIntegrationTests.java deleted file mode 100644 index b264af77..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sns/src/test/java/org/springframework/modulith/events/aws/sns/SnsEventExternalizerConfigurationIntegrationTests.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2023-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.modulith.events.aws.sns; - -import static org.assertj.core.api.Assertions.*; -import static org.mockito.Mockito.*; - -import io.awspring.cloud.sns.core.SnsOperations; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.modulith.events.EventExternalizationConfiguration; -import org.springframework.modulith.events.support.DelegatingEventExternalizer; - -/** - * Integration tests for {@link SnsEventExternalizerConfiguration}. - * - * @author Maciej Walkowiak - * @since 1.1 - */ -class SnsEventExternalizerConfigurationIntegrationTests { - - @Test // GH-344 - void registersExternalizerByDefault() { - - basicSetup() - .run(ctxt -> { - assertThat(ctxt).hasSingleBean(DelegatingEventExternalizer.class); - }); - } - - @Test // GH-344 - void disablesExternalizationIfConfigured() { - - basicSetup() - .withPropertyValues("spring.modulith.events.externalization.enabled=false") - .run(ctxt -> { - assertThat(ctxt).doesNotHaveBean(DelegatingEventExternalizer.class); - }); - } - - private ApplicationContextRunner basicSetup() { - - return new ApplicationContextRunner() - .withConfiguration( - AutoConfigurations.of(SnsEventExternalizerConfiguration.class)) - .withBean(EventExternalizationConfiguration.class, () -> EventExternalizationConfiguration.disabled()) - .withBean(SnsOperations.class, () -> mock(SnsOperations.class)); - } -} diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/src/test/java/org/springframework/modulith/events/aws/sns/SnsEventPublicationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-aws-sns/src/test/java/org/springframework/modulith/events/aws/sns/SnsEventPublicationIntegrationTests.java deleted file mode 100644 index 6ee4d9f6..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sns/src/test/java/org/springframework/modulith/events/aws/sns/SnsEventPublicationIntegrationTests.java +++ /dev/null @@ -1,171 +0,0 @@ -/* - * Copyright 2023-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.modulith.events.aws.sns; - -import static org.assertj.core.api.Assertions.*; -import static org.awaitility.Awaitility.*; - -import lombok.RequiredArgsConstructor; -import lombok.Value; -import software.amazon.awssdk.services.sns.SnsClient; -import software.amazon.awssdk.services.sqs.SqsAsyncClient; -import software.amazon.awssdk.services.sqs.model.QueueAttributeName; - -import java.util.Map; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.context.annotation.Bean; -import org.springframework.modulith.events.ApplicationModuleListener; -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; - -/** - * Integration tests for SQS-based event publication. - * - * @author Maciej Walkowiak - * @author Oliver Drotbohm - */ -@SpringBootTest -class SnsEventPublicationIntegrationTests { - - @Autowired TestPublisher publisher; - @Autowired SnsClient snsClient; - @Autowired SqsAsyncClient sqsAsyncClient; - - @SpringBootApplication - static class TestConfiguration { - - @Bean - LocalStackContainer localStackContainer() { - return new LocalStackContainer(DockerImageName.parse("localstack/localstack:latest")); - } - - @Bean - DynamicPropertyRegistrar localstackDynamicProperties(LocalStackContainer localstack) { - - return registry -> { - - registry.add("spring.cloud.aws.endpoint", localstack::getEndpoint); - registry.add("spring.cloud.aws.credentials.access-key", localstack::getAccessKey); - registry.add("spring.cloud.aws.credentials.secret-key", localstack::getSecretKey); - registry.add("spring.cloud.aws.region.static", localstack::getRegion); - }; - } - - @Bean - TestPublisher testPublisher(ApplicationEventPublisher publisher) { - return new TestPublisher(publisher); - } - - @Bean - TestListener testListener() { - return new TestListener(); - } - } - - @Test // GH-344 - void publishesEventToSns() { - - var topicArn = snsClient.createTopic(request -> request.name("target")).topicArn(); - - var queueUrl = sqsAsyncClient.createQueue(request -> request.queueName("queue")) - .join() - .queueUrl(); - - var queueArn = sqsAsyncClient - .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)); - - publisher.publishEvent(); - - await().untilAsserted(() -> { - - var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl)).join(); - - assertThat(response.hasMessages()).isTrue(); - }); - } - - @Test // GH-344 - void publishesEventWithGroupIdToSns() { - - var topicArn = snsClient.createTopic(request -> request.name("target.fifo") - .attributes(Map.of( - "FifoTopic", "true", - "ContentBasedDeduplication", "true"))) - .topicArn(); - - var queueUrl = sqsAsyncClient.createQueue(request -> request.queueName("queue.fifo") - .attributes(Map.of(QueueAttributeName.FIFO_QUEUE, "true"))) - .join() - .queueUrl(); - - var queueArn = sqsAsyncClient - .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)); - - publisher.publishEventWithKey(); - - await().untilAsserted(() -> { - var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl)).join(); - assertThat(response.hasMessages()).isTrue(); - }); - } - - @Externalized("target") - static class TestEvent {} - - @Value - @Externalized("target.fifo::#{getKey()}") - static class TestEventWithKey { - String key; - } - - @RequiredArgsConstructor - static class TestPublisher { - - private final ApplicationEventPublisher events; - - @Transactional - void publishEvent() { - events.publishEvent(new TestEvent()); - } - - @Transactional - void publishEventWithKey() { - events.publishEvent(new TestEventWithKey("aKey")); - } - } - - static class TestListener { - - @ApplicationModuleListener - void on(TestEvent event) {} - - @ApplicationModuleListener - void on(TestEventWithKey event) {} - } -} diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/src/test/resources/application.properties b/spring-modulith-events/spring-modulith-events-aws-sns/src/test/resources/application.properties deleted file mode 100644 index 79d64cb2..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sns/src/test/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.modulith.events.jdbc.schema-initialization.enabled=true diff --git a/spring-modulith-events/spring-modulith-events-aws-sns/src/test/resources/logback.xml b/spring-modulith-events/spring-modulith-events-aws-sns/src/test/resources/logback.xml deleted file mode 100644 index 48661bd1..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sns/src/test/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/pom.xml b/spring-modulith-events/spring-modulith-events-aws-sqs/pom.xml deleted file mode 100644 index bc6638e2..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/pom.xml +++ /dev/null @@ -1,84 +0,0 @@ - - - 4.0.0 - - - org.springframework.modulith - spring-modulith-events - 1.4.0-SNAPSHOT - - - Spring Modulith - Events - AWS SQS support - spring-modulith-events-aws-sqs - - - org.springframework.modulith.events.aws.sqs - - - - - - org.springframework.modulith - spring-modulith-api - ${project.version} - - - - org.springframework.modulith - spring-modulith-events-core - ${project.version} - - - - io.awspring.cloud - spring-cloud-aws-sqs - - - - - - org.springframework.modulith - spring-modulith-starter-jdbc - ${project.version} - test - - - - com.h2database - h2 - test - - - - org.springframework.boot - spring-boot-starter-json - test - - - - org.springframework.boot - spring-boot-starter-test - test - - - - org.springframework.boot - spring-boot-testcontainers - test - - - - io.awspring.cloud - spring-cloud-aws-starter-sqs - test - - - - org.testcontainers - localstack - test - - - - - diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/java/org/springframework/modulith/events/aws/sqs/SqsEventExternalizerConfiguration.java b/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/java/org/springframework/modulith/events/aws/sqs/SqsEventExternalizerConfiguration.java deleted file mode 100644 index 81977e47..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/java/org/springframework/modulith/events/aws/sqs/SqsEventExternalizerConfiguration.java +++ /dev/null @@ -1,84 +0,0 @@ -/* - * Copyright 2023-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.modulith.events.aws.sqs; - -import io.awspring.cloud.sqs.operations.SqsOperations; -import io.awspring.cloud.sqs.operations.SqsTemplate; - -import java.util.concurrent.CompletableFuture; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.BeanFactory; -import org.springframework.boot.autoconfigure.AutoConfiguration; -import org.springframework.boot.autoconfigure.AutoConfigureAfter; -import org.springframework.boot.autoconfigure.condition.ConditionalOnClass; -import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; -import org.springframework.context.annotation.Bean; -import org.springframework.context.expression.BeanFactoryResolver; -import org.springframework.expression.spel.support.StandardEvaluationContext; -import org.springframework.modulith.events.EventExternalizationConfiguration; -import org.springframework.modulith.events.config.EventExternalizationAutoConfiguration; -import org.springframework.modulith.events.support.BrokerRouting; -import org.springframework.modulith.events.support.DelegatingEventExternalizer; - -/** - * Auto-configuration to set up a {@link DelegatingEventExternalizer} to externalize events to SQS. - * - * @author Maciej Walkowiak - * @author Oliver Drotbohm - * @since 1.1 - */ -@AutoConfiguration -@AutoConfigureAfter(EventExternalizationAutoConfiguration.class) -@ConditionalOnClass(SqsTemplate.class) -@ConditionalOnProperty(name = "spring.modulith.events.externalization.enabled", - havingValue = "true", - matchIfMissing = true) -class SqsEventExternalizerConfiguration { - - private static final Logger logger = LoggerFactory.getLogger(SqsEventExternalizerConfiguration.class); - - @Bean - DelegatingEventExternalizer sqsEventExternalizer(EventExternalizationConfiguration configuration, - SqsOperations operations, BeanFactory factory) { - - logger.debug("Registering domain event externalization to SQS…"); - - logger.warn(""" - The module 'spring-modulith-events-aws-sqs' is deprecated since the version 1.3 of Spring Modulith. - To continue using AWS SQS integration, migrate to 'io.awspring.cloud:spring-cloud-aws-modulith-events-sqs'. - """); - - var context = new StandardEvaluationContext(); - context.setBeanResolver(new BeanFactoryResolver(factory)); - - return new DelegatingEventExternalizer(configuration, (target, payload) -> { - - var routing = BrokerRouting.of(target, context); - - return CompletableFuture.completedFuture(operations.send(sqsSendOptions -> { - - var options = sqsSendOptions.queue(routing.getTarget(payload)).payload(payload); - var key = routing.getKey(payload); - - if (key != null) { - options.messageGroupId(key); - } - })); - }); - } -} diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/java/org/springframework/modulith/events/aws/sqs/package-info.java b/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/java/org/springframework/modulith/events/aws/sqs/package-info.java deleted file mode 100644 index 2e5094e3..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/java/org/springframework/modulith/events/aws/sqs/package-info.java +++ /dev/null @@ -1,5 +0,0 @@ -/** - * AWS SQS event externalization support. - */ -@org.springframework.lang.NonNullApi -package org.springframework.modulith.events.aws.sqs; diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/LICENSE b/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/LICENSE deleted file mode 100644 index d6456956..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/LICENSE +++ /dev/null @@ -1,202 +0,0 @@ - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - - APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - - Copyright [yyyy] [name of copyright owner] - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/NOTICE b/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/NOTICE deleted file mode 100644 index ba40f053..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -Spring Modulith ${project.version} -Copyright (c) 2021-2024 Broadcom, Inc. - -This product is licensed to you under the Apache License, Version 2.0 -(the "License"). You may not use this product except in compliance with -the License. diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports deleted file mode 100644 index 4e80bd15..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ /dev/null @@ -1 +0,0 @@ -org.springframework.modulith.events.aws.sqs.SqsEventExternalizerConfiguration diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/java/org/springframework/modulith/events/aws/sqs/SqsEventExternalizerConfigurationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/java/org/springframework/modulith/events/aws/sqs/SqsEventExternalizerConfigurationIntegrationTests.java deleted file mode 100644 index f6809708..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/java/org/springframework/modulith/events/aws/sqs/SqsEventExternalizerConfigurationIntegrationTests.java +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Copyright 2023-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.modulith.events.aws.sqs; - -import static org.assertj.core.api.Assertions.*; -import static org.mockito.Mockito.*; - -import io.awspring.cloud.sqs.operations.SqsOperations; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.autoconfigure.AutoConfigurations; -import org.springframework.boot.test.context.runner.ApplicationContextRunner; -import org.springframework.modulith.events.EventExternalizationConfiguration; -import org.springframework.modulith.events.support.DelegatingEventExternalizer; - -/** - * Integration tests for {@link SqsEventExternalizerConfiguration}. - * - * @author Maciej Walkowiak - * @since 1.1 - */ -class SqsEventExternalizerConfigurationIntegrationTests { - - @Test // GH-344 - void registersExternalizerByDefault() { - - basicSetup() - .run(ctxt -> { - assertThat(ctxt).hasSingleBean(DelegatingEventExternalizer.class); - }); - } - - @Test // GH-344 - void disablesExternalizationIfConfigured() { - - basicSetup() - .withPropertyValues("spring.modulith.events.externalization.enabled=false") - .run(ctxt -> { - assertThat(ctxt).doesNotHaveBean(DelegatingEventExternalizer.class); - }); - } - - private ApplicationContextRunner basicSetup() { - - return new ApplicationContextRunner() - .withConfiguration( - AutoConfigurations.of(SqsEventExternalizerConfiguration.class)) - .withBean(EventExternalizationConfiguration.class, () -> EventExternalizationConfiguration.disabled()) - .withBean(SqsOperations.class, () -> mock(SqsOperations.class)); - } -} diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/java/org/springframework/modulith/events/aws/sqs/SqsEventPublicationIntegrationTests.java b/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/java/org/springframework/modulith/events/aws/sqs/SqsEventPublicationIntegrationTests.java deleted file mode 100644 index fbca42ae..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/java/org/springframework/modulith/events/aws/sqs/SqsEventPublicationIntegrationTests.java +++ /dev/null @@ -1,151 +0,0 @@ -/* - * Copyright 2023-2025 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * https://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.modulith.events.aws.sqs; - -import static org.assertj.core.api.Assertions.*; -import static org.awaitility.Awaitility.*; - -import lombok.RequiredArgsConstructor; -import lombok.Value; -import software.amazon.awssdk.services.sqs.SqsAsyncClient; -import software.amazon.awssdk.services.sqs.model.QueueAttributeName; - -import java.util.Map; - -import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.autoconfigure.SpringBootApplication; -import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.context.annotation.Bean; -import org.springframework.modulith.events.ApplicationModuleListener; -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; - -/** - * Integration tests for SQS-based event publication. - * - * @author Maciej Walkowiak - * @author Oliver Drotbohm - * @since 1.1 - */ -@SpringBootTest -class SqsEventPublicationIntegrationTests { - - @Autowired TestPublisher publisher; - @Autowired SqsAsyncClient sqsAsyncClient; - - @SpringBootApplication - static class TestConfiguration { - - @Bean - LocalStackContainer localStackContainer() { - return new LocalStackContainer(DockerImageName.parse("localstack/localstack:latest")); - } - - @Bean - DynamicPropertyRegistrar localStackDynamicProperties(LocalStackContainer localstack) { - - return registry -> { - - registry.add("spring.cloud.aws.endpoint", localstack::getEndpoint); - registry.add("spring.cloud.aws.credentials.access-key", localstack::getAccessKey); - registry.add("spring.cloud.aws.credentials.secret-key", localstack::getSecretKey); - registry.add("spring.cloud.aws.region.static", localstack::getRegion); - }; - } - - @Bean - TestPublisher testPublisher(ApplicationEventPublisher publisher) { - return new TestPublisher(publisher); - } - - @Bean - TestListener testListener() { - return new TestListener(); - } - } - - @Test - void publishesEventToSqs() throws Exception { - - var queueUrl = sqsAsyncClient.createQueue(request -> request.queueName("target")) - .join() - .queueUrl(); - - publisher.publishEvent(); - - await().untilAsserted(() -> { - var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl)).join(); - - assertThat(response.hasMessages()).isTrue(); - }); - } - - @Test - void publishesEventWithGroupIdToSqs() throws Exception { - - var queueUrl = sqsAsyncClient.createQueue(request -> request.queueName("target.fifo") - .attributes(Map.of(QueueAttributeName.FIFO_QUEUE, "true"))) - .join() - .queueUrl(); - - publisher.publishEventWithKey(); - - await().untilAsserted(() -> { - var response = sqsAsyncClient.receiveMessage(r -> r.queueUrl(queueUrl)).join(); - - assertThat(response.hasMessages()).isTrue(); - }); - } - - @Externalized("target") - static class TestEvent {} - - @Value - @Externalized("target.fifo::#{getKey()}") - static class TestEventWithKey { - String key; - } - - @RequiredArgsConstructor - static class TestPublisher { - - private final ApplicationEventPublisher events; - - @Transactional - void publishEvent() { - events.publishEvent(new TestEvent()); - } - - @Transactional - void publishEventWithKey() { - events.publishEvent(new TestEventWithKey("aKey")); - } - } - - static class TestListener { - - @ApplicationModuleListener - void on(TestEvent event) {} - - @ApplicationModuleListener - void on(TestEventWithKey event) {} - } -} diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/resources/application.properties b/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/resources/application.properties deleted file mode 100644 index 62b9893f..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/resources/application.properties +++ /dev/null @@ -1,2 +0,0 @@ -spring.artemis.embedded.topics=target -spring.modulith.events.jdbc.schema-initialization.enabled=true diff --git a/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/resources/logback.xml b/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/resources/logback.xml deleted file mode 100644 index f98102e7..00000000 --- a/spring-modulith-events/spring-modulith-events-aws-sqs/src/test/resources/logback.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/src/docs/antora/modules/ROOT/pages/appendix.adoc b/src/docs/antora/modules/ROOT/pages/appendix.adoc index 1b8b888b..4a780338 100644 --- a/src/docs/antora/modules/ROOT/pages/appendix.adoc +++ b/src/docs/antora/modules/ROOT/pages/appendix.adoc @@ -224,18 +224,6 @@ a|* `spring-modulith-docs` |`spring-modulith-test`|`test`|Integration testing support. Find more details xref:testing.adoc[here]. |=== -[appendix] -[[deprecated-modules]] -== Deprecated modules - -.Deprecated modules table -[cols="2,1,3", options="header, unbreakable"] -|=== -|Module|Deprecated since|Description -|`spring-modulith-events-aws-sns`|`1.3`|Please migrate to `io.awspring.cloud:spring-cloud-aws-modulith-events-sns`. See https://github.com/awspring/spring-cloud-aws/tree/main/spring-cloud-aws-sns[this link] -|`spring-modulith-events-aws-sqs`|`1.3`|Please migrate to `io.awspring.cloud:spring-cloud-aws-modulith-events-sqs`. See https://github.com/awspring/spring-cloud-aws/tree/main/spring-cloud-aws-sqs[this link] -|=== - [appendix] [[schemas]] == Event publication registry schemas diff --git a/src/docs/antora/modules/ROOT/pages/events.adoc b/src/docs/antora/modules/ROOT/pages/events.adoc index b8a02060..8cc6645b 100644 --- a/src/docs/antora/modules/ROOT/pages/events.adoc +++ b/src/docs/antora/modules/ROOT/pages/events.adoc @@ -366,18 +366,6 @@ The logical routing key will be used as AMQP routing key. |Uses Spring's core JMS support. Does not support routing keys. -|SQS -|`spring-modulith-events-aws-sqs` -|Uses Spring Cloud AWS SQS support. -The logical routing key will be used as SQS message group id. -When routing key is set, requires SQS queue to be configured as a FIFO queue. - -|SNS -|`spring-modulith-events-aws-sns` -|Uses Spring Cloud AWS SNS support. -The logical routing key will be used as SNS message group id. -When routing key is set, requires SNS to be configured as a FIFO topic with content based deduplication enabled. - |Spring Messaging |`spring-modulith-events-messaging` |Uses Spring's core `Message` and `MessageChannel` support.