From 933054b332f298a0589fa91f511cf753377759bd Mon Sep 17 00:00:00 2001 From: Maverick Studer Date: Thu, 29 Aug 2024 13:46:54 +0200 Subject: [PATCH] Tenants retry logic and queue renames --- .../internal/api/queue/LayoutParsingQueueNames.java | 6 +++--- .../layoutparser-service-processor/build.gradle.kts | 2 +- .../layoutparser-service-server/build.gradle.kts | 2 +- .../server/configuration/MessagingConfiguration.java | 7 ------- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingQueueNames.java b/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingQueueNames.java index 962a564..e107b1b 100644 --- a/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingQueueNames.java +++ b/layoutparser-service/layoutparser-service-internal-api/src/main/java/com/knecon/fforesight/service/layoutparser/internal/api/queue/LayoutParsingQueueNames.java @@ -2,9 +2,9 @@ package com.knecon.fforesight.service.layoutparser.internal.api.queue; public class LayoutParsingQueueNames { - public static final String LAYOUT_PARSING_REQUEST_QUEUE_PREFIX = "layout_parsing_request_queue"; + public static final String LAYOUT_PARSING_REQUEST_QUEUE_PREFIX = "layout_parsing_request"; public static final String LAYOUT_PARSING_REQUEST_EXCHANGE = "layout_parsing_request_exchange"; - public static final String LAYOUT_PARSING_RESPONSE_QUEUE_PREFIX = "layout_parsing_response_queue"; + public static final String LAYOUT_PARSING_RESPONSE_QUEUE_PREFIX = "layout_parsing_response"; public static final String LAYOUT_PARSING_RESPONSE_EXCHANGE = "layout_parsing_response_exchange"; - public static final String LAYOUT_PARSING_DLQ = "layout_parsing_dlq"; + public static final String LAYOUT_PARSING_DLQ = "layout_parsing_error"; } diff --git a/layoutparser-service/layoutparser-service-processor/build.gradle.kts b/layoutparser-service/layoutparser-service-processor/build.gradle.kts index 90e4212..49de8b3 100644 --- a/layoutparser-service/layoutparser-service-processor/build.gradle.kts +++ b/layoutparser-service/layoutparser-service-processor/build.gradle.kts @@ -16,7 +16,7 @@ dependencies { exclude("org.springframework.boot", "spring-boot-starter-security") exclude("org.springframework.boot", "spring-boot-starter-validation") } - implementation("com.knecon.fforesight:tenant-commons:0.28.0") + implementation("com.knecon.fforesight:tenant-commons:0.29.0") implementation("com.iqser.red.commons:storage-commons:2.45.0") implementation("org.apache.pdfbox:pdfbox:${pdfBoxVersion}") diff --git a/layoutparser-service/layoutparser-service-server/build.gradle.kts b/layoutparser-service/layoutparser-service-server/build.gradle.kts index efac098..9b4611f 100644 --- a/layoutparser-service/layoutparser-service-server/build.gradle.kts +++ b/layoutparser-service/layoutparser-service-server/build.gradle.kts @@ -30,7 +30,7 @@ dependencies { implementation(project(":layoutparser-service-internal-api")) implementation("com.iqser.red.commons:storage-commons:2.45.0") - implementation("com.knecon.fforesight:tenant-commons:0.28.0") + implementation("com.knecon.fforesight:tenant-commons:0.29.0") implementation("com.knecon.fforesight:tracing-commons:0.5.0") implementation("com.knecon.fforesight:lifecycle-commons:0.6.0") implementation("org.springframework.boot:spring-boot-starter-actuator:${springBootStarterVersion}") diff --git a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/configuration/MessagingConfiguration.java b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/configuration/MessagingConfiguration.java index daa589c..a73b840 100644 --- a/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/configuration/MessagingConfiguration.java +++ b/layoutparser-service/layoutparser-service-server/src/main/java/com/knecon/fforesight/service/layoutparser/server/configuration/MessagingConfiguration.java @@ -13,13 +13,6 @@ import com.knecon.fforesight.service.layoutparser.internal.api.queue.LayoutParsi @Configuration public class MessagingConfiguration { - @Bean - public DirectExchange layoutParsingResponseExchange() { - - return new DirectExchange(LayoutParsingQueueNames.LAYOUT_PARSING_RESPONSE_EXCHANGE); - } - - @Bean public DirectExchange layoutParsingRequestExchange() {