refs #408: upgrade dependencies (#409)

Author: JaidenAshmore

build.gradle.kts

@@ -1,7 +1,6 @@
 import com.jashmore.gradle.JacocoCoverallsPlugin
 import com.jashmore.gradle.ReleasePlugin
 import com.jashmore.gradle.release
-import io.gitlab.arturbosch.detekt.detekt
 
 plugins {
     java
@@ -12,7 +11,6 @@ plugins {
     id("com.github.spotbugs")
     id("com.jashmore.gradle.github.release")
     id("org.jlleitschuh.gradle.ktlint") apply false
-    id("io.gitlab.arturbosch.detekt") apply false
     id("org.unbroken-dome.test-sets") version "4.0.0"
 }
 
@@ -46,7 +44,6 @@ subprojects {
         }
     } else {
         apply(plugin = "org.jlleitschuh.gradle.ktlint")
-        apply(plugin = "io.gitlab.arturbosch.detekt")
     }
 
     dependencies {
@@ -86,12 +83,6 @@ subprojects {
                 excludeFilter.set(file("${project.rootDir}/configuration/spotbugs/bugsExcludeFilter.xml"))
             }
         }
-    } else {
-        detekt {
-            failFast = true
-            buildUponDefaultConfig = true
-            config = files("${project.rootDir}/configuration/detekt/detekt-configuration.yml")
-        }
     }
 
     tasks.withType<Test> {

configuration/detekt/detekt-configuration.yml

@@ -10,5 +10,6 @@
     </Match>
     <Match>
         <Source name="~.*generated-sources.*" />
+        <Source name="~.*generated-test-sources.*" />
     </Match>
 </FindBugsFilter>

configuration/spotbugs/bugsExcludeFilter.xml

@@ -23,6 +23,7 @@
 import software.amazon.awssdk.core.exception.SdkInterruptedException;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
 import software.amazon.awssdk.services.sqs.model.Message;
+import software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName;
 import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
@@ -187,7 +188,7 @@ private ReceiveMessageRequest buildReceiveMessageRequest(final int numberOfMessa
         final ReceiveMessageRequest.Builder requestBuilder = ReceiveMessageRequest
             .builder()
             .queueUrl(queueProperties.getQueueUrl())
-            .attributeNames(QueueAttributeName.ALL)
+            .messageSystemAttributeNames(MessageSystemAttributeName.ALL)
             .messageAttributeNames(QueueAttributeName.ALL.toString())
             .maxNumberOfMessages(numberOfMessagesToObtain)
             .waitTimeSeconds(MAX_SQS_RECEIVE_WAIT_TIME_IN_SECONDS);

core/src/main/java/com/jashmore/sqs/retriever/batching/BatchingMessageRetriever.java

@@ -20,6 +20,7 @@
 import software.amazon.awssdk.core.exception.SdkInterruptedException;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
 import software.amazon.awssdk.services.sqs.model.Message;
+import software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName;
 import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
@@ -166,7 +167,7 @@ private ReceiveMessageRequest buildReceiveMessageRequest() {
         final ReceiveMessageRequest.Builder requestBuilder = ReceiveMessageRequest
             .builder()
             .queueUrl(queueProperties.getQueueUrl())
-            .attributeNames(QueueAttributeName.ALL)
+            .messageSystemAttributeNames(MessageSystemAttributeName.ALL)
             .messageAttributeNames(QueueAttributeName.ALL.toString())
             .waitTimeSeconds(MAX_SQS_RECEIVE_WAIT_TIME_IN_SECONDS)
             .maxNumberOfMessages(numberOfMessagesToObtain);

core/src/main/java/com/jashmore/sqs/retriever/prefetch/PrefetchingMessageRetriever.java

@@ -27,7 +27,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
 import software.amazon.awssdk.services.sqs.model.Message;
-import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
+import software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName;
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
 
@@ -453,8 +453,8 @@ void allMessageAttributesShouldBeDownloadedWhenRequestingMessages() {
             ReceiveMessageRequest.class
         );
         verify(sqsAsyncClient).receiveMessage(receiveMessageRequestArgumentCaptor.capture());
-        assertThat(receiveMessageRequestArgumentCaptor.getValue().messageAttributeNames())
-            .containsExactly(QueueAttributeName.ALL.toString());
+        assertThat(receiveMessageRequestArgumentCaptor.getValue().messageSystemAttributeNames())
+            .containsExactly(MessageSystemAttributeName.ALL);
     }
 
     @Test
@@ -483,7 +483,8 @@ void allMessageSystemAttributesShouldBeDownloadedWhenRequestingMessages() {
             ReceiveMessageRequest.class
         );
         verify(sqsAsyncClient).receiveMessage(receiveMessageRequestArgumentCaptor.capture());
-        assertThat(receiveMessageRequestArgumentCaptor.getValue().attributeNames()).containsExactly(QueueAttributeName.ALL);
+        assertThat(receiveMessageRequestArgumentCaptor.getValue().messageSystemAttributeNames())
+            .containsExactly(MessageSystemAttributeName.ALL);
     }
 
     @Test

core/src/test/java/com/jashmore/sqs/retriever/batching/BatchingMessageRetrieverTest.java

@@ -37,6 +37,7 @@
 import software.amazon.awssdk.core.exception.SdkInterruptedException;
 import software.amazon.awssdk.services.sqs.SqsAsyncClient;
 import software.amazon.awssdk.services.sqs.model.Message;
+import software.amazon.awssdk.services.sqs.model.MessageSystemAttributeName;
 import software.amazon.awssdk.services.sqs.model.QueueAttributeName;
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageRequest;
 import software.amazon.awssdk.services.sqs.model.ReceiveMessageResponse;
@@ -406,8 +407,7 @@ void allMessageAttributesAreIncludedInMessagesWhenRetrieved() {
             ReceiveMessageRequest.class
         );
         verify(sqsAsyncClient).receiveMessage(receiveMessageRequestArgumentCaptor.capture());
-        assertThat(receiveMessageRequestArgumentCaptor.getValue().messageAttributeNames())
-            .containsExactly(QueueAttributeName.ALL.toString());
+        assertThat(receiveMessageRequestArgumentCaptor.getValue().messageAttributeNames()).contains(QueueAttributeName.ALL.toString());
     }
 
     @Test
