MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Updating queue configurations

This commit is contained in:
Thomas Georgios Giannos 2024-03-08 11:47:37 +02:00
parent 2c8982bfef
commit f37407063f
6 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
annotation-service/annotation-web/src/main/resources/config/queue-devel.yml
View File

@ -2,7 +2,7 @@ queue:
rabbitmq: rabbitmq:
enable: true enable: true
durable: true durable: true
queue: cite_dmp_devel_notification_inbox_queue queue: cite_dmp_devel_annotation_inbox_queue
exchange: cite_dmp_devel_queue exchange: cite_dmp_devel_queue
listenerEnabled: true listenerEnabled: true
publisherEnabled: true publisherEnabled: true

3
annotation-service/annotation-web/src/main/resources/config/queue.yml
View File

@ -9,7 +9,7 @@ spring:
queue: queue:
rabbitmq: rabbitmq:
enable: false enable: false
app-id: ${QUEUE_APP_ID} appId: ${QUEUE_APP_ID}
durable: null durable: null
queue: null queue: null
exchange: null exchange: null
@ -41,7 +41,6 @@ queue:
enable: false enable: false
options: options:
exchange: null exchange: null
notify-topic: notification.notify
tenant-removal-topic: tenant.remove tenant-removal-topic: tenant.remove
tenant-touched-topic: tenant.touch tenant-touched-topic: tenant.touch
user-removal-topic: user.remove user-removal-topic: user.remove

1
annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/AppRabbitConfigurer.java
View File

@ -32,7 +32,6 @@ public class AppRabbitConfigurer extends RabbitConfigurer {
@Bean @Bean
public InboxBindings inboxBindingsCreator() { public InboxBindings inboxBindingsCreator() {
List<String> bindingItems = new ArrayList<>(); List<String> bindingItems = new ArrayList<>();
bindingItems.addAll(this.inboxProperties.getNotifyTopic());
bindingItems.addAll(this.inboxProperties.getTenantRemovalTopic()); bindingItems.addAll(this.inboxProperties.getTenantRemovalTopic());
bindingItems.addAll(this.inboxProperties.getTenantTouchedTopic()); bindingItems.addAll(this.inboxProperties.getTenantTouchedTopic());
bindingItems.addAll(this.inboxProperties.getUserRemovalTopic()); bindingItems.addAll(this.inboxProperties.getUserRemovalTopic());

8
annotation-service/annotation/src/main/java/gr/cite/annotation/integrationevent/inbox/InboxProperties.java
View File

@ -9,8 +9,6 @@ public class InboxProperties {
private final String exchange; private final String exchange;
private final List<String> notifyTopic;
private final List<String> tenantRemovalTopic; private final List<String> tenantRemovalTopic;
private final List<String> tenantTouchedTopic; private final List<String> tenantTouchedTopic;
@ -21,23 +19,17 @@ public class InboxProperties {
public InboxProperties( public InboxProperties(
String exchange, String exchange,
List<String> notifyTopic,
List<String> tenantRemovalTopic, List<String> tenantRemovalTopic,
List<String> tenantTouchedTopic, List<String> tenantTouchedTopic,
List<String> userRemovalTopic, List<String> userRemovalTopic,
List<String> userTouchedTopic) { List<String> userTouchedTopic) {
this.exchange = exchange; this.exchange = exchange;
this.notifyTopic = notifyTopic;
this.tenantRemovalTopic = tenantRemovalTopic; this.tenantRemovalTopic = tenantRemovalTopic;
this.tenantTouchedTopic = tenantTouchedTopic; this.tenantTouchedTopic = tenantTouchedTopic;
this.userRemovalTopic = userRemovalTopic; this.userRemovalTopic = userRemovalTopic;
this.userTouchedTopic = userTouchedTopic; this.userTouchedTopic = userTouchedTopic;
} }
public List<String> getNotifyTopic() {
return notifyTopic;
}
public List<String> getTenantRemovalTopic() { public List<String> getTenantRemovalTopic() {
return tenantRemovalTopic; return tenantRemovalTopic;
} }

2
dmp-backend/web/src/main/resources/config/queue.yml
View File

@ -9,7 +9,7 @@ spring:
queue: queue:
rabbitmq: rabbitmq:
enable: false enable: false
app-id: ${QUEUE_APP_ID} appId: ${QUEUE_APP_ID}
durable: null durable: null
queue: null queue: null
exchange: null exchange: null

2
notification-service/notification-web/src/main/resources/config/queue.yml
View File

@ -9,7 +9,7 @@ spring:
queue: queue:
rabbitmq: rabbitmq:
enable: false enable: false
app-id: ${QUEUE_APP_ID} appId: ${QUEUE_APP_ID}
durable: null durable: null
queue: null queue: null
exchange: null exchange: null