chore(deps): Bump io-awspring-cloud from 3.4.2 to 4.0.0

.github/workflows/springwolf-plugins.yml

@@ -25,7 +25,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        plugin: [ "amqp", "cloud-stream", "jms", "kafka", "sns", "stomp" ] # "sqs" , re-enable, when update available: https://github.com/awspring/spring-cloud-aws/milestone/42
+        plugin: [ "amqp", "cloud-stream", "jms", "kafka", "sns", "sqs", "stomp" ]
 
     env:
       plugin: springwolf-plugins/springwolf-${{ matrix.plugin }}-plugin

build.gradle

@@ -32,7 +32,7 @@ var plugins = [
         'springwolf-jms',
         'springwolf-kafka',
         'springwolf-sns',
-//        'springwolf-sqs', re-enable, when update available: https://github.com/awspring/spring-cloud-aws/milestone/42
+        'springwolf-sqs',
         'springwolf-stomp'
 ]
 

gradle/libs.versions.toml

@@ -3,7 +3,7 @@ activemq = "6.2.0"
 cutterslade-analyze = "1.10.0"
 docker-spring-boot = "10.0.0"
 gradle-nexus-publish-plugin = "2.0.0"
-io-awspring-cloud = "3.4.2"
+io-awspring-cloud = "4.0.0"
 io-confluent = "8.1.1"
 io-swagger-core-v3 = "2.2.40"
 jackson-core = "2.21.0"

settings.gradle

