Merge branch 'corrective-policy' of https://gitlab.com/entgra/carbon-device-mgt into corrective-action

 Conflicts:

	components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java

components/application-mgt/org.wso2.carbon.device.application.mgt.common/src/main/java/org/wso2/carbon/device/application/mgt/common/ApplicationSubscriptionInfo.java

@@ -0,0 +1,52 @@
+/* Copyright (c) 2020, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+ *
+ * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.application.mgt.common;
+
+import org.wso2.carbon.device.mgt.common.Device;
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class ApplicationSubscriptionInfo {
+
+    List<Device> devices;
+    List<String> subscribers;
+    List<DeviceIdentifier> errorDeviceIdentifiers;
+    String appSupportingDeviceTypeName;
+
+    public List<Device> getDevices() { return devices; }
+
+    public void setDevices(List<Device> devices) { this.devices = devices; }
+
+    public List<String> getSubscribers() { return subscribers; }
+
+    public void setSubscribers(List<String> subscribers) { this.subscribers = subscribers; }
+
+    public List<DeviceIdentifier> getErrorDeviceIdentifiers() { return errorDeviceIdentifiers; }
+
+    public void setErrorDeviceIdentifiers(List<DeviceIdentifier> errorDeviceIdentifiers) {
+        this.errorDeviceIdentifiers = errorDeviceIdentifiers;
+    }
+
+    public String getAppSupportingDeviceTypeName() { return appSupportingDeviceTypeName; }
+
+    public void setAppSupportingDeviceTypeName(String appSupportingDeviceTypeName) {
+        this.appSupportingDeviceTypeName = appSupportingDeviceTypeName;
+    }
+}

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/AppmDataHandlerImpl.java

@@ -17,21 +17,18 @@
 
 package org.wso2.carbon.device.application.mgt.core.impl;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.application.mgt.common.config.LifecycleState;
 import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.ApplicationStorageManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException;
-import org.wso2.carbon.device.application.mgt.common.exception.RequestValidatingException;
 import org.wso2.carbon.device.application.mgt.common.services.ApplicationStorageManager;
 import org.wso2.carbon.device.application.mgt.common.services.AppmDataHandler;
 import org.wso2.carbon.device.application.mgt.core.dao.ApplicationReleaseDAO;
 import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagementDAOFactory;
 import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException;
 import org.wso2.carbon.device.application.mgt.core.util.APIUtil;
-import org.wso2.carbon.device.application.mgt.core.util.DAOUtil;
 import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
 import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
 import org.wso2.carbon.device.application.mgt.core.internal.DataHolder;

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/impl/SubscriptionManagerImpl.java

@@ -29,6 +29,7 @@ import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
 import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse;
+import org.wso2.carbon.device.application.mgt.common.ApplicationSubscriptionInfo;
 import org.wso2.carbon.device.application.mgt.common.ApplicationType;
 import org.wso2.carbon.device.application.mgt.common.DeviceSubscriptionData;
 import org.wso2.carbon.device.application.mgt.common.DeviceTypes;
@@ -76,7 +77,6 @@ import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.common.operation.mgt.ActivityStatus;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
-import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
@@ -108,7 +108,7 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
     private LifecycleStateManager lifecycleStateManager;
 
     public SubscriptionManagerImpl() {
-        lifecycleStateManager = DataHolder.getInstance().getLifecycleStateManager();
+        this.lifecycleStateManager = DataHolder.getInstance().getLifecycleStateManager();
         this.subscriptionDAO = ApplicationManagementDAOFactory.getSubscriptionDAO();
         this.applicationDAO = ApplicationManagementDAOFactory.getApplicationDAO();
     }
@@ -120,84 +120,16 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
             log.debug("Install application release which has UUID " + applicationUUID + " to " + params.size()
                     + " users.");
         }
-        try {
-            validateRequest(params, subType, action);
-            DeviceManagementProviderService deviceManagementProviderService = HelperUtil
-                    .getDeviceManagementProviderService();
-            GroupManagementProviderService groupManagementProviderService = HelperUtil
-                    .getGroupManagementProviderService();
-            String deviceTypeName = null;
-            List<Device> devices = new ArrayList<>();
-            List<String> subscribers = new ArrayList<>();
-            List<DeviceIdentifier> errorDeviceIdentifiers = new ArrayList<>();
-            ApplicationInstallResponse applicationInstallResponse;
 
+        validateRequest(params, subType, action);
         //todo validate users, groups and roles
         ApplicationDTO applicationDTO = getApplicationDTO(applicationUUID);
-            if (SubscriptionType.DEVICE.toString().equals(subType)) {
+        ApplicationSubscriptionInfo applicationSubscriptionInfo = getAppSubscriptionInfo(applicationDTO, subType, params);
-                for (T param : params) {
+        ApplicationInstallResponse applicationInstallResponse = performActionOnDevices(applicationSubscriptionInfo.getAppSupportingDeviceTypeName(),
-                    DeviceIdentifier deviceIdentifier = (DeviceIdentifier) param;
+                applicationSubscriptionInfo.getDevices(), applicationDTO, subType, applicationSubscriptionInfo.getSubscribers(), action);
-                    if (StringUtils.isEmpty(deviceIdentifier.getId()) || StringUtils
-                            .isEmpty(deviceIdentifier.getType())) {
-                        log.warn("Found a device identifier which has either empty identity of the device or empty"
-                                + " device type. Hence ignoring the device identifier. ");
-                        continue;
-                    }
-                    if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType())) {
-                        DeviceType deviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId());
-                        if (!deviceType.getName().equals(deviceIdentifier.getType())) {
-                            log.warn("Found a device identifier which is not matched with the supported device type "
-                                    + "of the application release which has UUID " + applicationUUID + " Application "
-                                    + "supported device type is " + deviceType.getName() + " and the "
-                                    + "identifier of which has a different device type is " + deviceIdentifier.getId());
-                            errorDeviceIdentifiers.add(deviceIdentifier);
-                            continue;
-                        }
-                    }
-                    devices.add(deviceManagementProviderService.getDevice(deviceIdentifier, false));
-                }
-            } else if (SubscriptionType.USER.toString().equalsIgnoreCase(subType)) {
-                for (T param : params) {
-                    String username = (String) param;
-                    subscribers.add(username);
-                    devices.addAll(deviceManagementProviderService.getDevicesOfUser(username));
-                }
-            } else if (SubscriptionType.ROLE.toString().equalsIgnoreCase(subType)) {
-                for (T param : params) {
-                    String roleName = (String) param;
-                    subscribers.add(roleName);
-                    devices.addAll(deviceManagementProviderService.getAllDevicesOfRole(roleName));
-                }
-            } else if (SubscriptionType.GROUP.toString().equalsIgnoreCase(subType)) {
-                for (T param : params) {
-                    String groupName = (String) param;
-                    subscribers.add(groupName);
-                    devices.addAll(groupManagementProviderService.getAllDevicesOfGroup(groupName, true));
-                }
-            }
 
-            if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType()) && !SubscriptionType.DEVICE
+        applicationInstallResponse.setErrorDeviceIdentifiers(applicationSubscriptionInfo.getErrorDeviceIdentifiers());
-                    .toString().equals(subType)) {
-                DeviceType deviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId());
-                deviceTypeName = deviceType.getName();
-                //filter devices by device type
-                String tmpDeviceTypeName = deviceTypeName;
-                devices.removeIf(device -> !tmpDeviceTypeName.equals(device.getType()));
-            }
-
-            applicationInstallResponse = performActionOnDevices(deviceTypeName, devices, applicationDTO,
-                    subType, subscribers, action);
-            applicationInstallResponse.setErrorDeviceIdentifiers(errorDeviceIdentifiers);
         return applicationInstallResponse;
-        } catch (DeviceManagementException e) {
-            String msg = "Error occurred while getting devices of given users or given roles.";
-            log.error(msg, e);
-            throw new ApplicationManagementException(msg, e);
-        } catch (GroupManagementException e) {
-            String msg = "Error occurred while getting devices of given groups";
-            log.error(msg, e);
-            throw new ApplicationManagementException(msg, e);
-        }
     }
 
     @Override
@@ -321,13 +253,11 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
 
     @Override
     public <T> void performEntAppSubscription(String applicationUUID, List<T> params, String subType, String action,
-                                              boolean requiresUpdatingExternal)
+                                              boolean requiresUpdatingExternal) throws ApplicationManagementException {
-            throws ApplicationManagementException {
         if (log.isDebugEnabled()) {
-            log.debug("Google Ent app Install operation is received to application which has UUID "
+            log.debug("Google Ent app Install operation is received to application which has UUID " + applicationUUID
-                    + applicationUUID + " to perform on " + params.size() + " params.");
+                    + " to perform on " + params.size() + " params.");
         }
-        try {
         if (params.isEmpty()) {
             String msg = "In order to subscribe/unsubscribe application release, you should provide list of "
                     + "subscribers. But found an empty list of subscribers.";
@@ -354,76 +284,17 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
             throw new BadRequestException(msg);
         }
 
-            DeviceManagementProviderService deviceManagementProviderService = HelperUtil
-                    .getDeviceManagementProviderService();
-
-            List<Device> devices = new ArrayList<>();
-            List<String> subscribers = new ArrayList<>();
-            List<Integer> appSubscribingDeviceIds;
         List<Integer> appReSubscribingDeviceIds = new ArrayList<>();
         List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
 
-            //todo validate users, groups and roles
+        ApplicationSubscriptionInfo applicationSubscriptionInfo = getAppSubscriptionInfo(applicationDTO, subType,
-            if (SubscriptionType.DEVICE.toString().equals(subType)) {
+                params);
-                DeviceType deviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId());
+        applicationSubscriptionInfo.getDevices().forEach(device -> {
-                for (T param : params) {
-                    DeviceIdentifier deviceIdentifier = (DeviceIdentifier) param;
-                    if (StringUtils.isEmpty(deviceIdentifier.getId()) || StringUtils
-                            .isEmpty(deviceIdentifier.getType())) {
-                        log.warn("Found a device identifier which has either empty identity of the device or empty"
-                                + " device type. Hence ignoring the device identifier. ");
-                        continue;
-                    }
-                    if (!deviceType.getName().equals(deviceIdentifier.getType())) {
-                        log.warn("Found a device identifier which is not matched with the supported device type "
-                                + "of the application release which has UUID " + applicationUUID + " Application "
-                                + "supported device type is " + deviceType.getName() + " and the "
-                                + "identifier of which has a different device type is " + deviceIdentifier.getId());
-                        continue;
-                    }
-                    deviceIdentifiers.add(deviceIdentifier);
-                    devices.add(deviceManagementProviderService.getDevice(deviceIdentifier, false));
-                }
-            } else if (SubscriptionType.USER.toString().equalsIgnoreCase(subType)) {
-                for (T param : params) {
-                    String username = (String) param;
-                    subscribers.add(username);
-                    devices.addAll(deviceManagementProviderService.getDevicesOfUser(username));
-                }
-            } else if (SubscriptionType.ROLE.toString().equalsIgnoreCase(subType)) {
-                for (T param : params) {
-                    String roleName = (String) param;
-                    subscribers.add(roleName);
-                    devices.addAll(deviceManagementProviderService.getAllDevicesOfRole(roleName));
-                }
-            } else if (SubscriptionType.GROUP.toString().equalsIgnoreCase(subType)) {
-                GroupManagementProviderService groupManagementProviderService = HelperUtil
-                        .getGroupManagementProviderService();
-                for (T param : params) {
-                    String groupName = (String) param;
-                    subscribers.add(groupName);
-                    devices.addAll(groupManagementProviderService.getAllDevicesOfGroup(groupName, false));
-                }
-            } else {
-                String msg = "Found invalid subscription type " + subType+  " to install application release" ;
-                log.error(msg);
-                throw new BadRequestException(msg);
-            }
-
-            /*If subscription type is not device we need to crete device identifiers object list by referring retrieved
-            list of devices.*/
-            if (!SubscriptionType.DEVICE.toString().equalsIgnoreCase(subType)) {
-                DeviceType deviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId());
-                String deviceTypeName = deviceType.getName();
-                //filter devices by device type
-                devices.removeIf(device -> !deviceTypeName.equals(device.getType()));
-                devices.forEach(device -> {
             DeviceIdentifier deviceIdentifier = new DeviceIdentifier();
             deviceIdentifier.setId(device.getDeviceIdentifier());
             deviceIdentifier.setType(device.getType());
             deviceIdentifiers.add(deviceIdentifier);
         });
