Marmelator/tenant-commons
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 34 Wiki Activity

Merge branch 'RED-7499' into 'main'

Browse Source 
RED-7499: Fixed NPE when no conditional on storage-backend

See merge request fforesight/tenant-commons!1
This commit is contained in:
Dominique Eifländer 2023-08-28 15:44:52 +02:00
commit c28cf9c49f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/knecon/fforesight/tenantcommons/StorageConnectionProviderImpl.java
View File

@ -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;
}
}