update :: sync sqs template spring 2..

Team-Ampersand · Nov 21, 2024 · f8614c1 · f8614c1
1 parent 2ad4e37
commit f8614c1
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 80 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -56,8 +56,9 @@ dependencies {
     // aws
     implementation(Dependencies.AWS_SES)
     implementation(Dependencies.KOTLIN_SES)
-    implementation(Dependencies.AWS_SQS)
-    implementation(platform(Dependencies.IO_AWS))
+    implementation("org.springframework.cloud:spring-cloud-aws-messaging:2.2.6.RELEASE")
+    implementation("org.springframework.cloud:spring-cloud-aws-autoconfigure:2.2.6.RELEASE")
+
 
 
     // query dsl

diff --git a/buildSrc/src/main/kotlin/Dependencies.kt b/buildSrc/src/main/kotlin/Dependencies.kt
@@ -47,7 +47,8 @@ object Dependencies {
     const val AWS_SES = "com.amazonaws:aws-java-sdk-ses:${DependencyVersions.AWS_SES_VERSION}"
     const val KOTLIN_SES = "org.springframework.cloud:spring-cloud-starter-aws"
     const val AWS_SQS = "io.awspring.cloud:spring-cloud-aws-starter-sqs"
-    const val IO_AWS = "io.awspring.cloud:spring-cloud-aws-dependencies:${DependencyVersions.IO_AWS}"
+    const val AWS_MESSAGING = "org.springframework.cloud:spring-cloud-aws-messaging:${DependencyVersions.IO_AWS}"
+    const val AWS_AUTOCONF = "org.springframework.cloud:spring-cloud-aws-autoconfigure::${DependencyVersions.IO_AWS}"
 
     // querydsl
     const val QUERY_DSL = "com.querydsl:querydsl-jpa:${DependencyVersions.QUERY_DSL_VERSION}"

diff --git a/buildSrc/src/main/kotlin/DependencyVersions.kt b/buildSrc/src/main/kotlin/DependencyVersions.kt
@@ -25,7 +25,7 @@ object DependencyVersions {
     // aws
     const val AWS_SES_VERSION = "1.12.347"
     const val KOTLIN_SES_VERSION = "0.16.0"
-    const val IO_AWS = "3.0.1"
+    const val IO_AWS = "2.4.0"
 
     // querydsl
     const val QUERY_DSL_VERSION = "5.0.0"

diff --git a/src/main/kotlin/com/dotori/v2/domain/music/listener/MusicApplicationEventListener.kt b/src/main/kotlin/com/dotori/v2/domain/music/listener/MusicApplicationEventListener.kt
@@ -2,7 +2,6 @@ package com.dotori.v2.domain.music.listener
 
 import com.dotori.v2.global.publisher.EventPublisher
 import com.dotori.v2.global.squirrel.MusicDotoriEvent
-import io.awspring.cloud.sqs.operations.SendResult
 import org.springframework.scheduling.annotation.Async
 import org.springframework.stereotype.Component
 import org.springframework.transaction.event.TransactionPhase
@@ -15,8 +14,8 @@ class MusicApplicationEventListener(
 
     @Async("squirrelTaskExecutor")
     @TransactionalEventListener(phase = TransactionPhase.AFTER_COMPLETION)
-    fun onEvent(event: MusicDotoriEvent): SendResult<String> {
-        return eventPublisher.publishEvent(event, event.eventType.toString())
+    fun onEvent(event: MusicDotoriEvent) {
+        eventPublisher.publishEvent(event, event.eventType.toString())
     }
 
 }
diff --git a/src/main/kotlin/com/dotori/v2/global/config/SQSConfig.kt b/src/main/kotlin/com/dotori/v2/global/config/SQSConfig.kt
diff --git a/src/main/kotlin/com/dotori/v2/global/publisher/EventPublisher.kt b/src/main/kotlin/com/dotori/v2/global/publisher/EventPublisher.kt
@@ -1,7 +1,5 @@
 package com.dotori.v2.global.publisher
 
-import io.awspring.cloud.sqs.operations.SendResult
-
 interface EventPublisher {
-    fun publishEvent(event: Any, eventType: String): SendResult<String>
+    fun publishEvent(event: Any, eventType: String)
 }
diff --git a/src/main/kotlin/com/dotori/v2/global/publisher/SQSEventPublisher.kt b/src/main/kotlin/com/dotori/v2/global/publisher/SQSEventPublisher.kt
@@ -1,23 +1,28 @@
 package com.dotori.v2.global.publisher
 
+import com.amazonaws.services.sqs.AmazonSQSAsync
 import com.fasterxml.jackson.databind.ObjectMapper
-import io.awspring.cloud.sqs.operations.SendResult
-import io.awspring.cloud.sqs.operations.SqsTemplate
+import org.slf4j.LoggerFactory
+import org.springframework.cloud.aws.messaging.core.QueueMessagingTemplate
+import org.springframework.messaging.support.MessageBuilder
 import org.springframework.stereotype.Component
 
 @Component
 class SQSEventPublisher(
     private val objectMapper: ObjectMapper,
-    private val sqsTemplate: SqsTemplate
+    private val amazonSQS: AmazonSQSAsync
 ) : EventPublisher {
 
-    override fun publishEvent(event: Any, eventType: String): SendResult<String> {
-        return sqsTemplate.send { sendOpsTo ->
-            sendOpsTo
-                .queue("squirrel-sqs")
-                .header("eventType", eventType)
-                .payload(objectMapper.writeValueAsString(event))
-        }
+    private val queueMessagingTemplate = QueueMessagingTemplate(amazonSQS)
+    private val log = LoggerFactory.getLogger(this::class.java.simpleName)
+
+    override fun publishEvent(event: Any, eventType: String) {
+        val message = MessageBuilder
+            .withPayload(objectMapper.writeValueAsString(event))
+            .setHeader("eventType", eventType)
+            .build()
+        log.info("publish event {} event-type {}", event, eventType)
+        queueMessagingTemplate.send("squirrel-sqs", message)
     }
 
 }