Merge branch 'tenants-retry' into 'master'

Tenants retry logic and queue renames

See merge request redactmanager/redaction-report-service!95
This commit is contained in:
Maverick Studer 2024-08-29 16:12:40 +02:00
commit 400c4dfed6
3 changed files with 7 additions and 20 deletions

View File

@ -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")

View File

@ -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")

View File

@ -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();
}
}