Removing some hack used to workaround issues that popped up while writing unit tests upon tenant-enabled code

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/app/mgt/ApplicationManagerProviderServiceImpl.java

@@ -180,10 +180,8 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
     @Override
     public void updateApplicationListInstalledInDevice(
             DeviceIdentifier deviceIdentifier, List<Application> applications) throws ApplicationManagementException {
-
-        int tenantId = getTenantId();
-
         try {
+            int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             DeviceManagementDAOFactory.beginTransaction();
             Device device = deviceDAO.getDevice(deviceIdentifier, tenantId);
 
@@ -199,8 +197,8 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             List<Application> appsToAdd = new ArrayList<Application>();
             List<Integer> appIdsToRemove = new ArrayList<Integer>();
 
-            for(Application installedApp:installedAppList){
+            for (Application installedApp : installedAppList) {
-                if (!applications.contains(installedApp)){
+                if (!applications.contains(installedApp)) {
                     if (log.isDebugEnabled()) {
                         log.debug("Remove app Id:" + installedApp.getId());
                     }
@@ -211,12 +209,12 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             Application installedApp;
             List<Integer> applicationIds = new ArrayList<>();
 
-            for(Application application:applications){
+            for (Application application : applications) {
                 if (!installedAppList.contains(application)) {
                     installedApp = applicationDAO.getApplication(application.getApplicationIdentifier(), tenantId);
-                    if (installedApp == null){
+                    if (installedApp == null) {
                         appsToAdd.add(application);
-                    }else{
+                    } else {
                         applicationIds.add(installedApp.getId());
                     }
                 }
@@ -234,7 +232,7 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             if (log.isDebugEnabled()) {
                 log.debug("num of remove app Ids:" + appIdsToRemove.size());
             }
-            applicationMappingDAO.removeApplicationMapping(device.getId(), appIdsToRemove,tenantId);
+            applicationMappingDAO.removeApplicationMapping(device.getId(), appIdsToRemove, tenantId);
             DeviceManagementDAOFactory.commitTransaction();
         } catch (DeviceManagementDAOException deviceDaoEx) {
             String errorMsg = "Error occurred saving application list to the device";
@@ -242,37 +240,24 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             try {
                 DeviceManagementDAOFactory.rollbackTransaction();
             } catch (DeviceManagementDAOException e) {
-                log.error("Error occurred while roll back transaction",e);
+                log.error("Error occurred while roll back transaction", e);
             }
             throw new ApplicationManagementException(errorMsg, deviceDaoEx);
         }
     }
 
-    private int getTenantId() {
-
-        int tenantId = 0;
-        if (isTest){
-            tenantId = DeviceManagerUtil.currentTenant.get();
-        }else{
-            tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
-        }
-
-        return tenantId;
-    }
-
     @Override
-    public List<Application> getApplicationListForDevice(DeviceIdentifier deviceIdentifier)
+    public List<Application> getApplicationListForDevice(
-            throws ApplicationManagementException {
+            DeviceIdentifier deviceId) throws ApplicationManagementException {
-         Device device = null;
+        Device device = null;
-         try {
+        try {
-             int tenantId = getTenantId();
+            int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
-             device = deviceDAO.getDevice(deviceIdentifier, tenantId);
+            device = deviceDAO.getDevice(deviceId, tenantId);
-             return applicationDAO.getInstalledApplications(device.getId());
+            return applicationDAO.getInstalledApplications(device.getId());
-            }catch (DeviceManagementDAOException deviceDaoEx) {
+        } catch (DeviceManagementDAOException e) {
-             String errorMsg = "Error occured while fetching the Application List of device : " + device.getId();
+            throw new ApplicationManagementException("Error occured while fetching the Application List of '" +
-             log.error(errorMsg, deviceDaoEx);
+                    deviceId.getType() + "' device carrying the identifier'" + deviceId.getId(), e);
-             throw new ApplicationManagementException(errorMsg, deviceDaoEx);
+        }
-         }
     }
 
     @Override

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceImpl.java

@@ -53,7 +53,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     private DeviceTypeDAO deviceTypeDAO;
     private EnrolmentDAO enrolmentDAO;
     private DeviceManagementPluginRepository pluginRepository;
-    private boolean isTest = false;
 
     private static Log log = LogFactory.getLog(DeviceManagementProviderServiceImpl.class);
     private int tenantId;
@@ -75,7 +74,6 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     DeviceManagementProviderServiceImpl(DeviceManagementPluginRepository pluginRepo, boolean test){
         this.pluginRepository = pluginRepo;
         initDataAccessObjects();
-        isTest = test;
     }
 
     private void initDataAccessObjects() {
@@ -108,7 +106,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             } else {
                 device.getEnrolmentInfo().setStatus(EnrolmentInfo.Status.ACTIVE);
             }
-            int tenantId = getTenantId();
+            int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
 
             DeviceManagementDAOFactory.beginTransaction();
 
@@ -724,14 +722,10 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
             DeviceManagementDAOFactory.getConnection();
             int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
             allDevices = deviceDAO.getDevicesByStatus(status, tenantId);
-
         } catch (DeviceManagementDAOException e) {
-            String errorMsg = "Error occurred while fetching the list of devices that matches to status: '"
+            throw new DeviceManagementException(
-                              + status + "'";
+                    "Error occurred while fetching the list of devices that matches to status: '" + status + "'", e);
-            log.error(errorMsg, e);
-            throw new DeviceManagementException(errorMsg, e);
         } finally {
-
             try {
                 DeviceManagementDAOFactory.closeConnection();
             } catch (DeviceManagementDAOException e) {
@@ -753,19 +747,4 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
         return devices;
     }
 
-
-
-    private int getTenantId() {
-
-        ThreadLocal<Integer> tenantId = new ThreadLocal<Integer>();
-        int tenant = 0;
-
-        if (isTest){
-            tenant = DeviceManagerUtil.currentTenant.get();
-        }else{
-            tenant = CarbonContext.getThreadLocalCarbonContext().getTenantId();
-        }
-        return tenant;
-    }
-
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/util/DeviceManagerUtil.java

@@ -49,7 +49,6 @@ import java.util.*;
 public final class DeviceManagerUtil {
 
     private static final Log log = LogFactory.getLog(DeviceManagerUtil.class);
-    public static ThreadLocal<Integer> currentTenant = new ThreadLocal<Integer>();
 
     enum HTTPMethod {
         GET, POST, DELETE, PUT, OPTIONS

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/java/org/wso2/carbon/device/mgt/core/service/DeviceManagementProviderServiceTest.java

@@ -58,7 +58,6 @@ public class DeviceManagementProviderServiceTest extends BaseDeviceManagementTes
             deviceManagementProviderService = new DeviceManagementProviderServiceImpl(deviceManagementPluginRepository,
                     true);
             DeviceManagerUtil.registerDeviceType(TestDataHolder.TEST_DEVICE_TYPE);
-            DeviceManagerUtil.currentTenant.set(TestDataHolder.SUPER_TENANT_ID);
 
             Device device = TestDataHolder.generateDummyDeviceData(TestDataHolder.TEST_DEVICE_TYPE);
             boolean isEnrolled = deviceManagementProviderService.enrollDevice(device);