Marmelator/tenant-user-management-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 202 Wiki Activity

Merge branch 'RED-7175-4' into 'main'

Browse Source 
RED-7175: changed TenantContext.getTenantId() to tenantRequest.getTenantId()...

See merge request fforesight/tenant-user-management-service!32
This commit is contained in:
Ali Oezyetimoglu 2023-09-12 13:36:25 +02:00
commit 30a045364d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/knecon/fforesight/tenantusermanagement/service/TenantManagementService.java
View File

@ -120,7 +120,7 @@ public class TenantManagementService implements TenantProvider {
.password(encryptionService.encrypt(tenantRequest.getSearchConnection().getPassword()))
.numberOfShards(tenantRequest.getSearchConnection().getNumberOfShards())
.numberOfReplicas(tenantRequest.getSearchConnection().getNumberOfReplicas())
.indexPrefix(indexPrefix != null ? indexPrefix : TenantContext.getTenantId())
.indexPrefix(indexPrefix != null ? indexPrefix : tenantRequest.getTenantId())
.build())
.build();
@ -416,7 +416,7 @@ public class TenantManagementService implements TenantProvider {
.password(encryptionService.encrypt(searchConnection.getPassword()))
.numberOfShards(searchConnection.getNumberOfShards())
.numberOfReplicas(searchConnection.getNumberOfReplicas())
.indexPrefix(indexPrefix != null ? indexPrefix : TenantContext.getTenantId())
.indexPrefix(indexPrefix != null ? indexPrefix : tenantRequest.getTenantId())
.build());
}