@@ -428,7 +428,7 @@ void allMessageSystemAttributesAreIncludedInMessagesWhenRetrieved() {
             ReceiveMessageRequest.class
         );
         verify(sqsAsyncClient).receiveMessage(receiveMessageRequestArgumentCaptor.capture());
-        assertThat(receiveMessageRequestArgumentCaptor.getValue().attributeNames()).contains(QueueAttributeName.ALL);
+        assertThat(receiveMessageRequestArgumentCaptor.getValue().messageSystemAttributeNames()).contains(MessageSystemAttributeName.ALL);
     }
 
     @Test

core/src/test/java/com/jashmore/sqs/retriever/prefetch/PrefetchingMessageRetrieverTest.java

@@ -1,7 +1,7 @@
 # Spring - How to version message payload Schemas using Spring Cloud Schema Registry
 
 As your application grows over time the format of the data that needs to be sent in the SQS messages may change as well. To allow for
-these changes, the [Spring Cloud Schema Registry](https://cloud.spring.io/spring-cloud-static/spring-cloud-schema-registry/1.0.0.RC1/reference/html/spring-cloud-schema-registry.html)
+these changes, the [Spring Cloud Schema Registry](https://docs.spring.io/spring-cloud-schema-registry/docs/current/reference/html/spring-cloud-schema-registry.html)
 can be used to track the version of your schemas, allowing the SQS consumer to be able to interpret multiple versions of your payload.
 
 ## Full reference

doc/how-to-guides/spring/spring-how-to-version-payload-schemas-using-spring-cloud-schema-registry.md

@@ -29,7 +29,7 @@ private val log: Logger = LoggerFactory.getLogger("example")
 private val CONCURRENCY_LEVEL_PERIOD = Duration.ofSeconds(5)
 private const val CONCURRENCY_LIMIT = 10
 
-private val objectMapper = ObjectMapper().registerModule(KotlinModule())
+private val objectMapper = ObjectMapper().registerModule(KotlinModule.Builder().build())
 
 /**
  * This example shows the core framework being used to processing messages place onto the queue with a dynamic level of concurrency via the

examples/core-kotlin-example/src/main/kotlin/com/jashmore/sqs/examples/KotlinConcurrentBrokerExample.kt

@@ -2,7 +2,7 @@
 
 This example shows how you can consume messages which have been defined using an [Avro](https://avro.apache.org/docs/1.9.2/gettingstartedjava.html)
 Schema and
-the [Spring Cloud Schema Registry](https://cloud.spring.io/spring-cloud-static/spring-cloud-schema-registry/1.0.0.RC1/reference/html/spring-cloud-schema-registry.html).
+the [Spring Cloud Schema Registry](https://docs.spring.io/spring-cloud-schema-registry/docs/current/reference/html/spring-cloud-schema-registry.html).
 
 To find the corresponding code look in the [Spring Cloud Schema Registry Extension](../../extensions/spring-cloud-schema-registry-extension) module.