-            }
 
         if (requiresUpdatingExternal) {
             //Installing the application
@@ -434,28 +305,21 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
             installEnrollmentApplications(applicationPolicyDTO);
         }
 
-            appSubscribingDeviceIds = devices.stream().map(Device::getId).collect(Collectors.toList());
+        List<Integer> appSubscribingDeviceIds = applicationSubscriptionInfo.getDevices().stream().map(Device::getId)
+                .collect(Collectors.toList());
         Map<Integer, DeviceSubscriptionDTO> deviceSubscriptions = getDeviceSubscriptions(appSubscribingDeviceIds,
                 applicationReleaseId);
-            for (Map.Entry<Integer, DeviceSubscriptionDTO> deviceSubscription: deviceSubscriptions.entrySet()){
+        for (Map.Entry<Integer, DeviceSubscriptionDTO> deviceSubscription : deviceSubscriptions.entrySet()) {
             appReSubscribingDeviceIds.add(deviceSubscription.getKey());
             appSubscribingDeviceIds.remove(deviceSubscription.getKey());
         }
 
         updateSubscriptionsForEntInstall(applicationReleaseId, appSubscribingDeviceIds, appReSubscribingDeviceIds,
-                    subscribers, subType, action);
+                applicationSubscriptionInfo.getSubscribers(), subType, action);
-        } catch (DeviceManagementException e) {
-            String msg = "Error occurred while getting devices of given users or given roles.";
-            log.error(msg, e);
-            throw new ApplicationManagementException(msg, e);
-        } catch (GroupManagementException e) {
-            String msg = "Error occurred while getting devices of given groups";
-            log.error(msg, e);
-            throw new ApplicationManagementException(msg, e);
-        }
     }
 
-    @Override public void installAppsForDevice(DeviceIdentifier deviceIdentifier, List<String> releaseUUIDs)
+    @Override
+    public void installAppsForDevice(DeviceIdentifier deviceIdentifier, List<String> releaseUUIDs)
             throws ApplicationManagementException {
 
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
@@ -519,6 +383,105 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
         }
     }
 
+    /**
+     * Gets Application subscribing info by using requesting params
+     *
+     * @param applicationDTO Application DTO
+     * @param params list of subscribers. This list can be of either
+     *               {@link org.wso2.carbon.device.mgt.common.DeviceIdentifier} if {@param subType} is equal
+     *               to DEVICE or
+     *               {@link String} if {@param subType} is USER, ROLE or GROUP
+     * @param subType subscription type. E.g. <code>DEVICE, USER, ROLE, GROUP</code> {@see {
+     * @param <T> generic type of the method.
+     * @return {@link ApplicationSubscriptionInfo}
+     * @throws ApplicationManagementException if error occurred while getting Application subscription info
+     */
+    private <T> ApplicationSubscriptionInfo getAppSubscriptionInfo(ApplicationDTO applicationDTO, String subType,
+            List<T> params) throws ApplicationManagementException {
+
+        DeviceManagementProviderService deviceManagementProviderService = HelperUtil
+                .getDeviceManagementProviderService();
+        GroupManagementProviderService groupManagementProviderService = HelperUtil.getGroupManagementProviderService();
+        List<Device> devices = new ArrayList<>();
+        List<String> subscribers = new ArrayList<>();
+        List<DeviceIdentifier> errorDeviceIdentifiers = new ArrayList<>();
+        String deviceTypeName = null;
+
+        try {
+            if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType())) {
+                deviceTypeName = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId()).getName();
+            }
+
+            if (SubscriptionType.DEVICE.toString().equals(subType)) {
+                for (T param : params) {
+                    DeviceIdentifier deviceIdentifier = (DeviceIdentifier) param;
+                    if (StringUtils.isEmpty(deviceIdentifier.getId()) || StringUtils
+                            .isEmpty(deviceIdentifier.getType())) {
+                        log.warn("Found a device identifier which has either empty identity of the device or empty"
+                                + " device type. Hence ignoring the device identifier. ");
+                        continue;
+                    }
+                    if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType()) && !deviceIdentifier
+                            .getType().equals(deviceTypeName)) {
+                        log.warn("Found a device identifier which is not matched with the supported device type "
+                                + "of the application release which has UUID " + applicationDTO
+                                .getApplicationReleaseDTOs().get(0).getUuid() + " Application "
+                                + "supported device type is " + deviceTypeName + " and the identifier of which has a "
+                                + "different device type is " + deviceIdentifier.getId());
+                        errorDeviceIdentifiers.add(deviceIdentifier);
+                        continue;
+                    }
+                    devices.add(deviceManagementProviderService.getDevice(deviceIdentifier, false));
+                }
+            } else if (SubscriptionType.USER.toString().equalsIgnoreCase(subType)) {
+                for (T param : params) {
+                    String username = (String) param;
+                    subscribers.add(username);
+                    devices.addAll(deviceManagementProviderService.getDevicesOfUser(username));
+                }
+            } else if (SubscriptionType.ROLE.toString().equalsIgnoreCase(subType)) {
+                for (T param : params) {
+                    String roleName = (String) param;
+                    subscribers.add(roleName);
+                    devices.addAll(deviceManagementProviderService.getAllDevicesOfRole(roleName));
+                }
+            } else if (SubscriptionType.GROUP.toString().equalsIgnoreCase(subType)) {
+                for (T param : params) {
+                    String groupName = (String) param;
+                    subscribers.add(groupName);
+                    devices.addAll(groupManagementProviderService.getAllDevicesOfGroup(groupName, true));
+                }
+            } else {
+                String msg = "Found invalid subscription type " + subType+  " to install application release" ;
+                log.error(msg);
+                throw new BadRequestException(msg);
+            }
+
+            if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType()) && !SubscriptionType.DEVICE
+                    .toString().equals(subType)) {
+                //filter devices by device type
+                String tmpDeviceTypeName = deviceTypeName;
+                devices.removeIf(device -> !tmpDeviceTypeName.equals(device.getType()));
+            }
+
+            ApplicationSubscriptionInfo applicationSubscriptionInfo = new ApplicationSubscriptionInfo();
+            applicationSubscriptionInfo.setDevices(devices);
+            applicationSubscriptionInfo.setSubscribers(subscribers);
+            applicationSubscriptionInfo.setErrorDeviceIdentifiers(errorDeviceIdentifiers);
+            applicationSubscriptionInfo.setAppSupportingDeviceTypeName(deviceTypeName);
+            return applicationSubscriptionInfo;
+        } catch (DeviceManagementException e) {
+            String msg = "Error occurred while getting devices of given users or given roles or while getting device "
+                    + "type info.";
+            log.error(msg, e);
+            throw new ApplicationManagementException(msg, e);
+        } catch (GroupManagementException e) {
+            String msg = "Error occurred while getting devices of given groups";
+            log.error(msg, e);
+            throw new ApplicationManagementException(msg, e);
+        }
+    }
+
     /**
      * This method is responsible to update subscription data for google enterprise install.
      *
@@ -567,8 +530,6 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
         }
     }
 
-
-
     /**
      * THis method is responsible to validate application install or uninstall request.
      *
@@ -588,7 +549,7 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
         boolean isValidSubType = Arrays.stream(SubscriptionType.values())
                 .anyMatch(sub -> sub.name().equalsIgnoreCase(subType));
         if (!isValidSubType) {
-            String msg = "Found invalid subscription type " + subType+  " to install application release" ;
+            String msg = "Found invalid subscription type " + subType+  " to subscribe application release" ;
             log.error(msg);
             throw new BadRequestException(msg);
         }
@@ -618,8 +579,10 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
             ApplicationDTO applicationDTO, String subType, List<String> subscribers, String action)
             throws ApplicationManagementException {
 
+        //Get app subscribing info of each device
         SubscribingDeviceIdHolder subscribingDeviceIdHolder = getSubscribingDeviceIdHolder(devices,
                 applicationDTO.getApplicationReleaseDTOs().get(0).getId());
+
         List<Activity> activityList = new ArrayList<>();
         List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
         List<DeviceIdentifier> ignoredDeviceIdentifiers = new ArrayList<>();
@@ -704,14 +667,12 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
                         || Operation.Status.IN_PROGRESS.toString().equals(deviceSubscriptionDTO.getStatus())) {
                     subscribingDeviceIdHolder.getSkippedDevices().put(deviceIdentifier, device.getId());
                 } else if (deviceSubscriptionDTO.isUnsubscribed()) {
-                    if (Operation.Status.COMPLETED.toString().equals(deviceSubscriptionDTO.getStatus())) {
+                    if (!Operation.Status.COMPLETED.toString().equals(deviceSubscriptionDTO.getStatus())) {
-                        subscribingDeviceIdHolder.getAppReInstallableDevices().put(deviceIdentifier, device.getId());
-                    } else {
                         /*We can't ensure whether app is uninstalled successfully or not hence allow to perform both
                         install and uninstall operations*/
                         subscribingDeviceIdHolder.getAppReUnInstallableDevices().put(deviceIdentifier, device.getId());
