From 46414f8c31dea20b9ce7f06dff817b95c9a941ad Mon Sep 17 00:00:00 2001 From: deiflaender Date: Mon, 28 Aug 2023 15:42:05 +0200 Subject: [PATCH] RED-7499: Fixed NPE when no conditional on storage-backend --- .../tenantcommons/StorageConnectionProviderImpl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/knecon/fforesight/tenantcommons/StorageConnectionProviderImpl.java b/src/main/java/com/knecon/fforesight/tenantcommons/StorageConnectionProviderImpl.java index 16bb7d5..530c49a 100644 --- a/src/main/java/com/knecon/fforesight/tenantcommons/StorageConnectionProviderImpl.java +++ b/src/main/java/com/knecon/fforesight/tenantcommons/StorageConnectionProviderImpl.java @@ -20,10 +20,10 @@ public class StorageConnectionProviderImpl implements StorageConnectionProvider public com.iqser.red.storage.commons.model.AzureStorageConnection getAzureStorageConnection(String tenantId) { var tenant = tenantProvider.getTenant(tenantId); - return com.iqser.red.storage.commons.model.AzureStorageConnection.builder() + return tenant.getAzureStorageConnection() != null ? com.iqser.red.storage.commons.model.AzureStorageConnection.builder() .connectionString(encryptionDecryptionService.decrypt(tenant.getAzureStorageConnection().getConnectionString())) .containerName(tenant.getAzureStorageConnection().getContainerName()) - .build(); + .build() : null; } @@ -31,14 +31,14 @@ public class StorageConnectionProviderImpl implements StorageConnectionProvider public com.iqser.red.storage.commons.model.S3StorageConnection getS3StorageConnection(String tenantId) { var tenant = tenantProvider.getTenant(tenantId); - return com.iqser.red.storage.commons.model.S3StorageConnection.builder() + return tenant.getS3StorageConnection() != null ? com.iqser.red.storage.commons.model.S3StorageConnection.builder() .key(tenant.getS3StorageConnection().getKey()) .secret(encryptionDecryptionService.decrypt(tenant.getS3StorageConnection().getSecret())) .signerType(tenant.getS3StorageConnection().getSignerType()) .bucketName(tenant.getS3StorageConnection().getBucketName()) .region(tenant.getS3StorageConnection().getRegion()) .endpoint(tenant.getS3StorageConnection().getEndpoint()) - .build(); + .build() : null; } }