From de3817fd50bc99c75b1d16a5efc6d5b68a96c5cc Mon Sep 17 00:00:00 2001 From: Maverick Studer Date: Thu, 29 Aug 2024 16:12:39 +0200 Subject: [PATCH] Tenants retry logic and queue renames --- .../build.gradle.kts | 2 +- .../build.gradle.kts | 5 +++-- .../configuration/MessagingConfiguration.java | 20 +++---------------- 3 files changed, 7 insertions(+), 20 deletions(-) diff --git a/redaction-report-service-v1/redaction-report-service-api-v1/build.gradle.kts b/redaction-report-service-v1/redaction-report-service-api-v1/build.gradle.kts index 8b4ad00..2878a37 100644 --- a/redaction-report-service-v1/redaction-report-service-api-v1/build.gradle.kts +++ b/redaction-report-service-v1/redaction-report-service-api-v1/build.gradle.kts @@ -5,7 +5,7 @@ plugins { description = "redaction-report-service-api-v1" -val persistenceServiceVersion = "2.536.0" +val persistenceServiceVersion = "2.539.0" dependencies { implementation("io.github.openfeign:feign-core:12.2") diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts b/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts index c09ba07..2fd159c 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts +++ b/redaction-report-service-v1/redaction-report-service-server-v1/build.gradle.kts @@ -11,13 +11,13 @@ plugins { description = "redaction-service-server-v1" -val tenantCommonVersion = "0.28.0" +val tenantCommonVersion = "0.29.0" val springCommonsVersion = "2.1.0" val storageCommonsVersion = "2.45.0" val lifecycleCommonsVersion = "0.4.0" val poiVersion = "5.2.3" val metricCommonsVersion = "2.1.0" -val persistenceServiceVersion = "2.536.0" +val persistenceServiceVersion = "2.539.0" val springBootStarterVersion = "3.2.3" configurations { @@ -47,6 +47,7 @@ dependencies { implementation("org.apache.poi:poi-scratchpad:${poiVersion}") implementation("org.springframework.boot:spring-boot-starter-amqp:${springBootStarterVersion}") + implementation("io.github.openfeign:feign-core:12.2") implementation("org.springframework.cloud:spring-cloud-starter-openfeign:4.1.1") implementation("org.apache.commons:commons-lang3:3.12.0") diff --git a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/configuration/MessagingConfiguration.java b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/configuration/MessagingConfiguration.java index 611b6d7..28a8ada 100644 --- a/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/configuration/MessagingConfiguration.java +++ b/redaction-report-service-v1/redaction-report-service-server-v1/src/main/java/com/iqser/red/service/redaction/report/v1/server/configuration/MessagingConfiguration.java @@ -12,12 +12,12 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public class MessagingConfiguration { - public static final String REPORT_REQUEST_QUEUE_PREFIX = "report_request_queue"; + public static final String REPORT_REQUEST_QUEUE_PREFIX = "report_request"; public static final String REPORT_REQUEST_EXCHANGE = "report_request_exchange"; - public static final String REPORT_REQUEST_DLQ = "report_request_dlq"; + public static final String REPORT_REQUEST_DLQ = "report_request_error"; public static final String REPORT_RESPONSE_EXCHANGE = "report_response_exchange"; - public static final String REPORT_RESPONSE_DLQ = "report_response_dlq"; + public static final String REPORT_RESPONSE_DLQ = "report_response_error"; @Bean @@ -33,18 +33,4 @@ public class MessagingConfiguration { return QueueBuilder.durable(REPORT_REQUEST_DLQ).build(); } - - @Bean - public DirectExchange reportResponseExchange() { - - return new DirectExchange(REPORT_RESPONSE_EXCHANGE); - } - - - @Bean - public Queue reportResponseDLQ() { - - return QueueBuilder.durable(REPORT_RESPONSE_DLQ).build(); - } - }