-                        subscribingDeviceIdHolder.getAppReInstallableDevices().put(deviceIdentifier, device.getId());
                     }
+                    subscribingDeviceIdHolder.getAppReInstallableDevices().put(deviceIdentifier, device.getId());
                 } else if (!deviceSubscriptionDTO.isUnsubscribed() && Operation.Status.COMPLETED.toString()
                         .equals(deviceSubscriptionDTO.getStatus())) {
                     subscribingDeviceIdHolder.getAppInstalledDevices().put(deviceIdentifier, device.getId());
@@ -1126,8 +1087,7 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
     }
 
     @Override
-    public PaginationResult getAppInstalledDevices(int offsetValue, int limitValue, String appUUID,
+    public PaginationResult getAppInstalledDevices(int offsetValue, int limitValue, String appUUID, String status)
-                                                   String status)
             throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         DeviceManagementProviderService deviceManagementProviderService = HelperUtil

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/main/java/org/wso2/carbon/device/application/mgt/core/lifecycle/LifecycleStateManager.java

@@ -38,7 +38,7 @@ import java.util.Map;
 public class LifecycleStateManager {
 
     private Map<String, LifecycleState> lifecycleStates;
-    private static Log log = LogFactory.getLog(LifecycleStateManager.class);
+    private static final Log log = LogFactory.getLog(LifecycleStateManager.class);
 
     public void init(List<LifecycleState> states) throws LifecycleManagementException {
         lifecycleStates = new HashMap<>();
@@ -48,7 +48,8 @@ public class LifecycleStateManager {
             }
             lifecycleStates.put(lifecycleState.getName().toUpperCase(), lifecycleState);
             try {
-                PermissionUtils.putPermission(lifecycleState.getPermission());
+                PermissionUtils
+                        .putPermission(PermissionUtils.ADMIN_PERMISSION_REGISTRY_PATH + lifecycleState.getPermission());
             } catch (PermissionManagementException e) {
                 String msg = "Error when adding permission " + lifecycleState.getPermission() + "  related to the "
                         + "state: " + lifecycleState.getName();

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

@@ -20,24 +20,20 @@ package org.wso2.carbon.device.application.mgt.core.util;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
 
-import java.util.List;
-import java.util.UUID;
-
 /**
  * Utility methods used in the Application Management.
  */
 public class HelperUtil {
 
-    private static Log log = LogFactory.getLog(HelperUtil.class);
+    private static final Log log = LogFactory.getLog(HelperUtil.class);
 
     private static DeviceManagementProviderService deviceManagementProviderService;
     private static GroupManagementProviderService groupManagementProviderService;
 
-    public static DeviceManagementProviderService getDeviceManagementProviderService() {
+    public static synchronized DeviceManagementProviderService getDeviceManagementProviderService() {
         if (deviceManagementProviderService == null) {
             PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
             deviceManagementProviderService = (DeviceManagementProviderService) ctx
@@ -51,7 +47,7 @@ public class HelperUtil {
         return deviceManagementProviderService;
     }
 
-    public static GroupManagementProviderService getGroupManagementProviderService() {
+    public static synchronized GroupManagementProviderService getGroupManagementProviderService() {
         if (groupManagementProviderService == null) {
             PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
             groupManagementProviderService = (GroupManagementProviderService) ctx

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.ui/react-app/package.json

@@ -17,14 +17,10 @@
     "acorn": "^6.2.0",
     "antd": "^4.0.0",
     "axios": "^0.19.0",
-    "babel-eslint": "^9.0.0",
+    "babel-eslint": "^10.1.0",
     "d3": "^5.9.7",
     "dagre": "^0.8.4",
     "entgra-icons-react": "^1.0.0",
-    "eslint": "^5.16.0",
-    "eslint-plugin-import": "^2.18.2",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-react": "^7.16.0",
     "fetch": "^1.1.0",
     "imagemin": "^6.1.0",
     "keymirror": "^0.1.1",
@@ -64,7 +60,9 @@
     "eslint": "^5.16.0",
     "eslint-config-prettier": "4.3.0",
     "eslint-plugin-babel": "5.3.0",
+    "eslint-plugin-import": "^2.21.2",
     "eslint-plugin-jsx": "0.0.2",
+    "eslint-plugin-jsx-a11y": "^6.3.1",
     "eslint-plugin-prettier": "3.1.0",
     "eslint-plugin-react": "7.14.2",
     "express": "^4.17.1",

components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/react-app/package.json

@@ -13,7 +13,7 @@
     "acorn": "^6.2.0",
     "antd": "^4.0.0",
     "axios": "^0.18.1",
-    "babel-eslint": "^9.0.0",
+    "babel-eslint": "^10.1.0",
     "d3": "^5.9.7",
     "dagre": "^0.8.4",
     "imagemin": "^5.3.1",

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -504,15 +504,13 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         return Response.status(Response.Status.OK).entity(device).build();
     }
 
-    @Path("/{deviceType}/{deviceId}/location-history")
     @GET
-    public Response getDeviceLocationInfo(@PathParam("deviceType") String deviceType,
+    @Path("/{deviceType}/{deviceId}/location-history")
+    public Response getDeviceLocationInfo(
+            @PathParam("deviceType") String deviceType,
             @PathParam("deviceId") String deviceId,
-                                          @QueryParam("from") long from, @QueryParam("to") long to) {
+            @QueryParam("from") long from,
-
+            @QueryParam("to") long to) {
-        String errorMessage;
-        DeviceLocationHistory deviceLocationHistory = new DeviceLocationHistory();
-
         try {
             RequestValidationUtil.validateDeviceIdentifier(deviceType, deviceId);
             DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService();
@@ -520,81 +518,81 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                     DeviceMgtAPIUtils.getDeviceAccessAuthorizationService();
             String authorizedUser = CarbonContext.getThreadLocalCarbonContext().getUsername();
             DeviceIdentifier deviceIdentifier = new DeviceIdentifier(deviceId, deviceType);
-            deviceIdentifier.setId(deviceId);
-            deviceIdentifier.setType(deviceType);
 
             if (!deviceAccessAuthorizationService.isUserAuthorized(deviceIdentifier, authorizedUser)) {
                 String msg = "User '" + authorizedUser + "' is not authorized to retrieve the given device id '" +
                         deviceId + "'";
                 log.error(msg);
-                return Response.status(Response.Status.UNAUTHORIZED).entity(
+                return Response.status(Response.Status.UNAUTHORIZED).entity(new ErrorResponse.ErrorResponseBuilder()
-                        new ErrorResponse.ErrorResponseBuilder().setCode(401l).setMessage(msg).build()).build();
+                        .setCode(Response.Status.UNAUTHORIZED.getStatusCode()).setMessage(msg).build()).build();
             }
             if (from == 0 || to == 0) {
-                errorMessage = "Invalid values for from/to";
+                String msg = "Invalid values for from/to";
-                log.error(errorMessage);
+                log.error(msg);
-                return Response.status(Response.Status.BAD_REQUEST).entity(
+                return Response.status(Response.Status.BAD_REQUEST).entity(new ErrorResponse.ErrorResponseBuilder()
-                        new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage)).build();
+                        .setCode(Response.Status.BAD_REQUEST.getStatusCode()).setMessage(msg)).build();
             }
 
-            List<List<DeviceLocationHistorySnapshot>> locationHistorySnapshotList = new ArrayList<>();
             // Get the location history snapshots for the given period
-            List<DeviceLocationHistorySnapshot> deviceLocationHistorySnapshots = dms.getDeviceLocationInfo(deviceIdentifier, from, to);
+            List<DeviceLocationHistorySnapshot> deviceLocationHistorySnapshots = dms
+                    .getDeviceLocationInfo(deviceIdentifier, from, to);
 
             OperationMonitoringTaskConfig operationMonitoringTaskConfig = dms.getDeviceMonitoringConfig(deviceType);
             int taskFrequency = operationMonitoringTaskConfig.getFrequency();
             int operationRecurrentTimes = 0;
 
             List<MonitoringOperation> monitoringOperations = operationMonitoringTaskConfig.getMonitoringOperation();
-            for (MonitoringOperation monitoringOperation :
+            for (MonitoringOperation monitoringOperation : monitoringOperations) {
-                    monitoringOperations) {
                 if (monitoringOperation.getTaskName().equals("DEVICE_LOCATION")) {
                     operationRecurrentTimes = monitoringOperation.getRecurrentTimes();
                     break;
                 }
             }
+
             // Device Location operation frequency in milliseconds. Adding 100000 ms as an error
             long operationFrequency = taskFrequency * operationRecurrentTimes + 100000;
+            Queue<DeviceLocationHistorySnapshot> deviceLocationHistorySnapshotsQueue = new LinkedList<>(
+                    deviceLocationHistorySnapshots);
+            List<List<DeviceLocationHistorySnapshot>> locationHistorySnapshotList = new ArrayList<>();
 
-            Queue<DeviceLocationHistorySnapshot> deviceLocationHistorySnapshotsQueue = new LinkedList<>(deviceLocationHistorySnapshots);
+            while (!deviceLocationHistorySnapshotsQueue.isEmpty()) {
-
-            while (deviceLocationHistorySnapshotsQueue.size() > 0) {
                 List<DeviceLocationHistorySnapshot> snapshots = new ArrayList<>();
                 // Make a copy of remaining snapshots
-                List<DeviceLocationHistorySnapshot> cachedSnapshots = new ArrayList<>(deviceLocationHistorySnapshotsQueue);
+                List<DeviceLocationHistorySnapshot> cachedSnapshots = new ArrayList<>(
+                        deviceLocationHistorySnapshotsQueue);
 
                 for (int i = 0; i < cachedSnapshots.size(); i++) {
                     DeviceLocationHistorySnapshot currentSnapshot = deviceLocationHistorySnapshotsQueue.poll();
                     snapshots.add(currentSnapshot);
-                    if (deviceLocationHistorySnapshotsQueue.size() > 0) {
+                    if (!deviceLocationHistorySnapshotsQueue.isEmpty()) {
                         DeviceLocationHistorySnapshot nextSnapshot = deviceLocationHistorySnapshotsQueue.peek();
-                        if (nextSnapshot.getUpdatedTime().getTime() - currentSnapshot.getUpdatedTime().getTime() > operationFrequency) {
+                        if (nextSnapshot.getUpdatedTime().getTime() - currentSnapshot.getUpdatedTime().getTime()
+                                > operationFrequency) {
                             break;
                         }
                     }
                 }
                 locationHistorySnapshotList.add(snapshots);
             }
+            DeviceLocationHistory deviceLocationHistory = new DeviceLocationHistory();
             deviceLocationHistory.setLocationHistorySnapshots(locationHistorySnapshotList);
-
+            return Response.status(Response.Status.OK).entity(deviceLocationHistory).build();
-
         } catch (DeviceManagementException e) {
-            errorMessage = "Error occurred while fetching the device information.";
+            String msg = "Error occurred while fetching the device information.";
-            log.error(errorMessage, e);
+            log.error(msg, e);
-            return Response.serverError().entity(
+            return Response.serverError().entity(new ErrorResponse.ErrorResponseBuilder()
-                    new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(errorMessage).build()).build();
+                    .setCode(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).setMessage(msg).build()).build();
         } catch (DeviceAccessAuthorizationException e) {
-            errorMessage = "Error occurred while checking the device authorization.";
+            String msg = "Error occurred while checking the device authorization.";
-            log.error(errorMessage, e);
+            log.error(msg, e);
-            return Response.serverError().entity(
+            return Response.serverError().entity(new ErrorResponse.ErrorResponseBuilder()
-                    new ErrorResponse.ErrorResponseBuilder().setCode(500l).setMessage(errorMessage).build()).build();
+                    .setCode(Response.Status.INTERNAL_SERVER_ERROR.getStatusCode()).setMessage(msg).build()).build();
-        } catch (InputValidationException e){
+        } catch (InputValidationException e) {
-            errorMessage = "Invalid device Id or device type";
+            String msg = "Invalid device Id or device type";
-            log.error(errorMessage, e);
+            log.error(msg, e);
-            return Response.status(Response.Status.BAD_REQUEST).entity(
+            return Response.status(Response.Status.BAD_REQUEST).entity(new ErrorResponse.ErrorResponseBuilder()
-                    new ErrorResponse.ErrorResponseBuilder().setCode(400l).setMessage(errorMessage)).build();
+                    .setCode(Response.Status.BAD_REQUEST.getStatusCode()).setMessage(msg)).build();
         }
-        return Response.status(Response.Status.OK).entity(deviceLocationHistory).build();
     }
 
     @GET

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/PolicyManagementServiceImpl.java

@@ -83,6 +83,7 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
                 .validatePolicyDetails(policyWrapper);
         // validation failure results;
         if (!features.isEmpty()) {
+            log.error("Policy feature/s validation failed.");
             return Response.status(Response.Status.BAD_REQUEST).entity(features).build();
         }
         PolicyManagerService policyManagementService = DeviceMgtAPIUtils.getPolicyManagementService();
@@ -224,6 +225,7 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
                 .validatePolicyDetails(policyWrapper);
         // validation failure results;
         if (!features.isEmpty()) {
+            log.error("Policy feature/s validation failed.");
             return Response.status(Response.Status.BAD_REQUEST).entity(features).build();
         }
         PolicyManagerService policyManagementService = DeviceMgtAPIUtils.getPolicyManagementService();
@@ -481,6 +483,7 @@ public class PolicyManagementServiceImpl implements PolicyManagementService {
                 = RequestValidationUtil.validateProfileFeatures(profileFeaturesList);
         // validation failure results;
         if (!features.isEmpty()) {
+            log.error("Policy feature/s validation failed.");
             return Response.status(Response.Status.BAD_REQUEST).entity(features).build();
         }
         return Response.status(Response.Status.OK).entity("Valid request").build();

components/device-mgt/org.wso2.carbon.device.mgt.api/src/test/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImplTest.java

@@ -47,10 +47,10 @@ public class GeoLocationBasedServiceImplTest {
         List<GeoCluster> geoClusters = new ArrayList<>();
         geoClusters.add(new GeoCluster(new GeoCoordinate(1.5, 80.7),
                 new GeoCoordinate(1.1, 79.5), new GeoCoordinate(1.9, 82.1), 3,
-                "tb32", "aegtew234", "android", "1234"));
+                "tb32", "aegtew234", "test1", "android", "1234"));
         geoClusters.add(new GeoCluster(new GeoCoordinate(10.2, 86.1),
                 new GeoCoordinate(9.8, 84.7), new GeoCoordinate(11.1, 88.1), 4,
-                "t1gd", "swerty12s", "android", "1234"));
+                "t1gd", "swerty12s", "t2test", "android", "1234"));
         Mockito.doReturn(geoClusters).when(deviceManagementProviderService)
                 .findGeoClusters(null, Mockito.any(GeoCoordinate.class), Mockito.any(GeoCoordinate.class), Mockito.anyInt());
         Response response = geoLocationBasedService.getGeoDeviceLocations(null, 0.4, 15, 75.6,

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/device/details/LocationBean.java

@@ -0,0 +1,89 @@
+/*
+ * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (pvt) Ltd. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.common.device.details;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+import java.util.List;
+
+@ApiModel(
+        value = "LocationBean",
+        description = "This class carries all information related IOS Device location."
+)
+public class LocationBean {
+
+    @ApiModelProperty(
+            name = "latitude",
+            value = "Latitude of the IOS device Location.",
+            required = true
+    )
+    private float latitude;
+    @ApiModelProperty(
+            name = "longitude",
+            value = "Longitude of the IOS device Location.",
+            required = true
+    )
+    private float longitude;
+    @ApiModelProperty(
+            name = "operationId",
+            value = "Specific Id of the Location operation.",
+            required = true
+    )
+    private String operationId;
+
+    @ApiModelProperty(
+            name = "locationEvents",
+            value = "If this is a device initiated location publishing."
+    )
+    private List<LocationEventBean> locations;
+
+    public List<LocationEventBean> getLocationEvents() {
+        return locations;
+    }
+
+    public void setLocationEvents(List<LocationEventBean> locationEvents) {
+        this.locations = locationEvents;
+    }
+
+    public String getOperationId() {
+        return operationId;
+    }
+
+    public void setOperationId(String operationId) {
+        this.operationId = operationId;
+    }
+
+
+    public float getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(float latitude) {
+        this.latitude = latitude;
+    }
+
+    public float getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(float longitude) {
+        this.longitude = longitude;
+    }
+}

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/device/details/LocationEventBean.java

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2020, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+ *
+ * Entgra (pvt) Ltd. licenses this file to you under the Apache License,
+ * Version 2.0 (the "License"); you may not use this file except
+ * in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.wso2.carbon.device.mgt.common.device.details;
+
+import io.swagger.annotations.ApiModelProperty;
+
+public class LocationEventBean {
+
+    @ApiModelProperty(
+            name = "latitude",
+            value = "Latitude of the IOS device Location.",
+            required = true
+    )
+    private String latitude;
+
+    @ApiModelProperty(
+            name = "longitude",
+            value = "Longitude of the IOS device Location.",
+            required = true
+    )
+    private String longitude;
+
+    @ApiModelProperty(
+            name = "timestamp",
+            value = "Device Location time.",
+            required = true
+    )
+    private String timestamp;
+
+    public String getLatitude() {
+        return latitude;
+    }
+
+    public void setLatitude(String latitude) {
+        this.latitude = latitude;
+    }
+
+    public String getLongitude() {
+        return longitude;
+    }
+
+    public void setLongitude(String longitude) {
+        this.longitude = longitude;
+    }
+
+    public String getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(String timestamp) {
+        this.timestamp = timestamp;
+    }
+}

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/AbstractDeviceDAOImpl.java

@@ -1733,6 +1733,7 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
                     " MAX(DEVICE_LOCATION.LONGITUDE) AS MAX_LONGITUDE," +
                     " SUBSTRING(DEVICE_LOCATION.GEO_HASH,1,?) AS GEOHASH_PREFIX, COUNT(*) AS COUNT," +
                     " MIN(DEVICE.DEVICE_IDENTIFICATION) AS DEVICE_IDENTIFICATION," +
+                    " MIN(DEVICE.NAME) AS NAME," +
                     " MIN(DEVICE_TYPE.NAME) AS TYPE, " +
                     " MIN(DEVICE.LAST_UPDATED_TIMESTAMP) AS LAST_UPDATED_TIMESTAMP " +
                     "FROM DM_DEVICE_LOCATION AS DEVICE_LOCATION,DM_DEVICE AS DEVICE, DM_DEVICE_TYPE AS DEVICE_TYPE " +
@@ -1763,13 +1764,14 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
                 double min_longitude = rs.getDouble("MIN_LONGITUDE");
                 double max_longitude = rs.getDouble("MAX_LONGITUDE");
                 String device_identification = rs.getString("DEVICE_IDENTIFICATION");
+                String device_name = rs.getString("NAME");
                 String device_type = rs.getString("TYPE");
                 String last_seen = rs.getString("LAST_UPDATED_TIMESTAMP");
                 long count = rs.getLong("COUNT");
                 String geohashPrefix = rs.getString("GEOHASH_PREFIX");
                 geoClusters.add(new GeoCluster(new GeoCoordinate(latitude, longitude),
                         new GeoCoordinate(min_latitude, min_longitude), new GeoCoordinate(max_latitude, max_longitude),
-                        count, geohashPrefix, device_identification, device_type, last_seen));
+                        count, geohashPrefix, device_identification, device_name, device_type, last_seen));
             }
         } catch (SQLException e) {
             throw new DeviceManagementDAOException("Error occurred while retrieving information of  " +
@@ -1828,40 +1830,45 @@ public abstract class AbstractDeviceDAOImpl implements DeviceDAO {
     }
 
     @Override
-    public List<DeviceLocationHistorySnapshot> getDeviceLocationInfo(DeviceIdentifier deviceIdentifier, long from, long to)
+    public List<DeviceLocationHistorySnapshot> getDeviceLocationInfo(DeviceIdentifier deviceIdentifier, long from,
-            throws DeviceManagementDAOException {
+            long to) throws DeviceManagementDAOException {
-
-        Connection conn;
-        PreparedStatement stmt = null;
-        ResultSet rs = null;
         List<DeviceLocationHistorySnapshot> deviceLocationHistories = new ArrayList<>();
+        String sql = "SELECT "
+                + "DEVICE_ID, "
+                + "TENANT_ID, "
+                + "DEVICE_ID_NAME, "
+                + "DEVICE_TYPE_NAME, "
+                + "LATITUDE, "
+                + "LONGITUDE, "
+                + "SPEED, "
+                + "HEADING, "
+                + "TIMESTAMP, "
+                + "GEO_HASH, "
+                + "DEVICE_OWNER, "
+                + "DEVICE_ALTITUDE, "
+                + "DISTANCE "
+                + "FROM DM_DEVICE_HISTORY_LAST_SEVEN_DAYS "
+                + "WHERE "
+                + "DEVICE_ID_NAME = ? AND "
+                + "DEVICE_TYPE_NAME = ? AND "
+                + "TIMESTAMP BETWEEN ? AND ?";
         try {
-            conn = this.getConnection();
+            Connection conn = this.getConnection();
-
+            try (PreparedStatement stmt = conn.prepareStatement(sql)) {
-            String sql =
-                    "SELECT DEVICE_ID, TENANT_ID, DEVICE_ID_NAME, DEVICE_TYPE_NAME, LATITUDE, LONGITUDE, SPEED, " +
-                            "HEADING, TIMESTAMP, GEO_HASH, DEVICE_OWNER, DEVICE_ALTITUDE, DISTANCE " +
-                            "FROM DM_DEVICE_HISTORY_LAST_SEVEN_DAYS " +
-                            "WHERE DEVICE_ID_NAME = ? " +
-                            "AND DEVICE_TYPE_NAME = ? " +
-                            "AND TIMESTAMP >= ? " +
-                            "AND TIMESTAMP <= ?";
-
-            stmt = conn.prepareStatement(sql);
                 stmt.setString(1, deviceIdentifier.getId());
                 stmt.setString(2, deviceIdentifier.getType());
                 stmt.setLong(3, from);
                 stmt.setLong(4, to);
-            rs = stmt.executeQuery();
+                try (ResultSet rs = stmt.executeQuery()) {
                     while (rs.next()) {
                         deviceLocationHistories.add(DeviceManagementDAOUtil.loadDeviceLocation(rs));
                     }
+                }
+            }
         } catch (SQLException e) {
-            String errMessage = "Error occurred while obtaining the DB connection to get device location information";
+            String msg = "Error occurred while obtaining the DB connection to get device location information";
-            log.error(errMessage, e);
+            log.error(msg, e);
-            throw new DeviceManagementDAOException(errMessage, e);
+            throw new DeviceManagementDAOException(msg, e);
-        } finally {
-            DeviceManagementDAOUtil.cleanupResources(stmt, rs);
         }
         return deviceLocationHistories;
     }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/GenericDeviceDAOImpl.java

@@ -30,6 +30,8 @@ import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.dao.impl.AbstractDeviceDAOImpl;
 import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
+import org.wso2.carbon.device.mgt.core.geo.GeoCluster;
+import org.wso2.carbon.device.mgt.core.geo.geoHash.GeoCoordinate;
 import org.wso2.carbon.device.mgt.core.report.mgt.Constants;
 
 import java.sql.Connection;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/dao/impl/device/SQLServerDeviceDAOImpl.java

@@ -968,6 +968,7 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                     + ") AS GEOHASH_PREFIX, "
                     + "COUNT(*) AS COUNT, "
                     + "MIN(DEVICE.DEVICE_IDENTIFICATION) AS DEVICE_IDENTIFICATION, "
+                    + "MIN(DEVICE.NAME) AS NAME, "
                     + "MIN(DEVICE_TYPE.NAME) AS TYPE, "
                     + "MIN(DEVICE.LAST_UPDATED_TIMESTAMP) AS LAST_UPDATED_TIMESTAMP, "
                     + "COUNT(DEVICE_LOCATION.GEO_HASH) "
@@ -1004,6 +1005,7 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                         double min_longitude = rs.getDouble("MIN_LONGITUDE");
                         double max_longitude = rs.getDouble("MAX_LONGITUDE");
                         String device_identification = rs.getString("DEVICE_IDENTIFICATION");
+                        String device_name = rs.getString("NAME");
                         String device_type = rs.getString("TYPE");
                         String last_seen = rs.getString("LAST_UPDATED_TIMESTAMP");
                         long count = rs.getLong("COUNT");
@@ -1011,7 +1013,7 @@ public class SQLServerDeviceDAOImpl extends AbstractDeviceDAOImpl {
                         geoClusters.add(new GeoCluster(new GeoCoordinate(latitude, longitude),
                                 new GeoCoordinate(min_latitude, min_longitude),
                                 new GeoCoordinate(max_latitude, max_longitude), count, geohashPrefix,
-                                device_identification, device_type, last_seen));
+                                device_identification, device_name, device_type, last_seen));
                     }
                 }
             }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/geo/GeoCluster.java

@@ -9,18 +9,20 @@ public class GeoCluster {
     private long count;
     private String geohashPrefix;
     private String deviceIdentification;
+    private String deviceName;
     private String deviceType;
     private String lastSeen;
 
 
     public GeoCluster(GeoCoordinate coordinates, GeoCoordinate southWestBound, GeoCoordinate northEastBound, long count,
-                      String geohashPrefix, String deviceIdentification, String deviceType, String lastSeen){
+                      String geohashPrefix, String deviceIdentification, String deviceName, String deviceType, String lastSeen){
         this.coordinates=coordinates;
         this.southWestBound=southWestBound;
         this.northEastBound=northEastBound;
         this.count=count;
         this.geohashPrefix=geohashPrefix;
         this.deviceIdentification=deviceIdentification;
+        this.deviceName=deviceName;
         this.deviceType=deviceType;
         this.lastSeen = lastSeen;
 
@@ -50,6 +52,10 @@ public class GeoCluster {
         return deviceIdentification;
     }
 
+    public String getDeviceName() {
+        return deviceName;
+    }
+
     public String getDeviceType() { return deviceType;
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/otp/mgt/dao/OTPManagementDAO.java

@@ -20,15 +20,16 @@ package org.wso2.carbon.device.mgt.core.otp.mgt.dao;
 import org.wso2.carbon.device.mgt.common.otp.mgt.dto.OneTimePinDTO;
 import org.wso2.carbon.device.mgt.core.otp.mgt.exception.OTPManagementDAOException;
 
+import java.util.List;
+
 public interface OTPManagementDAO {
 
     /**
      * Save OTP token data and tenant details of registering user
-     * @param oneTimePinDTO OTPMailDTO
+     * @param oneTimePinDTOList OTPMailDTO
-     * @return  Primary key of the newly adding data raw
      * @throws OTPManagementDAOException if error occurred whule storing data
      */
-    int addOTPData(OneTimePinDTO oneTimePinDTO) throws OTPManagementDAOException;
+    void addOTPData(List<OneTimePinDTO> oneTimePinDTOList) throws OTPManagementDAOException;
 
     /**
      * Get OTP data for requesting One Time Token

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/otp/mgt/dao/impl/GenericOTPManagementDAOImpl.java

@@ -32,18 +32,21 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.sql.Timestamp;
 import java.util.Calendar;
+import java.util.List;
 
 public class GenericOTPManagementDAOImpl extends AbstractDAOImpl implements OTPManagementDAO {
 
     private static final Log log = LogFactory.getLog(GenericOTPManagementDAOImpl.class);
 
     @Override
-    public int addOTPData(OneTimePinDTO oneTimePinDTO) throws OTPManagementDAOException {
+    public void addOTPData(List<OneTimePinDTO> oneTimePinDTOList) throws OTPManagementDAOException {
         if (log.isDebugEnabled()) {
             log.debug("Request received in DAO Layer to create an OTP data entry");
             log.debug("OTP Details : ");
+            for(OneTimePinDTO oneTimePinDTO: oneTimePinDTOList){
                 log.debug("OTP key : " + oneTimePinDTO.getOtpToken() + " Email : " + oneTimePinDTO.getEmail());
             }
+        }
 
         String sql = "INSERT INTO DM_OTP_DATA "
                 + "(OTP_TOKEN, "
@@ -57,7 +60,8 @@ public class GenericOTPManagementDAOImpl extends AbstractDAOImpl implements OTPM
             Connection conn = this.getDBConnection();
             Calendar calendar = Calendar.getInstance();
             Timestamp timestamp = new Timestamp(calendar.getTime().getTime());
-            try (PreparedStatement stmt = conn.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS)) {
+            try (PreparedStatement stmt = conn.prepareStatement(sql)) {
+                for (OneTimePinDTO oneTimePinDTO : oneTimePinDTOList) {
                     stmt.setString(1, oneTimePinDTO.getOtpToken());
                     stmt.setString(2, oneTimePinDTO.getEmail());
                     stmt.setString(3, oneTimePinDTO.getEmailType());
@@ -65,21 +69,16 @@ public class GenericOTPManagementDAOImpl extends AbstractDAOImpl implements OTPM
                     stmt.setTimestamp(5, timestamp);
                     stmt.setInt(6, oneTimePinDTO.getTenantId());
                     stmt.setString(7, oneTimePinDTO.getUsername());
-                stmt.executeUpdate();
+                    stmt.addBatch();
-                try (ResultSet rs = stmt.getGeneratedKeys()) {
-                    if (rs.next()) {
-                        return rs.getInt(1);
-                    }
-                    return -1;
                 }
+                stmt.executeBatch();
             }
         } catch (DBConnectionException e) {
-            String msg = "Error occurred while obtaining the DB connection to create an opt entry for email "
+            String msg = "Error occurred while obtaining the DB connection to create an opt entry.";
-                    + oneTimePinDTO.getEmail();
             log.error(msg, e);
             throw new OTPManagementDAOException(msg, e);
         } catch (SQLException e) {
-            String msg = "Error occurred while executing SQL to create an otp entry for email " + oneTimePinDTO.getEmail();
+            String msg = "Error occurred while executing SQL to create an otp entry";
             log.error(msg, e);
             throw new OTPManagementDAOException(msg, e);
         }

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

@@ -61,6 +61,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
+import java.util.ArrayList;
+import java.util.Collections;
 
 public class OTPManagementServiceImpl implements OTPManagementService {
 
@@ -82,12 +84,7 @@ public class OTPManagementServiceImpl implements OTPManagementService {
                 otpWrapper.getUsername(), tenant, -1234);
         try {
             ConnectionManagerUtil.beginDBTransaction();
-            if (this.otpManagementDAO.addOTPData(oneTimePinDTO) == -1) {
+            this.otpManagementDAO.addOTPData(Collections.singletonList(oneTimePinDTO));
-                ConnectionManagerUtil.rollbackDBTransaction();
-                String msg = "OTP data saving failed. Please, contact Administrator";
-                log.error(msg);
-                throw new OTPManagementException(msg);
-            }
             Properties props = new Properties();
             props.setProperty("first-name", tenant.getAdminFirstName());
             props.setProperty("otp-token", oneTimePinDTO.getOtpToken());
@@ -98,12 +95,12 @@ public class OTPManagementServiceImpl implements OTPManagementService {
             log.error(msg, e);
             throw new OTPManagementException(msg, e);
         } catch (DBConnectionException e) {
-            String msg = "Error occurred while getting database connection.";
+            String msg = "Error occurred while getting database connection to add OPT data.";
             log.error(msg, e);
             throw new OTPManagementException(msg, e);
         } catch (OTPManagementDAOException e) {
             ConnectionManagerUtil.rollbackDBTransaction();
-            String msg = "Error occurred while saving the OTP data. Email address: " + oneTimePinDTO.getEmail();
+            String msg = "Error occurred while saving the OTP data for given email" ;
             log.error(msg, e);
             throw new OTPManagementException(msg, e);
         } finally {
@@ -219,24 +216,44 @@ public class OTPManagementServiceImpl implements OTPManagementService {
         }
         int tenantId = CarbonContext.getThreadLocalCarbonContext().getTenantId();
         OneTimePinDTO oneTimePinDTO;
+        List<OneTimePinDTO> oneTimePinDTOList = new ArrayList<>();
         Properties props = new Properties();
         props.setProperty("enrollment-steps", enrollmentSteps.toString());
         try {
+            ConnectionManagerUtil.beginDBTransaction();
             for (String username : deviceEnrollmentInvitation.getUsernames()) {
                 String emailAddress = DeviceManagerUtil.getUserClaimValue(
                         username, DeviceManagementConstants.User.CLAIM_EMAIL_ADDRESS);
                 oneTimePinDTO = createOneTimePin(emailAddress, OTPEmailTypes.DEVICE_ENROLLMENT.toString(), username,
                         null, tenantId);
+                oneTimePinDTOList.add(oneTimePinDTO);
                 props.setProperty("first-name", DeviceManagerUtil.
                         getUserClaimValue(username, DeviceManagementConstants.User.CLAIM_FIRST_NAME));
                 props.setProperty("username", username);
                 props.setProperty("otp-token", oneTimePinDTO.getOtpToken());
                 sendMail(props, emailAddress, DeviceManagementConstants.EmailAttributes.USER_ENROLLMENT_TEMPLATE);
             }
+            this.otpManagementDAO.addOTPData(oneTimePinDTOList);
+            ConnectionManagerUtil.commitDBTransaction();
         } catch (UserStoreException e) {
             String msg = "Error occurred while getting claim values to invite user";
             log.error(msg, e);
             throw new OTPManagementException(msg, e);
+        } catch (DBConnectionException e) {
+            String msg = "Error occurred while getting database connection to add OPT data.";
+            log.error(msg, e);
+            throw new OTPManagementException(msg, e);
+        } catch (TransactionManagementException e) {
+            String msg = "SQL Error occurred when adding OPT data to send device enrollment Invitation.";
+            log.error(msg, e);
+            throw new OTPManagementException(msg, e);
+        } catch (OTPManagementDAOException e) {
+            ConnectionManagerUtil.rollbackDBTransaction();
+            String msg = "Error occurred while saving the OTP data.";
+            log.error(msg, e);
+            throw new OTPManagementException(msg, e);
+        } finally {
+            ConnectionManagerUtil.closeDBConnection();
         }
     }
 

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

@@ -3051,26 +3051,21 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
     }
 
     @Override
-    public List<DeviceLocationHistorySnapshot> getDeviceLocationInfo(DeviceIdentifier deviceIdentifier, long from, long to)
+    public List<DeviceLocationHistorySnapshot> getDeviceLocationInfo(DeviceIdentifier deviceIdentifier, long from,
-            throws DeviceManagementException {
+            long to) throws DeviceManagementException {
-
         if (log.isDebugEnabled()) {
             log.debug("Get device location information");
         }
-
         List<DeviceLocationHistorySnapshot> deviceLocationHistory;
-        String errMessage;
-
         try {
             DeviceManagementDAOFactory.openConnection();
             deviceLocationHistory = deviceDAO.getDeviceLocationInfo(deviceIdentifier, from, to);
-
         } catch (DeviceManagementDAOException e) {
-            errMessage = "Error occurred in getDeviceLocationInfo";
+            String errMessage = "Error occurred in getDeviceLocationInfo";
             log.error(errMessage, e);
             throw new DeviceManagementException(errMessage, e);
         } catch (SQLException e) {
-            errMessage = "Error occurred while opening a connection to the data source";
+            String errMessage = "Error occurred while opening a connection to the data source";
             log.error(errMessage, e);
             throw new DeviceManagementException(errMessage, e);
         } finally {

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/mgt/impl/PolicyManagerImpl.java

@@ -137,19 +137,15 @@ public class PolicyManagerImpl implements PolicyManager {
             if (policy.getUsers() != null) {
                 policyDAO.addPolicyToUser(policy.getUsers(), policy);
             }
-
             if (policy.getRoles() != null) {
                 policyDAO.addPolicyToRole(policy.getRoles(), policy);
             }
-
             if (policy.getDevices() != null) {
                 policyDAO.addPolicyToDevice(policy.getDevices(), policy);
             }
-
             if (policy.getDeviceGroups() != null && !policy.getDeviceGroups().isEmpty()) {
                 policyDAO.addDeviceGroupsToPolicy(policy);
             }
-
             if (policy.getPolicyCriterias() != null) {
                 List<PolicyCriterion> criteria = policy.getPolicyCriterias();
                 for (PolicyCriterion criterion : criteria) {
@@ -174,12 +170,10 @@ public class PolicyManagerImpl implements PolicyManager {
                 policyDAO.activatePolicy(policy.getId());
             }
             PolicyManagementDAOFactory.commitTransaction();
-
         } catch (PolicyManagerDAOException e) {
             PolicyManagementDAOFactory.rollbackTransaction();
             throw new PolicyManagementException("Error occurred while adding the policy (" +
                     policy.getId() + " - " + policy.getPolicyName() + ")", e);
-
         } catch (ProfileManagerDAOException e) {
             PolicyManagementDAOFactory.rollbackTransaction();
             throw new PolicyManagementException("Error occurred while adding the profile related to policy (" +
@@ -196,7 +190,6 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public Policy updatePolicy(Policy policy) throws PolicyManagementException {
-
         try {
             // Previous policy needs to be obtained before beginning the transaction
             Policy previousPolicy = this.getPolicy(policy.getId());
@@ -205,7 +198,6 @@ public class PolicyManagerImpl implements PolicyManager {
             // This will keep track of the policies updated.
             policyDAO.recordUpdatedPolicy(policy);
 
-
             List<ProfileFeature> existingFeaturesList = new ArrayList<>();
             List<ProfileFeature> newFeaturesList = new ArrayList<>();
             List<ProfileFeature> featuresToDelete = new ArrayList<>();
@@ -215,7 +207,6 @@ public class PolicyManagerImpl implements PolicyManager {
             Map<Integer, List<CorrectiveAction>> existingCorrectiveActionsMap = new HashMap<>();
 
             List<ProfileFeature> updatedFeatureList = policy.getProfile().getProfileFeaturesList();
-
             List<ProfileFeature> existingProfileFeaturesList = previousPolicy.getProfile().getProfileFeaturesList();
 
             // Checks for the existing features
@@ -257,27 +248,20 @@ public class PolicyManagerImpl implements PolicyManager {
             if (!newFeaturesList.isEmpty()) {
                 featureDAO.addProfileFeatures(newFeaturesList, profileId);
             }
-
             if (!featuresToDelete.isEmpty()) {
                 for (ProfileFeature pf : featuresToDelete)
                     featureDAO.deleteProfileFeatures(pf.getId());
             }
-
             policyDAO.deleteCriteriaAndDeviceRelatedConfigs(policy.getId());
-
-
             if (policy.getUsers() != null) {
                 policyDAO.updateUserOfPolicy(policy.getUsers(), previousPolicy);
             }
-
             if (policy.getRoles() != null) {
                 policyDAO.updateRolesOfPolicy(policy.getRoles(), previousPolicy);
             }
-
             if (policy.getDevices() != null) {
                 policyDAO.addPolicyToDevice(policy.getDevices(), previousPolicy);
             }
-
             if (policy.getDeviceGroups() != null && !policy.getDeviceGroups().isEmpty()) {
                 policyDAO.addDeviceGroupsToPolicy(policy);
             }
@@ -538,7 +522,6 @@ public class PolicyManagerImpl implements PolicyManager {
     public boolean updatePolicyPriorities(List<Policy> policies) throws PolicyManagementException {
         boolean bool;
         try {
-//            List<Policy> existingPolicies = this.getPolicies();
             List<Policy> existingPolicies;
             if (policyConfiguration.getCacheEnable()) {
                 existingPolicies = PolicyCacheManagerImpl.getInstance().getAllPolicies();
@@ -598,7 +581,6 @@ public class PolicyManagerImpl implements PolicyManager {
     @Override
     public boolean deletePolicy(int policyId) throws PolicyManagementException {
         boolean bool;
-
         List<Policy> policies = this.getPolicies();
         Policy pol = null;
         for (Policy p : policies) {
@@ -626,7 +608,6 @@ public class PolicyManagerImpl implements PolicyManager {
             }
 
             featureDAO.deleteFeaturesOfProfile(policy.getProfileId());
-
             profileDAO.deleteProfile(policy.getProfileId());
             PolicyManagementDAOFactory.commitTransaction();
             return bool;
@@ -684,7 +665,6 @@ public class PolicyManagerImpl implements PolicyManager {
     @Override
     public Policy addPolicyToDevice(List<DeviceIdentifier> deviceIdentifierList,
                                     Policy policy) throws PolicyManagementException {
-
         List<Device> deviceList = new ArrayList<>();
         DeviceManagementProviderService deviceManagementService = PolicyManagementDataHolder
                 .getInstance().getDeviceManagementService();
@@ -759,7 +739,6 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public Policy addPolicyToUser(List<String> usernameList, Policy policy) throws PolicyManagementException {
-
         try {
             PolicyManagementDAOFactory.beginTransaction();
             if (policy.getId() == 0) {
@@ -791,22 +770,17 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public Policy getPolicyByProfileID(int profileId) throws PolicyManagementException {
-
         Policy policy;
         Profile profile;
         List<Device> deviceList;
         List<String> roleNames;
-
         try {
             PolicyManagementDAOFactory.openConnection();
             policy = policyDAO.getPolicyByProfileID(profileId);
-
             roleNames = policyDAO.getPolicyAppliedRoles(policy.getId());
             profile = profileDAO.getProfile(profileId);
             policy.setProfile(profile);
             policy.setRoles(roleNames);
-
-
         } catch (PolicyManagerDAOException e) {
             throw new PolicyManagementException("Error occurred while getting the policy related to profile ID (" +
                     profileId + ")", e);
@@ -827,7 +801,6 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public Policy getPolicy(int policyId) throws PolicyManagementException {
-
         Policy policy;
         List<Device> deviceList;
         List<String> roleNames;
@@ -835,13 +808,8 @@ public class PolicyManagerImpl implements PolicyManager {
         try {
             PolicyManagementDAOFactory.openConnection();
             policy = policyDAO.getPolicy(policyId);
-
             roleNames = policyDAO.getPolicyAppliedRoles(policyId);
             userNames = policyDAO.getPolicyAppliedUsers(policyId);
-
-            //Profile profile = profileDAO.getProfile(policy.getProfileId());
-
-
             policy.setRoles(roleNames);
             policy.setUsers(userNames);
 
@@ -853,14 +821,8 @@ public class PolicyManagerImpl implements PolicyManager {
         } catch (PolicyManagerDAOException e) {
             throw new PolicyManagementException("Error occurred while getting the policy related to policy ID (" +
                     policyId + ")", e);
-//        } catch (ProfileManagerDAOException e) {
-//            throw new PolicyManagementException("Error occurred while getting the profile related to policy ID (" +
-//                    policyId + ")", e);
         } catch (SQLException e) {
             throw new PolicyManagementException("Error occurred while opening a connection to the data source", e);
-//        } catch (ProfileManagementException e) {
-//            throw new PolicyManagementException("Error occurred while getting the profile related to policy ID (" +
-//                    policyId + ")", e);
         } finally {
             PolicyManagementDAOFactory.closeConnection();
         }
@@ -909,7 +871,6 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public List<Policy> getPolicies() throws PolicyManagementException {
-
         List<Policy> policyList;
         List<Profile> profileList;
         try {
@@ -932,20 +893,16 @@ public class PolicyManagerImpl implements PolicyManager {
         }
 
         // Following is done because connection close has been implemented in every method.
-
         for (Policy policy : policyList) {
             policy.setDevices(this.getPolicyAppliedDevicesIds(policy.getId()));
         }
-
         return policyList;
     }
 
     @Override
     public List<Policy> getPoliciesOfDevice(DeviceIdentifier deviceIdentifier) throws PolicyManagementException {
-
         List<Integer> policyIdList;
         List<Policy> policies = new ArrayList<>();
-
         DeviceManagementProviderService deviceManagementService = PolicyManagementDataHolder
                 .getInstance().getDeviceManagementService();
         Device device;
@@ -968,7 +925,6 @@ public class PolicyManagerImpl implements PolicyManager {
             PolicyManagementDAOFactory.closeConnection();
         }
 
-//        List<Policy> tempPolicyList = this.getPolicies();
         List<Policy> tempPolicyList;
         if (policyConfiguration.getCacheEnable()) {
             tempPolicyList = PolicyCacheManagerImpl.getInstance().getAllPolicies();
@@ -991,9 +947,6 @@ public class PolicyManagerImpl implements PolicyManager {
     @Override
     public List<Policy> getPoliciesOfDeviceType(String deviceTypeName) throws PolicyManagementException {
         List<Policy> policies = new ArrayList<>();
-//        try {
-        // List<Profile> profileList = profileManager.getProfilesOfDeviceType(deviceTypeName);
-//            List<Policy> allPolicies = this.getPolicies();
         List<Policy> allPolicies;
         if (policyConfiguration.getCacheEnable()) {
             allPolicies = PolicyCacheManagerImpl.getInstance().getAllPolicies();
@@ -1006,28 +959,14 @@ public class PolicyManagerImpl implements PolicyManager {
                 policies.add(policy);
             }
         }
-
-//            for (Profile profile : profileList) {
-//                for (Policy policy : allPolicies) {
-//                    if (policy.getProfileId() == profile.getProfileId()) {
-//                        policy.setProfile(profile);
-//                        policies.add(policy);
-//                    }
-//                }
-//            }
         Collections.sort(policies);
-//        } catch (ProfileManagementException e) {
-//            throw new PolicyManagementException("Error occurred while getting all the profile features.", e);
-//        }
         return policies;
     }
 
     @Override
     public List<Policy> getPoliciesOfRole(String roleName) throws PolicyManagementException {
-
         List<Policy> policies = new ArrayList<>();
         List<Integer> policyIdList;
-
         try {
             PolicyManagementDAOFactory.openConnection();
             policyIdList = policyDAO.getPolicyOfRole(roleName);
@@ -1039,7 +978,6 @@ public class PolicyManagerImpl implements PolicyManager {
             PolicyManagementDAOFactory.closeConnection();
         }
 
-//        List<Policy> tempPolicyList = this.getPolicies();
         List<Policy> tempPolicyList;
         if (policyConfiguration.getCacheEnable()) {
             tempPolicyList = PolicyCacheManagerImpl.getInstance().getAllPolicies();
@@ -1060,10 +998,8 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public List<Policy> getPoliciesOfUser(String username) throws PolicyManagementException {
-
         List<Policy> policies = new ArrayList<>();
         List<Integer> policyIdList;
-
         try {
             PolicyManagementDAOFactory.openConnection();
             policyIdList = policyDAO.getPolicyOfUser(username);
@@ -1074,7 +1010,6 @@ public class PolicyManagerImpl implements PolicyManager {
         } finally {
             PolicyManagementDAOFactory.closeConnection();
         }
-//        List<Policy> tempPolicyList = this.getPolicies();
         List<Policy> tempPolicyList;
         if (policyConfiguration.getCacheEnable()) {
             tempPolicyList = PolicyCacheManagerImpl.getInstance().getAllPolicies();
@@ -1095,7 +1030,6 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public List<Device> getPolicyAppliedDevicesIds(int policyId) throws PolicyManagementException {
-
         List<Device> deviceList = new ArrayList<>();
         List<Integer> deviceIds;
         DeviceManagementProviderService deviceManagementService = PolicyManagementDataHolder
@@ -1169,17 +1103,11 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public UpdatedPolicyDeviceListBean applyChangesMadeToPolicies() throws PolicyManagementException {
-
         List<String> changedDeviceTypes = new ArrayList<>();
         List<Policy> updatedPolicies = new ArrayList<>();
         List<Integer> updatedPolicyIds = new ArrayList<>();
         boolean transactionDone = false;
         try {
-            //HashMap<Integer, Integer> map = policyDAO.getUpdatedPolicyIdandDeviceTypeId();
-//            List<Policy> activePolicies = new ArrayList<>();
-//            List<Policy> inactivePolicies = new ArrayList<>();
-
-//            List<Policy> allPolicies = this.getPolicies();
             List<Policy> allPolicies;
             if (policyConfiguration.getCacheEnable()) {
                 allPolicies = PolicyCacheManagerImpl.getInstance().getAllPolicies();
@@ -1194,11 +1122,6 @@ public class PolicyManagerImpl implements PolicyManager {
                         changedDeviceTypes.add(policy.getProfile().getDeviceType());
                     }
                 }
-//                if (policy.isActive()) {
-//                    activePolicies.add(policy);
-//                } else {
-//                    inactivePolicies.add(policy);
-//                }
             }
             PolicyManagementDAOFactory.beginTransaction();
             transactionDone = true;
@@ -1282,7 +1205,6 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public boolean checkPolicyAvailable(DeviceIdentifier deviceIdentifier) throws PolicyManagementException {
-
         boolean exist;
         DeviceManagementProviderService deviceManagementService = PolicyManagementDataHolder
                 .getInstance().getDeviceManagementService();
@@ -1309,7 +1231,6 @@ public class PolicyManagerImpl implements PolicyManager {
 
     @Override
     public boolean setPolicyApplied(DeviceIdentifier deviceIdentifier) throws PolicyManagementException {
-
         DeviceManagementProviderService deviceManagementService = PolicyManagementDataHolder
                 .getInstance().getDeviceManagementService();
         Device device;
@@ -1319,7 +1240,6 @@ public class PolicyManagerImpl implements PolicyManager {
             throw new PolicyManagementException("Error occurred while getting the device details (" +
                     deviceIdentifier.getId() + ")", e);
         }
-
         try {
             PolicyManagementDAOFactory.openConnection();
             policyDAO.setPolicyApplied(device.getId(), device.getEnrolmentInfo().getId());
@@ -1373,7 +1293,6 @@ public class PolicyManagerImpl implements PolicyManager {
     public Policy getAppliedPolicyToDevice(Device device) throws PolicyManagementException {
         Policy policy;
         try {
-            //int policyId = policyDAO.getAppliedPolicyId(device.getId());
             PolicyManagementDAOFactory.openConnection();
             policy = policyDAO.getAppliedPolicy(device.getId(), device.getEnrolmentInfo().getId());
         } catch (PolicyManagerDAOException e) {
@@ -1425,8 +1344,8 @@ public class PolicyManagerImpl implements PolicyManager {
 
     private void addPolicyRevokeOperation(List<DeviceIdentifier> deviceIdentifiers) throws PolicyManagementException {
         try {
-            String type = null;
+            String type;
-            if (deviceIdentifiers.size() > 0) {
+            if (!deviceIdentifiers.isEmpty()) {
                 type = deviceIdentifiers.get(0).getType();
                 PolicyManagementDataHolder.getInstance().getDeviceManagementService().addOperation(type,
                         this.getPolicyRevokeOperation(), deviceIdentifiers);
@@ -1478,11 +1397,9 @@ public class PolicyManagerImpl implements PolicyManager {
         } finally {
             PolicyManagementDAOFactory.closeConnection();
         }
-
         for (Policy policy : policyList) {
             policy.setDevices(this.getPolicyAppliedDevicesIds(policy.getId()));
         }
-
         return policyList;
     }
 

features/application-mgt/org.wso2.carbon.device.application.mgt.server.feature/src/main/resources/conf/application-mgt.xml

@@ -77,13 +77,13 @@
             <IsAppUpdatable>true</IsAppUpdatable>
             <IsInitialState>true</IsInitialState>
             <IsDeletableState>true</IsDeletableState>
-            <Permission>/permission/admin/app-mgt/life-cycle/application/create</Permission>
+            <Permission>/app-mgt/life-cycle/application/create</Permission>
             <ProceedingStates>
                 <State>In-Review</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="In-Review">
-            <Permission>/permission/admin/app-mgt/life-cycle/application/review</Permission>
+            <Permission>/app-mgt/life-cycle/application/review</Permission>
             <ProceedingStates>
                 <State>Rejected</State>
                 <State>Approved</State>
@@ -91,7 +91,7 @@
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Approved">
-            <Permission>/permission/admin/app-mgt/life-cycle/application/approve</Permission>
+            <Permission>/app-mgt/life-cycle/application/approve</Permission>
             <ProceedingStates>
                 <State>In-Review</State>
                 <State>Published</State>
@@ -99,28 +99,28 @@
         </LifecycleState>
         <LifecycleState name="Rejected">
             <IsDeletableState>true</IsDeletableState>
-            <Permission>/permission/admin/app-mgt/life-cycle/application/reject</Permission>
+            <Permission>/app-mgt/life-cycle/application/reject</Permission>
             <ProceedingStates>
                 <State>In-Review</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Published">
             <IsAppInstallable>true</IsAppInstallable>
-            <Permission>/permission/admin/app-mgt/life-cycle/application/publish</Permission>
+            <Permission>/app-mgt/life-cycle/application/publish</Permission>
             <ProceedingStates>
                 <State>Blocked</State>
                 <State>Deprecated</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Blocked">
-            <Permission>/permission/admin/app-mgt/life-cycle/application/block</Permission>
+            <Permission>/app-mgt/life-cycle/application/block</Permission>
             <ProceedingStates>
                 <State>Published</State>
                 <State>Deprecated</State>
             </ProceedingStates>
         </LifecycleState>
         <LifecycleState name="Deprecated">
-            <Permission>/permission/admin/app-mgt/life-cycle/application/deprecate</Permission>
+            <Permission>/app-mgt/life-cycle/application/deprecate</Permission>
             <ProceedingStates>
                 <State>Published</State>
                 <State>Retired</State>
@@ -128,7 +128,7 @@
         </LifecycleState>
         <LifecycleState name="Retired">
             <IsEndState>true</IsEndState>
-            <Permission>/permission/admin/app-mgt/life-cycle/application/retire</Permission>
+            <Permission>/app-mgt/life-cycle/application/retire</Permission>
         </LifecycleState>
     </LifecycleStates>
 

features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/mdm-ui-config.xml

@@ -148,6 +148,8 @@
         <Scope>perm:user:permission-view</Scope>
         <Scope>perm:ios:view-configuration</Scope>
         <Scope>perm:ios:manage-configuration</Scope>
+        <Scope>perm:ios:dep-view</Scope>
+        <Scope>perm:ios:dep-add</Scope>
         <Scope>perm:windows:view-configuration</Scope>
         <Scope>perm:windows:manage-configuration</Scope>
         <Scope>perm:android:lock-devices</Scope>

features/ui-request-interceptor/io.entgra.ui.request.interceptor.feature/src/main/resources/p2.inf

@@ -3,3 +3,4 @@ org.eclipse.equinox.p2.touchpoint.natives.mkdir(path:${installFolder}/../../depl
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/publisher-ui-request-handler.war,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/store-ui-request-handler.war,overwrite:true);\
 org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/entgra-ui-request-handler.war,overwrite:true);\
+org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/io.entgra.ui.request.interceptor_${feature.version}/webapps/ui-request-handler.war,target:${installFolder}/../../deployment/server/webapps/mdm-reports-ui-request-handler.war,overwrite:true);\