From 9bd73760102803b476f2b366608a9859e5ebd789 Mon Sep 17 00:00:00 2001 From: Maverick Studer Date: Thu, 18 Jul 2024 14:54:48 +0200 Subject: [PATCH] RED-9331: Explore possibilities for fair upload / analysis processing per tenant --- build.gradle.kts | 2 +- .../databasetenantcommons/TenantMessagingConfiguration.java | 4 ++-- .../providers/TenantCreatedListener.java | 4 ++-- .../databasetenantcommons/providers/TenantSyncListener.java | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 8e31393..3160a74 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -29,7 +29,7 @@ val springCloudVersion = "4.0.4" dependencies { api("com.fasterxml.jackson.core:jackson-databind:2.15.2:") - api("com.knecon.fforesight:tenant-commons:0.24.0") + api("com.knecon.fforesight:tenant-commons:0.26.0") api("com.zaxxer:HikariCP:5.0.1") api("com.google.guava:guava:32.1.2-jre") api("org.liquibase:liquibase-core:4.20.0") diff --git a/src/main/java/com/knecon/fforesight/databasetenantcommons/TenantMessagingConfiguration.java b/src/main/java/com/knecon/fforesight/databasetenantcommons/TenantMessagingConfiguration.java index bb76d34..18f662e 100644 --- a/src/main/java/com/knecon/fforesight/databasetenantcommons/TenantMessagingConfiguration.java +++ b/src/main/java/com/knecon/fforesight/databasetenantcommons/TenantMessagingConfiguration.java @@ -16,13 +16,13 @@ import lombok.RequiredArgsConstructor; @RequiredArgsConstructor public class TenantMessagingConfiguration { - @Value("${fforesight.multitenancy.tenant-created-queue:tenant-created}") + @Value("${fforesight.multitenancy.tenant-created-queue:tenant-created-queue}") private String tenantCreatedEventQueue; @Value("${fforesight.multitenancy.tenant-created-dlq:tenant-created-dlq}") private String tenantCreatedDLQ; - @Value("${fforesight.multitenancy.tenant-sync-queue:tenant-sync}") + @Value("${fforesight.multitenancy.tenant-sync-queue:tenant-sync-queue}") private String tenantSyncEventQueue; @Value("${fforesight.multitenancy.tenant-sync-dlq:tenant-sync-dlq}") 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 2ff99b2..5e51a90 100644 --- a/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantCreatedListener.java +++ b/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantCreatedListener.java @@ -18,7 +18,7 @@ public class TenantCreatedListener { private final TenantLiquibaseInitializer tenantLiquibaseInitializer; - @Value("${fforesight.multitenancy.tenant-created-queue:tenant-created}") + @Value("${fforesight.multitenancy.tenant-created-queue:tenant-created-queue}") private String tenantCreatedQueue; @@ -30,7 +30,7 @@ public class TenantCreatedListener { @SneakyThrows - @RabbitListener(queues = "${fforesight.multitenancy.tenant-created-queue:tenant-created}") + @RabbitListener(queues = "${fforesight.multitenancy.tenant-created-queue:tenant-created-queue}") 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 0204a37..3905edf 100644 --- a/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantSyncListener.java +++ b/src/main/java/com/knecon/fforesight/databasetenantcommons/providers/TenantSyncListener.java @@ -20,7 +20,7 @@ public class TenantSyncListener { private final Optional tenantSyncServices; - @Value("${fforesight.multitenancy.tenant-sync-queue:tenant-sync}") + @Value("${fforesight.multitenancy.tenant-sync-queue:tenant-sync-queue}") private String tenantSyncQueue; @@ -32,7 +32,7 @@ public class TenantSyncListener { @SneakyThrows - @RabbitListener(queues = "${fforesight.multitenancy.tenant-sync-queue:tenant-sync}") + @RabbitListener(queues = "${fforesight.multitenancy.tenant-sync-queue:tenant-sync-queue}") public void createTenant(TenantSyncEvent tenantSyncEvent) { tenantSyncServices.ifPresent(t -> t.syncTenant(tenantSyncEvent));