From 64cecc4a7d42cef52f392b3da8ee3a91b53f23b7 Mon Sep 17 00:00:00 2001 From: yhampe Date: Wed, 24 Jan 2024 09:45:46 +0100 Subject: [PATCH] RED-6888: Add delete tenant endpoint changed method signature to void --- .../service/TenantManagementService.java | 6 +++--- 1 file changed, 3 insertions(+), 3 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 b10683a..dfd23a5 100644 --- a/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java +++ b/src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java @@ -190,7 +190,7 @@ public class TenantManagementService implements TenantProvider { } @SneakyThrows - public TenantResponse deleteTenant(String tenantId, TenantRequest tenantRequest) { + public void deleteTenant(String tenantId, TenantRequest tenantRequest) { log.info("Requested to delete tenant for: {}", tenantRequest.getTenantId()); @@ -208,7 +208,7 @@ public class TenantManagementService implements TenantProvider { log.info("Deleting search index for tenant: {}", tenantRequest.getTenantId()); TenantContext.setTenantId(tenantEntity.getTenantId()); - rabbitTemplate.convertAndSend(tenantExchangeName, "tenant.deleted", new TenantDeletedEvent(tenantEntity.getTenantId(),SearchConnection.builder() + rabbitTemplate.convertAndSend(tenantDeleteName, "tenant.deleted", new TenantDeletedEvent(tenantEntity.getTenantId(),SearchConnection.builder() .hosts(tenantEntity.getSearchConnection().getHosts()) .port(tenantEntity.getSearchConnection().getPort()) .scheme(tenantEntity.getSearchConnection().getScheme()) @@ -240,7 +240,7 @@ public class TenantManagementService implements TenantProvider { storageConfiguration.getS3StorageService().initAmazonS3(s3StorageConnection).deleteBucket(deleteBucketRequest); } deleteRealm(tenantId); - return convert(tenantRepository.delete(tenantEntity)); + tenantRepository.delete(tenantEntity); } else { throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Tenant does not exist");