From 0996c8cd710a6c8970f6d23cbd53b6d6023fae01 Mon Sep 17 00:00:00 2001
From: maverickstuder <maverick.studer@knecon.com>
Date: Thu, 20 Jun 2024 15:01:41 +0200
Subject: [PATCH] RED-9331: Explore possibilities for fair upload / analysis
 processing per tenant * dynamic queue names for pods

---
 .../TenantMessagingConfigurationImpl.java     | 24 -------------------
 .../TenantExchangeMessageReceiverImpl.java    |  4 ++--
 .../src/test/resources/application.yml        |  4 +++-
 3 files changed, 5 insertions(+), 27 deletions(-)

diff --git a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/configuration/TenantMessagingConfigurationImpl.java b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/configuration/TenantMessagingConfigurationImpl.java
index f49629c..25804fb 100644
--- a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/configuration/TenantMessagingConfigurationImpl.java
+++ b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/configuration/TenantMessagingConfigurationImpl.java
@@ -7,29 +7,5 @@ import com.knecon.fforesight.tenantcommons.queue.TenantMessagingConfiguration;
 @Configuration
 public class TenantMessagingConfigurationImpl extends TenantMessagingConfiguration {
 
-    public static final String TENANT_CREATED_EVENT_QUEUE = "ocr-tenant-created-queue";
-    public static final String TENANT_DELETED_EVENT_QUEUE = "ocr-tenant-deleted-queue";
-    public static final String TENANT_EVENTS_DLQ = "ocr-tenant-events-dlq";
-
-
-    @Override
-    protected String getTenantCreatedQueueName() {
-
-        return TENANT_CREATED_EVENT_QUEUE;
-    }
-
-
-    @Override
-    protected String getTenantDeletedQueueName() {
-
-        return TENANT_DELETED_EVENT_QUEUE;
-    }
-
-
-    @Override
-    protected String getTenantEventsDLQName() {
-
-        return TENANT_EVENTS_DLQ;
-    }
 
 }
diff --git a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/TenantExchangeMessageReceiverImpl.java b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/TenantExchangeMessageReceiverImpl.java
index 84a2784..47ce1cd 100644
--- a/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/TenantExchangeMessageReceiverImpl.java
+++ b/ocr-service-v1/ocr-service-server/src/main/java/com/knecon/fforesight/service/ocr/v1/server/queue/TenantExchangeMessageReceiverImpl.java
@@ -51,7 +51,7 @@ public class TenantExchangeMessageReceiverImpl extends TenantExchangeMessageRece
 
 
     @RabbitHandler
-    @RabbitListener(queues = TENANT_CREATED_EVENT_QUEUE)
+    @RabbitListener(queues = "#{tenantMessagingConfigurationImpl.getTenantCreatedQueueName()}")
     public void reactToTenantCreation(TenantCreatedEvent tenantCreatedEvent) {
 
         super.reactToTenantCreation(tenantCreatedEvent);
@@ -59,7 +59,7 @@ public class TenantExchangeMessageReceiverImpl extends TenantExchangeMessageRece
 
 
     @RabbitHandler
-    @RabbitListener(queues = TENANT_DELETED_EVENT_QUEUE)
+    @RabbitListener(queues = "#{tenantMessagingConfigurationImpl.getTenantDeletedQueueName()}")
     public void reactToTenantDeletion(TenantResponse tenantResponse) {
 
         super.reactToTenantDeletion(tenantResponse);
diff --git a/ocr-service-v1/ocr-service-server/src/test/resources/application.yml b/ocr-service-v1/ocr-service-server/src/test/resources/application.yml
index e9992bc..e64c172 100644
--- a/ocr-service-v1/ocr-service-server/src/test/resources/application.yml
+++ b/ocr-service-v1/ocr-service-server/src/test/resources/application.yml
@@ -21,4 +21,6 @@ management:
       probability: ${TRACING_PROBABILITY:1.0}
   otlp:
     tracing:
-      endpoint: ${OTLP_ENDPOINT:http://otel-collector-opentelemetry-collector.otel-collector:4318/v1/traces}
\ No newline at end of file
+      endpoint: ${OTLP_ENDPOINT:http://otel-collector-opentelemetry-collector.otel-collector:4318/v1/traces}
+
+POD_NAME: ocr-service
\ No newline at end of file