From a1f353ac7581fbc5b64521045a29b201113f2498 Mon Sep 17 00:00:00 2001 From: Timo Bejan Date: Thu, 6 Jul 2023 16:28:01 +0300 Subject: [PATCH] PMD fix --- .../service/job/SyncUserPermissionsJob.java | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/job/SyncUserPermissionsJob.java b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/job/SyncUserPermissionsJob.java index 7ac71b62c..c2dd17866 100644 --- a/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/job/SyncUserPermissionsJob.java +++ b/persistence-service-v1/persistence-service-processor-v1/src/main/java/com/iqser/red/service/persistence/management/v1/processor/service/job/SyncUserPermissionsJob.java @@ -25,20 +25,17 @@ public class SyncUserPermissionsJob implements Job { @Override - public void execute(JobExecutionContext context) throws JobExecutionException { + public void execute(JobExecutionContext context) { var singleTenant = context.getJobDetail().getJobDataMap() != null ? context.getJobDetail().getJobDataMap().get("tenantId") : null; tenantProvider.getTenants().forEach(tenant -> { - if(isTenantReadyForPersistence(tenant)) { - // if it's for a single tenant run only for that one, else run it for all tenants - if (tenant.getTenantId().equals(singleTenant) || singleTenant == null) { - TenantContext.setTenantId(tenant.getTenantId()); - customPermissionService.syncAllCustomPermissions(); - TenantContext.clear(); - } + // if it's for a single tenant run only for that one, else run it for all tenants + if (isTenantReadyForPersistence(tenant) && (tenant.getTenantId().equals(singleTenant) || singleTenant == null)) { + TenantContext.setTenantId(tenant.getTenantId()); + customPermissionService.syncAllCustomPermissions(); + TenantContext.clear(); } }); } - }