From f37407063f99c4a383905b862fec1516415c1075 Mon Sep 17 00:00:00 2001
From: Thomas Georgios Giannos <thgiannos@cite.gr>
Date: Fri, 8 Mar 2024 11:47:37 +0200
Subject: [PATCH] Updating queue configurations

---
 .../src/main/resources/config/queue-devel.yml             | 2 +-
 .../annotation-web/src/main/resources/config/queue.yml    | 3 +--
 .../annotation/integrationevent/AppRabbitConfigurer.java  | 1 -
 .../integrationevent/inbox/InboxProperties.java           | 8 --------
 dmp-backend/web/src/main/resources/config/queue.yml       | 2 +-
 .../notification-web/src/main/resources/config/queue.yml  | 2 +-
 6 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/annotation-service/annotation-web/src/main/resources/config/queue-devel.yml b/annotation-service/annotation-web/src/main/resources/config/queue-devel.yml
index 1c761d9e5..dc60ed5a7 100644
--- a/annotation-service/annotation-web/src/main/resources/config/queue-devel.yml
+++ b/annotation-service/annotation-web/src/main/resources/config/queue-devel.yml
@@ -2,7 +2,7 @@ queue:
   rabbitmq:
     enable: true
     durable: true
-    queue: cite_dmp_devel_notification_inbox_queue
+    queue: cite_dmp_devel_annotation_inbox_queue
     exchange: cite_dmp_devel_queue
     listenerEnabled: true
     publisherEnabled: true
diff --git a/annotation-service/annotation-web/src/main/resources/config/queue.yml b/annotation-service/annotation-web/src/main/resources/config/queue.yml
index 6a5cdd471..903a00663 100644
--- a/annotation-service/annotation-web/src/main/resources/config/queue.yml
+++ b/annotation-service/annotation-web/src/main/resources/config/queue.yml
@@ -9,7 +9,7 @@ spring:
 queue:
   rabbitmq:
     enable: false
-    app-id: ${QUEUE_APP_ID}
+    appId: ${QUEUE_APP_ID}
     durable: null
     queue: null
     exchange: null
@@ -41,7 +41,6 @@ queue:
       enable: false
       options:
         exchange: null
-        notify-topic: notification.notify
         tenant-removal-topic: tenant.remove
         tenant-touched-topic: tenant.touch
         user-removal-topic: user.remove
diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/AppRabbitConfigurer.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/AppRabbitConfigurer.java
index 087f6cf42..15448a5fa 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/AppRabbitConfigurer.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/AppRabbitConfigurer.java
@@ -32,7 +32,6 @@ public class AppRabbitConfigurer extends RabbitConfigurer {
     @Bean
     public InboxBindings inboxBindingsCreator() {
         List<String> bindingItems = new ArrayList<>();
-        bindingItems.addAll(this.inboxProperties.getNotifyTopic());
         bindingItems.addAll(this.inboxProperties.getTenantRemovalTopic());
         bindingItems.addAll(this.inboxProperties.getTenantTouchedTopic());
         bindingItems.addAll(this.inboxProperties.getUserRemovalTopic());
diff --git a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxProperties.java b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxProperties.java
index cff363a6e..331216d0a 100644
--- a/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxProperties.java
+++ b/annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxProperties.java
@@ -9,8 +9,6 @@ public class InboxProperties {
 
     private final String exchange;
 
-    private final List<String> notifyTopic;
-
     private final List<String> tenantRemovalTopic;
 
     private final List<String> tenantTouchedTopic;
@@ -21,23 +19,17 @@ public class InboxProperties {
 
     public InboxProperties(
             String exchange,
-            List<String> notifyTopic,
             List<String> tenantRemovalTopic,
             List<String> tenantTouchedTopic,
             List<String> userRemovalTopic,
             List<String> userTouchedTopic) {
         this.exchange = exchange;
-        this.notifyTopic = notifyTopic;
         this.tenantRemovalTopic = tenantRemovalTopic;
         this.tenantTouchedTopic = tenantTouchedTopic;
         this.userRemovalTopic = userRemovalTopic;
         this.userTouchedTopic = userTouchedTopic;
     }
 
-    public List<String> getNotifyTopic() {
-        return notifyTopic;
-    }
-
     public List<String> getTenantRemovalTopic() {
         return tenantRemovalTopic;
     }
diff --git a/dmp-backend/web/src/main/resources/config/queue.yml b/dmp-backend/web/src/main/resources/config/queue.yml
index 653e15d18..78ba64a62 100644
--- a/dmp-backend/web/src/main/resources/config/queue.yml
+++ b/dmp-backend/web/src/main/resources/config/queue.yml
@@ -9,7 +9,7 @@ spring:
 queue:
   rabbitmq:
     enable: false
-    app-id: ${QUEUE_APP_ID}
+    appId: ${QUEUE_APP_ID}
     durable: null
     queue: null
     exchange: null
diff --git a/notification-service/notification-web/src/main/resources/config/queue.yml b/notification-service/notification-web/src/main/resources/config/queue.yml
index 6a5cdd471..063ca478d 100644
--- a/notification-service/notification-web/src/main/resources/config/queue.yml
+++ b/notification-service/notification-web/src/main/resources/config/queue.yml
@@ -9,7 +9,7 @@ spring:
 queue:
   rabbitmq:
     enable: false
-    app-id: ${QUEUE_APP_ID}
+    appId: ${QUEUE_APP_ID}
     durable: null
     queue: null
     exchange: null