From 07e56d68f5c4c1dd16fc80662ee80ac1bc9c8354 Mon Sep 17 00:00:00 2001 From: Saad Sahibjan Date: Sat, 13 Jun 2020 10:27:23 +0530 Subject: [PATCH] Set tenant through tenant domain auto resolve method --- .../core/task/impl/DeviceDetailsRetrieverTask.java | 12 +++--------- .../carbon/policy/mgt/core/task/MonitoringTask.java | 12 +++--------- 2 files changed, 6 insertions(+), 18 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceDetailsRetrieverTask.java b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceDetailsRetrieverTask.java index b098fdd8ff..b3f4b850a6 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceDetailsRetrieverTask.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceDetailsRetrieverTask.java @@ -37,6 +37,7 @@ package org.wso2.carbon.device.mgt.core.task.impl; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig; @@ -55,7 +56,6 @@ public class DeviceDetailsRetrieverTask implements Task { private static Log log = LogFactory.getLog(DeviceDetailsRetrieverTask.class); private String deviceType; - private static final int SUPER_TENANT_ID = -1234; private DeviceManagementProviderService deviceManagementProviderService; @Override @@ -90,25 +90,19 @@ public class DeviceDetailsRetrieverTask implements Task { if (log.isDebugEnabled()) { log.debug("Task is running for " + tenants.size() + " tenants and the device type is " + deviceType); } - for (Integer tenant : tenants) { - if (SUPER_TENANT_ID == tenant) { + if (MultitenantConstants.SUPER_TENANT_ID == tenant) { this.executeTask(operationMonitoringTaskConfig, startupOperationConfig); continue; } - String tenantDomain = DeviceManagementDataHolder.getInstance(). - getRealmService().getTenantManager().getDomain(tenant); try { PrivilegedCarbonContext.startTenantFlow(); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantDomain); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant, true); this.executeTask(operationMonitoringTaskConfig, startupOperationConfig); } finally { PrivilegedCarbonContext.endTenantFlow(); } } - } catch (UserStoreException e) { - log.error("Error occurred while trying to get the available tenants", e); } catch (DeviceManagementException e) { log.error("Error occurred while trying to get the available tenants " + "from device manager provider service.", e); diff --git a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java index 40e437dfaa..f75995179b 100644 --- a/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java +++ b/components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/task/MonitoringTask.java @@ -21,6 +21,7 @@ package org.wso2.carbon.policy.mgt.core.task; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.device.mgt.common.Device; import org.wso2.carbon.device.mgt.common.EnrolmentInfo; @@ -42,8 +43,6 @@ public class MonitoringTask implements Task { private static final Log log = LogFactory.getLog(MonitoringTask.class); - private static final int SUPER_TENANT_ID = -1234; - Map properties; @Override @@ -88,23 +87,18 @@ public class MonitoringTask implements Task { DeviceManagementProviderService deviceManagementService = new DeviceManagementProviderServiceImpl(); List tenants = deviceManagementService.getDeviceEnrolledTenants(); for (Integer tenant : tenants) { - if (SUPER_TENANT_ID == tenant) { + if (MultitenantConstants.SUPER_TENANT_ID == tenant) { this.executeTask(); continue; } - String tenantDomain = PolicyManagementDataHolder.getInstance(). - getRealmService().getTenantManager().getDomain(tenant); try { PrivilegedCarbonContext.startTenantFlow(); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantDomain(tenantDomain); - PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant); + PrivilegedCarbonContext.getThreadLocalCarbonContext().setTenantId(tenant, true); this.executeTask(); } finally { PrivilegedCarbonContext.endTenantFlow(); } } - } catch (UserStoreException e) { - log.error("Error occurred while trying to get the available tenants", e); } catch (DeviceManagementException e) { log.error("Error occurred while trying to get the available tenants from device manager service ", e); }