From 5296c2b04201e9283ec0b5fcf0e2471be810a47f Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Tue, 24 Sep 2024 12:40:21 +0300 Subject: [PATCH] Fixed some issues with Messaging configuration and copy/paste error --- .../TenantMessagingConfigurationImpl.java | 4 ++-- .../providers/TenantCreatedListener.java | 12 +----------- .../providers/TenantSyncListener.java | 4 ++-- 3 files changed, 5 insertions(+), 15 deletions(-) diff --git a/src/main/java/com/knecon/fforesight/databasetenantcommons/TenantMessagingConfigurationImpl.java b/src/main/java/com/knecon/fforesight/databasetenantcommons/TenantMessagingConfigurationImpl.java index 7497c1e..b8bcd7e 100644 --- a/src/main/java/com/knecon/fforesight/databasetenantcommons/TenantMessagingConfigurationImpl.java +++ b/src/main/java/com/knecon/fforesight/databasetenantcommons/TenantMessagingConfigurationImpl.java @@ -14,7 +14,7 @@ import com.knecon.fforesight.tenantcommons.queue.TenantMessagingConfiguration; @Configuration public class TenantMessagingConfigurationImpl extends TenantMessagingConfiguration { - public String getTenantSyncQueue() { + public String getTenantSyncQueueName() { return this.getQueueNameWithSuffix("_tenant_sync"); } @@ -23,7 +23,7 @@ public class TenantMessagingConfigurationImpl extends TenantMessagingConfigurati @Bean({"tenantSyncQueue"}) public Queue tenantSyncQueue() { - return QueueBuilder.durable(this.getTenantCreatedQueueName()) + return QueueBuilder.durable(this.getTenantSyncQueueName()) .withArgument("x-dead-letter-exchange", "") .withArgument("x-dead-letter-routing-key", this.getTenantEventsDLQName()) .withArgument("x-expires", 300000) diff --git a/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantCreatedListener.java b/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantCreatedListener.java index 5e51a90..fb72aec 100644 --- a/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantCreatedListener.java +++ b/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantCreatedListener.java @@ -18,19 +18,9 @@ public class TenantCreatedListener { private final TenantLiquibaseInitializer tenantLiquibaseInitializer; - @Value("${fforesight.multitenancy.tenant-created-queue:tenant-created-queue}") - private String tenantCreatedQueue; - - - @PostConstruct - public void postConstruct() { - - log.info("Listener for tenant-created started for queue: {}", tenantCreatedQueue); - } - @SneakyThrows - @RabbitListener(queues = "${fforesight.multitenancy.tenant-created-queue:tenant-created-queue}") + @RabbitListener(queues = "#{tenantMessagingConfigurationImpl.getTenantCreatedQueueName()}") public void createTenant(TenantCreatedEvent tenantRequest) { tenantLiquibaseInitializer.initializeTenant(tenantRequest.getTenantId()); diff --git a/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantSyncListener.java b/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantSyncListener.java index 57ab264..d3883eb 100644 --- a/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantSyncListener.java +++ b/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantSyncListener.java @@ -22,8 +22,8 @@ public class TenantSyncListener { @SneakyThrows - @RabbitListener(queues = "#{tenantMessagingConfigurationImpl.getTenantSyncQueue()}") - public void createTenant(TenantSyncEvent tenantSyncEvent) { + @RabbitListener(queues = "#{tenantMessagingConfigurationImpl.getTenantSyncQueueName()}") + public void syncTenant(TenantSyncEvent tenantSyncEvent) { tenantSyncServices.ifPresent(t -> t.syncTenant(tenantSyncEvent)); }