@@ -8,15 +8,15 @@ include(
         'springwolf-plugins:springwolf-jms-plugin',
         'springwolf-plugins:springwolf-kafka-plugin',
         'springwolf-plugins:springwolf-sns-plugin',
-//        'springwolf-plugins:springwolf-sqs-plugin', re-enable, when update available: https://github.com/awspring/spring-cloud-aws/milestone/42
+        'springwolf-plugins:springwolf-sqs-plugin',
         'springwolf-plugins:springwolf-stomp-plugin',
         'springwolf-examples:e2e',
         'springwolf-examples:springwolf-amqp-example',
         'springwolf-examples:springwolf-cloud-stream-example',
         'springwolf-examples:springwolf-jms-example',
         'springwolf-examples:springwolf-kafka-example',
         'springwolf-examples:springwolf-sns-example',
-//        'springwolf-examples:springwolf-sqs-example', re-enable, when update available: https://github.com/awspring/spring-cloud-aws/milestone/42
+        'springwolf-examples:springwolf-sqs-example',
         'springwolf-examples:springwolf-stomp-example',
         'springwolf-bindings:springwolf-amqp-binding',
         'springwolf-bindings:springwolf-googlepubsub-binding',
@@ -37,6 +37,6 @@ project(':springwolf-plugins:springwolf-cloud-stream-plugin').name = 'springwolf
 project(':springwolf-plugins:springwolf-jms-plugin').name = 'springwolf-jms'
 project(':springwolf-plugins:springwolf-kafka-plugin').name = 'springwolf-kafka'
 project(':springwolf-plugins:springwolf-sns-plugin').name = 'springwolf-sns'
-//project(':springwolf-plugins:springwolf-sqs-plugin').name = 'springwolf-sqs', re-enable, when update available: https://github.com/awspring/spring-cloud-aws/milestone/42
+project(':springwolf-plugins:springwolf-sqs-plugin').name = 'springwolf-sqs'
 project(':springwolf-plugins:springwolf-stomp-plugin').name = 'springwolf-stomp'
 

springwolf-plugins/springwolf-amqp-plugin/build.gradle

@@ -34,17 +34,15 @@ dependencies {
 
     testAnnotationProcessor libs.lombok
 
-    testImplementation libs.assertj.core
+    testImplementation libs.jackson.databind
 
+    testImplementation libs.assertj.core
     testImplementation libs.mockito.core
-    testImplementation libs.jackson.databind
 
     testImplementation libs.spring.boot.test
     testImplementation libs.spring.beans
     testImplementation libs.spring.test
 
-    testAnnotationProcessor libs.lombok
-
     testImplementation libs.junit.jupiter.api
     testRuntimeOnly libs.junit.jupiter
     testRuntimeOnly libs.junit.plattform.launcher

springwolf-plugins/springwolf-jms-plugin/build.gradle

@@ -36,9 +36,9 @@ dependencies {
     testRuntimeOnly libs.spring.boot.starter.webmvc
 
     testImplementation libs.jackson.annotations
+    testImplementation libs.jackson.databind
 
     testImplementation libs.assertj.core
-
     testImplementation libs.mockito.core
     testImplementation libs.mockito.junit.jupiter
 
@@ -47,7 +47,6 @@ dependencies {
     testImplementation libs.spring.boot.test
     testImplementation libs.spring.boot.webmvc.test
 
-    testImplementation libs.jackson.databind
     testAnnotationProcessor libs.lombok
     testCompileOnly libs.lombok
 

springwolf-plugins/springwolf-kafka-plugin/build.gradle

@@ -45,6 +45,7 @@ dependencies {
     testImplementation libs.jackson.annotations
     testImplementation libs.jackson.databind
 
+    testImplementation libs.assertj.core
     testImplementation libs.mockito.core
     testImplementation libs.mockito.junit.jupiter
 
@@ -53,8 +54,6 @@ dependencies {
     testImplementation libs.spring.boot.webmvc.test
     testImplementation libs.spring.test
 
-    testImplementation libs.assertj.core
-
     testImplementation libs.junit.jupiter.api
     testRuntimeOnly libs.junit.jupiter
     testRuntimeOnly libs.junit.plattform.launcher

springwolf-plugins/springwolf-sns-plugin/build.gradle

@@ -33,6 +33,8 @@ dependencies {
 
     testAnnotationProcessor libs.lombok
 
+    testImplementation libs.jackson.databind
+
     testImplementation libs.assertj.core
     testImplementation libs.mockito.core
 
@@ -41,8 +43,6 @@ dependencies {
     testImplementation libs.spring.core
     testImplementation libs.spring.test
 
-    testAnnotationProcessor libs.lombok
-
     testImplementation libs.junit.jupiter.api
     testRuntimeOnly libs.junit.jupiter
     testRuntimeOnly libs.junit.plattform.launcher

springwolf-plugins/springwolf-sqs-plugin/build.gradle

@@ -35,15 +35,15 @@ dependencies {
 
     testAnnotationProcessor libs.lombok
 
+    testImplementation libs.jackson.databind
+
     testImplementation libs.assertj.core
     testImplementation libs.mockito.core
 
     testImplementation libs.spring.boot.test
     testImplementation libs.spring.beans
     testImplementation libs.spring.test
 
-    testAnnotationProcessor libs.lombok
-
     testImplementation libs.junit.jupiter.api
     testRuntimeOnly libs.junit.jupiter
     testRuntimeOnly libs.junit.plattform.launcher

springwolf-plugins/springwolf-sqs-plugin/src/main/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsScannerConfiguration.java

@@ -15,8 +15,8 @@
 import io.github.springwolf.core.asyncapi.scanners.common.message.SpringAnnotationMessageService;
 import io.github.springwolf.core.asyncapi.scanners.common.operation.SpringAnnotationOperationService;
 import io.github.springwolf.core.asyncapi.scanners.common.payload.PayloadMethodParameterService;
+import io.github.springwolf.core.asyncapi.scanners.operations.OperationCustomizer;
 import io.github.springwolf.core.asyncapi.scanners.operations.OperationsInClassScannerAdapter;
-import io.github.springwolf.core.asyncapi.scanners.operations.annotations.OperationCustomizer;
 import io.github.springwolf.core.asyncapi.scanners.operations.annotations.SpringAnnotationMethodLevelOperationsScanner;
 import io.github.springwolf.core.standalone.StandaloneConfiguration;
 import io.github.springwolf.plugins.sqs.asyncapi.scanners.bindings.SqsBindingFactory;

springwolf-plugins/springwolf-sqs-plugin/src/test/java/io/github/springwolf/plugins/sqs/configuration/SpringwolfSqsProducerConfigurationIntegrationTest.java

@@ -37,7 +37,15 @@ public class SpringwolfSqsProducerConfigurationIntegrationTest {
                 "springwolf.docket.base-package=io.github.springwolf.examples",
                 "springwolf.plugin.sqs.publishing.enabled=true"
             })
-    @MockitoBean(types = {SpringwolfClassScanner.class, ComponentService.class, HeaderClassExtractor.class, PayloadMethodParameterService.class, StringValueResolver.class, SqsTemplate.class})
+    @MockitoBean(
+            types = {
+                SpringwolfClassScanner.class,
+                ComponentsService.class,
+                HeaderClassExtractor.class,
+                PayloadMethodParameterService.class,
+                StringValueResolver.class,
+                SqsTemplate.class
+            })
     @Nested
     class SqsProducerWillBeCreatedIfEnabledTest {
         @Autowired
@@ -67,7 +75,15 @@ void springwolfSqsProducerShouldBePresentInSpringContext() {
                 "springwolf.docket.base-package=io.github.springwolf.examples",
                 "springwolf.plugin.sqs.publishing.enabled=false"
             })
-    @MockitoBean(types = {SpringwolfClassScanner.class, ComponentService.class, HeaderClassExtractor.class, PayloadMethodParameterService.class, StringValueResolver.class, SqsTemplate.class})
+    @MockitoBean(
+            types = {
+                SpringwolfClassScanner.class,
+                ComponentsService.class,
+                HeaderClassExtractor.class,
+                PayloadMethodParameterService.class,
+                StringValueResolver.class,
+                SqsTemplate.class
+            })
     @Nested
     class SqsProducerWillNotBeCreatedIfDisabledTest {
         @Autowired
@@ -82,5 +98,4 @@ void springwolfSqsProducerShouldNotBePresentInSpringContext() {
             assertThat(springwolfSqsController).isNotPresent();
         }
     }
-
 }