From 20c0890ad09b6929af8a418a564fb665fa6effe5 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Sun, 7 Apr 2024 21:35:12 +0300 Subject: [PATCH] mongoDb optional --- .../service/TenantManagementService.java | 22 ++++++++++--------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java index 46b885b..69402a3 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java @@ -128,7 +128,7 @@ public class TenantManagementService implements TenantProvider { var jdbcUrl = JDBCUtils.buildJdbcUrlWithSchema(tenantRequest.getDatabaseConnection()); validateJdbcUrl(jdbcUrl); - TenantEntity tenantEntity = TenantEntity.builder() + var tenantEntityBuilder = TenantEntity.builder() .tenantId(tenantRequest.getTenantId()) .displayName(tenantRequest.getDisplayName()) .guid(UUID.randomUUID().toString()) @@ -150,15 +150,17 @@ public class TenantManagementService implements TenantProvider { .numberOfShards(tenantRequest.getSearchConnection().getNumberOfShards()) .numberOfReplicas(tenantRequest.getSearchConnection().getNumberOfReplicas()) .indexPrefix(buildIndexPrefix(tenantRequest.getTenantId())) - .build()) - .mongoDBConnection(MongoDBConnectionEntity.builder() - .host(tenantRequest.getMongoDBConnection().getHost()) - .port(tenantRequest.getMongoDBConnection().getPort()) - .username(tenantRequest.getMongoDBConnection().getUsername()) - .password(encryptionService.encrypt(tenantRequest.getMongoDBConnection().getPassword())) - .database(tenantRequest.getMongoDBConnection().getDatabase()) - .build()) - .build(); + .build()); + if (tenantRequest.getMongoDBConnection() != null) { + tenantEntityBuilder.mongoDBConnection(MongoDBConnectionEntity.builder() + .host(tenantRequest.getMongoDBConnection().getHost()) + .port(tenantRequest.getMongoDBConnection().getPort()) + .username(tenantRequest.getMongoDBConnection().getUsername()) + .password(encryptionService.encrypt(tenantRequest.getMongoDBConnection().getPassword())) + .database(tenantRequest.getMongoDBConnection().getDatabase()) + .build()); + } + TenantEntity tenantEntity = tenantEntityBuilder.build(); if (tenantRequest.getAzureStorageConnection() != null) { testAzureConnection(tenantRequest.getAzureStorageConnection().getConnectionString(), tenantRequest.getAzureStorageConnection().getContainerName());