Improve app subscription functionality

Further integrate app management component with device mgt

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/java/org/wso2/carbon/apimgt/application/extension/api/ApiApplicationRegistrationServiceImpl.java

@@ -21,7 +21,6 @@ package org.wso2.carbon.apimgt.application.extension.api;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.json.simple.JSONObject;
 import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
 import org.wso2.carbon.apimgt.application.extension.api.util.APIUtil;
 import org.wso2.carbon.apimgt.application.extension.api.util.RegistrationProfile;
@@ -30,10 +29,9 @@ import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
 import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.user.api.UserStoreException;
 
-import javax.ws.rs.DELETE;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.QueryParam;

components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/java/org/wso2/carbon/apimgt/application/extension/api/util/APIUtil.java

@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.registry.api.Resource;
 import org.wso2.carbon.registry.core.Registry;

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

@@ -1,51 +0,0 @@
-/*
- *   Copyright (c) 2018, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
- *
- *   WSO2 Inc. 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 com.google.gson.Gson;
-import org.wso2.carbon.device.application.mgt.common.exception.DeviceConnectorException;
-
-public class AndroidApplication {
-	private String type;
-	private String appIdentifier;
-
-	private static final long serialVersionUID = 760343716452548282L;
-
-	public String getAppIdentifier() {
-		return appIdentifier;
-	}
-
-	public void setAppIdentifier(String appIdentifier) {
-		this.appIdentifier = appIdentifier;
-	}
-
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
-	public String toJSON() throws DeviceConnectorException {
-		Gson gson = new Gson();
-		return gson.toJson(this);
-	}
-
-}

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

@@ -26,11 +26,11 @@ import java.util.List;
 
 public class ApplicationInstallResponse {
     @ApiModelProperty(
-            name = "alreadyInstalledDevices",
+            name = "ignoredDeviceIdentifiers",
             value = "List of devices that application release is already installed.",
             dataType = "List[org.wso2.carbon.device.mgt.common.DeviceIdentifier]"
     )
-    private List<DeviceIdentifier> alreadyInstalledDevices;
+    private List<DeviceIdentifier> ignoredDeviceIdentifiers;
 
     @ApiModelProperty(
             name = "errorDevices",
@@ -44,22 +44,22 @@ public class ApplicationInstallResponse {
             name = "activity",
             value = "Activity corresponding to the operation"
     )
-    private Activity activity;
+    private List<Activity> activities;
 
-    public Activity getActivity() {
+    public List<Activity> getActivities() {
-        return activity;
+        return activities;
     }
 
-    public void setActivity(Activity activity) {
+    public void setActivities(List<Activity> activity) {
-        this.activity = activity;
+        this.activities = activity;
     }
 
-    public List<DeviceIdentifier> getAlreadyInstalledDevices() {
+    public List<DeviceIdentifier> getIgnoredDeviceIdentifiers() {
-        return alreadyInstalledDevices;
+        return ignoredDeviceIdentifiers;
     }
 
-    public void setAlreadyInstalledDevices(List<DeviceIdentifier> alreadyInstalledDevices) {
+    public void setIgnoredDeviceIdentifiers(List<DeviceIdentifier> ignoredDeviceIdentifiers) {
-        this.alreadyInstalledDevices = alreadyInstalledDevices;
+        this.ignoredDeviceIdentifiers = ignoredDeviceIdentifiers;
     }
 
     public List<DeviceIdentifier> getErrorDevices() { return errorDevices; }

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

@@ -1,42 +0,0 @@
-package org.wso2.carbon.device.application.mgt.common;/* Copyright (c) 2019, 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.
- */
-
-import java.util.List;
-
-public class ApplicationReleaseArtifactPaths {
-
-    private String installerPath;
-    private String iconPath;
-    private String bannerPath;
-    private List<String> screenshotPaths;
-
-    public String getInstallerPath() { return installerPath; }
-
-    public void setInstallerPath(String installerPath) { this.installerPath = installerPath; }
-
-    public String getIconPath() { return iconPath; }
-
-    public void setIconPath(String iconPath) { this.iconPath = iconPath; }
-
-    public String getBannerPath() { return bannerPath; }
-
-    public void setBannerPath(String bannerPath) { this.bannerPath = bannerPath; }
-
-    public List<String> getScreenshotPaths() { return screenshotPaths; }
-
-    public void setScreenshotPaths(List<String> screenshotPaths) { this.screenshotPaths = screenshotPaths; }
-}

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

@@ -0,0 +1,22 @@
+/* Copyright (c) 2019, 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;
+
+public enum SubAction {
+    INSTALL, UNINSTALL
+}

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

@@ -20,37 +20,35 @@ package org.wso2.carbon.device.application.mgt.common;
 import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 
-import java.util.ArrayList;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 
 public class SubscribingDeviceIdHolder {
-    private List<DeviceIdentifier> installedDevices = new ArrayList<>();
+    private Map<DeviceIdentifier, Integer> subscribedDevices = new HashMap<>();
-    private Map<DeviceIdentifier, Integer> compatibleDevices = new HashMap<>();
+    private Map<DeviceIdentifier, Integer> subscribableDevices = new HashMap<>();
-    private Map<Integer, DeviceSubscriptionDTO> deviceSubscriptions = new HashMap<>();
+//    private Map<Integer, DeviceSubscriptionDTO> deviceSubscriptions = new HashMap<>();
 
-    public List<DeviceIdentifier> getInstalledDevices() {
+    public Map<DeviceIdentifier, Integer> getSubscribedDevices() {
-        return installedDevices;
+        return subscribedDevices;
     }
 
-    public void setInstalledDevices(List<DeviceIdentifier> installedDevices) {
+    public void setSubscribedDevices(Map<DeviceIdentifier, Integer> subscribedDevices) {
-        this.installedDevices = installedDevices;
+        this.subscribedDevices = subscribedDevices;
     }
 
-    public Map<DeviceIdentifier, Integer> getCompatibleDevices() {
+    public Map<DeviceIdentifier, Integer> getSubscribableDevices() {
-        return compatibleDevices;
+        return subscribableDevices;
     }
 
-    public void setCompatibleDevices(Map<DeviceIdentifier, Integer> compatibleDevices) {
+    public void setSubscribableDevices(Map<DeviceIdentifier, Integer> subscribableDevices) {
-        this.compatibleDevices = compatibleDevices;
+        this.subscribableDevices = subscribableDevices;
     }
 
-    public Map<Integer, DeviceSubscriptionDTO> getDeviceSubscriptions() {
+//    public Map<Integer, DeviceSubscriptionDTO> getDeviceSubscriptions() {
-        return deviceSubscriptions;
+//        return deviceSubscriptions;
-    }
+//    }
-
+//
-    public void setDeviceSubscriptions(Map<Integer, DeviceSubscriptionDTO> deviceSubscriptions) {
+//    public void setDeviceSubscriptions(Map<Integer, DeviceSubscriptionDTO> deviceSubscriptions) {
-        this.deviceSubscriptions = deviceSubscriptions;
+//        this.deviceSubscriptions = deviceSubscriptions;
-    }
+//    }
 }

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

@@ -19,9 +19,7 @@
 package org.wso2.carbon.device.application.mgt.common.services;
 
 import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse;
-import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponseTmp;
 import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 
 import java.util.List;
 
@@ -29,56 +27,6 @@ import java.util.List;
  * This interface manages all the operations related with ApplicationDTO Subscription.
  */
 public interface SubscriptionManager {
-    /**
+    <T> ApplicationInstallResponse performBulkAppInstallation(String applicationUUID, List<T> params, String subType,
-     * To install an application to given list of devices.
+            String action) throws ApplicationManagementException;
-     * @param applicationUUID ID of the application to install
-     * @param deviceList list of device ID's to install the application
-     * @return {@link ApplicationInstallResponse} object which contains installed application and devices
-     * @throws ApplicationManagementException if unable to install the application to the given devices
-     */
-    ApplicationInstallResponse installApplicationForDevices(String applicationUUID, List<DeviceIdentifier> deviceList)
-            throws ApplicationManagementException;
-
-    ApplicationInstallResponse addBulkApInstallation(String applicationUUID, List<String> subscriberList,
-            String subType) throws ApplicationManagementException;
-
-    /**
-     * To install an application to given list of users.
-     * @param applicationUUID ID of the application to install
-     * @param userList list of users to install the application
-     * @return {@link ApplicationInstallResponseTmp} object which contains installed application and devices
-     * @throws ApplicationManagementException if unable to install the application to devices belong to given users
-     */
-    ApplicationInstallResponse installApplicationForUsers(String applicationUUID, List<String> userList)
-            throws ApplicationManagementException;
-
-    /**
-     * To install an application to given list of roles.
-     * @param applicationUUID ID of the application to install
-     * @param roleList list of roles to install the application
-     * @return {@link ApplicationInstallResponseTmp} object which contains installed application and devices
-     * @throws ApplicationManagementException if unable to install the application to devices belong to given roles
-     */
-    ApplicationInstallResponseTmp installApplicationForRoles(String applicationUUID, List<String> roleList)
-            throws ApplicationManagementException;
-
-    /**
-     * To install an application to given list of roles.
-     * @param applicationUUID ID of the application to install
-     * @param deviceGroupList list of device groups to install the application
-     * @return {@link ApplicationInstallResponseTmp} object which contains installed application and devices
-     * @throws ApplicationManagementException if unable to install the application to devices belong to given groups
-     */
-    ApplicationInstallResponseTmp installApplicationForGroups(String applicationUUID, List<String> deviceGroupList)
-            throws ApplicationManagementException;
-
-    /**
-     * To uninstall an application from a given list of devices.
-     * @param applicationUUID ApplicationDTO ID
-     * @param deviceList Device list
-     * @return Failed Device List which the application was unable to uninstall
-     * @throws ApplicationManagementException ApplicationDTO Management Exception
-     */
-    List<DeviceIdentifier> uninstallApplication(String applicationUUID, List<DeviceIdentifier> deviceList)
-            throws ApplicationManagementException;
 }

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

@@ -77,7 +77,7 @@ import org.wso2.carbon.device.application.mgt.core.lifecycle.LifecycleStateManag
 import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil;
 import org.wso2.carbon.device.application.mgt.core.util.Constants;
 import org.wso2.carbon.device.application.mgt.core.util.StorageManagementUtil;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.user.api.UserRealm;
@@ -619,7 +619,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
 
     @Override
     public ApplicationList getApplications(Filter filter) throws ApplicationManagementException {
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
+        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
         String userName = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
         ApplicationList applicationList = new ApplicationList();
         List<ApplicationDTO> appDTOs;

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

@@ -30,7 +30,7 @@ import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagem
 import org.wso2.carbon.device.application.mgt.core.exception.ApplicationManagementDAOException;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 
 import java.util.ArrayList;

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

@@ -21,19 +21,18 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.AppOperation;
 import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse;
 import org.wso2.carbon.device.application.mgt.common.ApplicationType;
+import org.wso2.carbon.device.application.mgt.common.DeviceTypes;
+import org.wso2.carbon.device.application.mgt.common.SubAction;
 import org.wso2.carbon.device.application.mgt.common.SubsciptionType;
 import org.wso2.carbon.device.application.mgt.common.SubscribingDeviceIdHolder;
 import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO;
-import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponseTmp;
 import org.wso2.carbon.device.application.mgt.common.dto.DeviceSubscriptionDTO;
 import org.wso2.carbon.device.application.mgt.common.exception.ApplicationManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.DBConnectionException;
 import org.wso2.carbon.device.application.mgt.common.exception.LifecycleManagementException;
 import org.wso2.carbon.device.application.mgt.common.exception.TransactionManagementException;
-import org.wso2.carbon.device.application.mgt.common.services.ApplicationManager;
 import org.wso2.carbon.device.application.mgt.common.services.SubscriptionManager;
 import org.wso2.carbon.device.application.mgt.core.dao.ApplicationDAO;
 import org.wso2.carbon.device.application.mgt.core.dao.SubscriptionDAO;
@@ -49,22 +48,23 @@ import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil;
 import org.wso2.carbon.device.application.mgt.core.util.HelperUtil;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.app.mgt.MobileApp;
-import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.exceptions.UnknownApplicationTypeException;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupManagementException;
 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.operation.mgt.util.DeviceIDHolder;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderService;
-import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
+import org.wso2.carbon.device.mgt.core.util.MDMAndroidOperationUtil;
+import org.wso2.carbon.device.mgt.core.util.MDMIOSOperationUtil;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -76,7 +76,6 @@ import java.util.stream.Collectors;
 public class SubscriptionManagerImpl implements SubscriptionManager {
 
     private static final Log log = LogFactory.getLog(SubscriptionManagerImpl.class);
-    private static final String INSTALL_APPLICATION = "INSTALL_APPLICATION";
     private SubscriptionDAO subscriptionDAO;
     private ApplicationDAO applicationDAO;
     private LifecycleStateManager lifecycleStateManager;
@@ -87,115 +86,103 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
         this.applicationDAO = ApplicationManagementDAOFactory.getApplicationDAO();
     }
 
-    @Override public ApplicationInstallResponse installApplicationForDevices(String applicationUUID,
-            List<DeviceIdentifier> deviceIdentifiers) throws ApplicationManagementException {
-        if (log.isDebugEnabled()) {
-            log.debug("Install application which has UUID: " + applicationUUID + " to " + deviceIdentifiers.size()
-                    + "devices.");
-        }
-        if (deviceIdentifiers.isEmpty()){
-            String msg = "In order to install application release which has UUID " + applicationUUID + ", you should "
-                    + "provide list of device identifiers. But found an empty list of identifiers.";
-            log.error(msg);
-            throw new BadRequestException(msg);
-        }
-        DeviceManagementProviderService deviceManagementProviderService = HelperUtil
-                .getDeviceManagementProviderService();
-        ApplicationDTO applicationDTO = getApplicationDTO(applicationUUID);
-        DeviceIDHolder filteredDeviceHolder = filterDeviceIdentifiers(applicationDTO, deviceIdentifiers);
-        List<DeviceIdentifier> errorDeviceIdentifiers = filteredDeviceHolder.getErrorDeviceIdList();
-        List<Device> filteredDeviceObjs = new ArrayList<>();
-
-        //getting device objects by using device identifiers
-        for (DeviceIdentifier deviceIdentifier : filteredDeviceHolder.getValidDeviceIDList()) {
-            try {
-                Device device = deviceManagementProviderService.getDevice(deviceIdentifier, false);
-                if (device == null) {
-                    String msg = "Couldn't found an device for device identifier " + deviceIdentifier.getId()
-                            + " and device type: " + deviceIdentifier.getType();
-                    log.warn(msg);
-                    errorDeviceIdentifiers.add(deviceIdentifier);
-                } else {
-                    filteredDeviceObjs.add(device);
-                }
-            } catch (DeviceManagementException e) {
-                String msg = "Error occurred when getting device data for device identifier " + deviceIdentifier.getId()
-                        + " and device type " + deviceIdentifier.getType();
-                log.warn(msg);
-                errorDeviceIdentifiers.add(deviceIdentifier);
-                throw new ApplicationManagementException(msg, e);
-            }
-        }
-
-        if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType())) {
-            DeviceType deviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId());
-            String deviceTypeName = deviceType.getName();
-            ApplicationInstallResponse applicationInstallResponse = installToDevices(deviceTypeName, filteredDeviceObjs,
-                    applicationDTO, SubsciptionType.DEVICE.toString(), null);
-            applicationInstallResponse.setErrorDevices(errorDeviceIdentifiers);
-            return applicationInstallResponse;
-        } else {
-            //todo improve thos
-            ApplicationInstallResponse applicationInstallResponse = installToDevices(null, filteredDeviceObjs,
-                    applicationDTO, SubsciptionType.DEVICE.toString(), null);
-            applicationInstallResponse.setErrorDevices(errorDeviceIdentifiers);
-            return applicationInstallResponse;
-        }
-    }
-
     @Override
-    public ApplicationInstallResponse addBulkApInstallation(String applicationUUID, List<String> subscriberList,
+    public <T> ApplicationInstallResponse performBulkAppInstallation(String applicationUUID, List<T> params,
-            String subType) throws ApplicationManagementException {
+            String subType, String action) throws ApplicationManagementException {
         if (log.isDebugEnabled()) {
-            log.debug("Install application release which has UUID " + applicationUUID + " to " + subscriberList.size()
+            log.debug("Install application release which has UUID " + applicationUUID + " to " + params.size()
                     + " users.");
         }
-
         try {
-            if (subscriberList.isEmpty()) {
+            if (params.isEmpty()) {
-                String msg = "In order to install application release which has UUID " + applicationUUID + ", you shou"
+                String msg = "In order to install application release which has UUID " + applicationUUID + ", you should"
-                        + "ld provide list of subscribers. But found an empty list of users.";
+                        + " provide list of subscribers. But found an empty list of users.";
                 log.error(msg);
                 throw new BadRequestException(msg);
             }
-            if (SubsciptionType.USER.toString().equals(subType) && !SubsciptionType.ROLE.toString().equals(subType)
+
-                    && SubsciptionType.GROUP.toString().equals(subType)) {
+            boolean isValidSubType = Arrays.stream(SubsciptionType.values())
+                    .anyMatch(sub -> sub.name().equalsIgnoreCase(subType));
+            if (!isValidSubType) {
                 String msg = "Found invalid subscription type to install application release witch has UUID: "
                         + applicationUUID + ". Subscription type is " + subType;
                 log.error(msg);
                 throw new BadRequestException(msg);
             }
 
-            ApplicationDTO applicationDTO = getApplicationDTO(applicationUUID);
             DeviceManagementProviderService deviceManagementProviderService = HelperUtil
                     .getDeviceManagementProviderService();
             GroupManagementProviderService groupManagementProviderService = HelperUtil
                     .getGroupManagementProviderService();
             List<Device> filteredDevices = new ArrayList<>();
-            List<Device> subscriberDevices = new ArrayList<>();
+            List<Device> devices = new ArrayList<>();
-            for (String subscriber : subscriberList) {
+            List<String> subscribers = new ArrayList<>();
-                if (SubsciptionType.USER.toString().equals(subType)) {
+            List<DeviceIdentifier> errorDeviceIdentifiers = new ArrayList<>();
-                    subscriberDevices.addAll(deviceManagementProviderService.getDevicesOfUser(subscriber));
+            ApplicationInstallResponse applicationInstallResponse;
+
+            ApplicationDTO applicationDTO = getApplicationDTO(applicationUUID);
+            if (SubsciptionType.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. ");
+                    }
+                    if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType())) {
+                        DeviceType deviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId());
+                        if (!deviceType.getName().equals(deviceIdentifier.getType())) {
+                            String msg =
+                                    "Found a device identifier which is not matched with the application device Type. "
+                                            + "Application device type is " + deviceType.getName() + " and the "
+                                            + "identifier of which has a " + "different device type is "
+                                            + deviceIdentifier.getId();
+                            log.warn(msg);
+                            errorDeviceIdentifiers.add(deviceIdentifier);
+                        }
+                    }
+                    devices.add(deviceManagementProviderService.getDevice(deviceIdentifier, false));
+                }
+            } else if (SubsciptionType.USER.toString().equals(subType)) {
+                for (T param : params) {
+                    String username = (String) param;
+                    subscribers.add(username);
+                    devices.addAll(deviceManagementProviderService.getDevicesOfUser(username));
+                }
             } else if (SubsciptionType.ROLE.toString().equals(subType)) {
-                    subscriberDevices.addAll(deviceManagementProviderService.getAllDevicesOfRole(subscriber));
+                for (T param : params) {
+                    String roleName = (String) param;
+                    subscribers.add(roleName);
+                    devices.addAll(deviceManagementProviderService.getAllDevicesOfRole(roleName));
+                }
             } else if (SubsciptionType.GROUP.toString().equals(subType)) {
-                    subscriberDevices.addAll(groupManagementProviderService.getAllDevicesOfGroup(subscriber));
+                for (T param : params) {
+                    String groupName = (String) param;
+                    subscribers.add(groupName);
+                    devices.addAll(groupManagementProviderService.getAllDevicesOfGroup(groupName));
                 }
             }
 
             if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType())) {
                 DeviceType deviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId());
                 String deviceTypeName = deviceType.getName();
-                for (Device device : subscriberDevices) {
+                for (Device device : devices) {
                     if (deviceTypeName.equals(device.getType())) {
                         filteredDevices.add(device);
                     }
                 }
-                return installToDevices(deviceTypeName, filteredDevices, applicationDTO, subType, subscriberList);
+                applicationInstallResponse = performActionOnDevices(deviceTypeName, filteredDevices, applicationDTO,
+                        subType, subscribers, action);
+
+                //todo add db insert to here
             } else {
                 //todo improve this
-                return installToDevices(null, subscriberDevices, applicationDTO, subType, subscriberList);
+                applicationInstallResponse = performActionOnDevices(null, devices, applicationDTO, subType,
+                        subscribers, action);
+                //todo add db insert to here
             }
+            applicationInstallResponse.setErrorDevices(errorDeviceIdentifiers);
+            return applicationInstallResponse;
         } catch (DeviceManagementException e) {
             String msg = "Error occurred while getting devices of given users or given roles.";
             log.error(msg);
@@ -207,51 +194,98 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
         }
     }
 
-    private ApplicationInstallResponse installToDevices(String deviceType, List<Device> devices,
+    private ApplicationInstallResponse performActionOnDevices(String deviceType, List<Device> devices,
-            ApplicationDTO applicationDTO, String subType, List<String> subscribers)
+            ApplicationDTO applicationDTO, String subType, List<String> subscribers, String action)
             throws ApplicationManagementException {
 
         SubscribingDeviceIdHolder subscribingDeviceIdHolder = getSubscribingDeviceIdHolder(devices);
-        if (subscribingDeviceIdHolder.getCompatibleDevices().isEmpty()) {
+        List<Activity> activityList = new ArrayList<>();
+        List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
+        List<DeviceIdentifier> ignoredDeviceIdentifiers = new ArrayList<>();
+        Map<String, List<DeviceIdentifier>> deviceIdentifierMap = new HashMap<>();
+
+        if (SubAction.INSTALL.toString().equalsIgnoreCase(action)) {
+            deviceIdentifiers = new ArrayList<>(subscribingDeviceIdHolder.getSubscribableDevices().keySet());
+            ignoredDeviceIdentifiers = new ArrayList<>(subscribingDeviceIdHolder.getSubscribedDevices().keySet());
+
+            if (deviceIdentifiers.isEmpty()) {
                 ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse();
-            applicationInstallResponse.setAlreadyInstalledDevices(subscribingDeviceIdHolder.getInstalledDevices());
+                applicationInstallResponse.setIgnoredDeviceIdentifiers(ignoredDeviceIdentifiers);
                 return applicationInstallResponse;
             }
+        } else if (SubAction.UNINSTALL.toString().equalsIgnoreCase(action)) {
+            deviceIdentifiers = new ArrayList<>(subscribingDeviceIdHolder.getSubscribedDevices().keySet());
+            ignoredDeviceIdentifiers = new ArrayList<>(subscribingDeviceIdHolder.getSubscribableDevices().keySet());
+            if (deviceIdentifiers.isEmpty()) {
+                ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse();
+                applicationInstallResponse.setIgnoredDeviceIdentifiers(ignoredDeviceIdentifiers);
+                return applicationInstallResponse;
+            }
+        }
+
+        if (deviceType == null) {
+            for (DeviceIdentifier identifier : deviceIdentifiers) {
+                List<DeviceIdentifier> identifiers;
+                if (!deviceIdentifierMap.containsKey(identifier.getType())) {
+                    identifiers = new ArrayList<>();
+                    identifiers.add(identifier);
+                    deviceIdentifierMap.put(identifier.getType(), identifiers);
+                } else {
+                    identifiers = deviceIdentifierMap.get(identifier.getType());
+                    identifiers.add(identifier);
+                    deviceIdentifierMap.put(identifier.getType(), identifiers);
+                }
+            }
+
+            for (Map.Entry<String, List<DeviceIdentifier>> entry : deviceIdentifierMap.entrySet()) {
                 Activity activity = addAppInstallOperationToDevices(applicationDTO,
-                new ArrayList<>(subscribingDeviceIdHolder.getCompatibleDevices().keySet()), deviceType);
+                        new ArrayList<>(entry.getValue()), entry.getKey());
+                activityList.add(activity);
+            }
 
             ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse();
-        applicationInstallResponse.setActivity(activity);
+            applicationInstallResponse.setActivities(activityList);
-        applicationInstallResponse.setAlreadyInstalledDevices(subscribingDeviceIdHolder.getInstalledDevices());
+            applicationInstallResponse.setIgnoredDeviceIdentifiers(ignoredDeviceIdentifiers);
+            return applicationInstallResponse;
+        }
 
-        addSubscriptions(applicationDTO.getApplicationReleaseDTOs().get(0).getId(), activity,
+        //todo consider action
-                subscribingDeviceIdHolder.getCompatibleDevices(),
+
-                new ArrayList<>(subscribingDeviceIdHolder.getDeviceSubscriptions().keySet()), subscribers, subType);
+        Activity activity = addAppInstallOperationToDevices(applicationDTO, deviceIdentifiers, deviceType);
+        activityList.add(activity);
+        ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse();
+        applicationInstallResponse.setActivities(activityList);
+        applicationInstallResponse.setIgnoredDeviceIdentifiers(ignoredDeviceIdentifiers);
+
+        //todo
+        addSubscriptions(applicationDTO.getApplicationReleaseDTOs().get(0).getId(), activity, subscribingDeviceIdHolder,
+                subscribers, subType, action);
         return applicationInstallResponse;
     }
 
     private SubscribingDeviceIdHolder getSubscribingDeviceIdHolder(List<Device> devices)
             throws ApplicationManagementException {
-        List<DeviceIdentifier> installedDevices = new ArrayList<>();
+        Map<DeviceIdentifier, Integer> subscribedDevices = new HashMap<>();
-        Map<DeviceIdentifier, Integer> compatibleDevices = new HashMap<>();
+        Map<DeviceIdentifier, Integer> subscribableDevices = new HashMap<>();
 
         List<Integer> filteredDeviceIds = devices.stream().map(Device::getId).collect(Collectors.toList());
+        //get device subscriptions for given device id list.
         Map<Integer, DeviceSubscriptionDTO> deviceSubscriptions = getDeviceSubscriptions(filteredDeviceIds);
         for (Device device : devices) {
             DeviceIdentifier deviceIdentifier = new DeviceIdentifier(device.getDeviceIdentifier(), device.getType());
             DeviceSubscriptionDTO deviceSubscriptionDTO = deviceSubscriptions.get(device.getId());
             if (deviceSubscriptionDTO != null && !deviceSubscriptionDTO.isUnsubscribed() && Operation.Status.COMPLETED
                     .toString().equals(deviceSubscriptionDTO.getStatus())) {
-                installedDevices.add(deviceIdentifier);
+                subscribedDevices.put(deviceIdentifier, device.getId());
             } else {
-                compatibleDevices.put(deviceIdentifier, device.getId());
+                subscribableDevices.put(deviceIdentifier, device.getId());
             }
         }
 
         SubscribingDeviceIdHolder subscribingDeviceIdHolder = new SubscribingDeviceIdHolder();
-        subscribingDeviceIdHolder.setCompatibleDevices(compatibleDevices);
+        subscribingDeviceIdHolder.setSubscribableDevices(subscribableDevices);
-        subscribingDeviceIdHolder.setInstalledDevices(installedDevices);
+        subscribingDeviceIdHolder.setSubscribedDevices(subscribedDevices);
-        subscribingDeviceIdHolder.setDeviceSubscriptions(deviceSubscriptions);
+//        subscribingDeviceIdHolder.setDeviceSubscriptions(deviceSubscriptions);
         return subscribingDeviceIdHolder;
     }
 
@@ -290,54 +324,10 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
         }
     }
 
-    private DeviceIDHolder filterDeviceIdentifiers(ApplicationDTO applicationDTO,
+    //todo pass SubscribingDeviceIdHolder and action
-            List<DeviceIdentifier> deviceIdentifiers) throws ApplicationManagementException {
-        List<DeviceIdentifier> errorDeviceIdList = new ArrayList<>();
-        List<DeviceIdentifier> validDeviceIDList = new ArrayList<>();
-        if (!ApplicationType.WEB_CLIP.toString().equals(applicationDTO.getType())) {
-            DeviceType deviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId());
-            for (DeviceIdentifier deviceIdentifier : deviceIdentifiers) {
-                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())) {
-                    String msg =
-                            "Found a device identifier which is not matched with the application device Type. Application "
-                                    + "device type is " + deviceType.getName() + " and the identifier of which has a "
-                                    + "different device type is " + deviceIdentifier.getId();
-                    log.warn(msg);
-                    errorDeviceIdList.add(deviceIdentifier);
-                } else {
-                    validDeviceIDList.add(deviceIdentifier);
-                }
-            }
-        } else {
-            for (DeviceIdentifier deviceIdentifier : deviceIdentifiers) {
-                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;
-                }
-                validDeviceIDList.add(deviceIdentifier);
-            }
-        }
-
-        if (validDeviceIDList.isEmpty()) {
-            String msg = "Couldn't found at least one valid device identifier to install the application.";
-            log.error(msg);
-            throw new BadRequestException(msg);
-        }
-        DeviceIDHolder deviceIDHolder = new DeviceIDHolder();
-        deviceIDHolder.setValidDeviceIDList(validDeviceIDList);
-        deviceIDHolder.setErrorDeviceIdList(errorDeviceIdList);
-        return deviceIDHolder;
-    }
-
     private void addSubscriptions(int applicationReleaseId, Activity activity,
-            Map<DeviceIdentifier, Integer> compatibleDevices, List<Integer> subDeviceIds, List<String> subscribers,
+            SubscribingDeviceIdHolder subscribingDeviceIdHolder, List<String> subscribers, String subType, String action)
-            String subType) throws ApplicationManagementException {
+            throws ApplicationManagementException {
         int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
         String subscriber = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
         try {
@@ -346,6 +336,7 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
             List<Integer> deviceSubscriptingIds;
 
             if (SubsciptionType.USER.toString().equals(subType)) {
+                //todo check action
                 List<String> subscribedUsers = subscriptionDAO.getSubscribedUsernames(subscribers, tenantId);
                 if (!subscribedUsers.isEmpty()) {
                     subscriptionDAO
@@ -361,16 +352,22 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
             List<ActivityStatus> activityStatuses = activity.getActivityStatus();
             for (ActivityStatus status : activityStatuses) {
                 if (status.getStatus().equals(ActivityStatus.Status.PENDING)) {
-                    deviceIds.add(compatibleDevices.get(status.getDeviceIdentifier()));
+                    //todo
+//                    deviceIds.add(compatibleDevices.get(status.getDeviceIdentifier()));
                 }
             }
 
             int operationId = Integer.parseInt(activity.getActivityId().split("ACTIVITY_")[1]);
-            if (!subDeviceIds.isEmpty()) {
+            //todo if INSTALL get Ids of subscribable devices and update those ids and insert other ids
-                deviceResubscribingIds = subscriptionDAO.updateDeviceSubscription(subscriber, subDeviceIds, subType,
+
-                        Operation.Status.PENDING.toString(), applicationReleaseId, tenantId);
+
-                deviceIds.removeAll(subDeviceIds);
+            //todo
-            }
+
+//            if (!subDeviceIds.isEmpty()) {
+//                deviceResubscribingIds = subscriptionDAO.updateDeviceSubscription(subscriber, subDeviceIds, subType,
+//                        Operation.Status.PENDING.toString(), applicationReleaseId, tenantId);
+//                deviceIds.removeAll(subDeviceIds);
+//            }
             deviceSubscriptingIds = subscriptionDAO
                     .subscribeDeviceToApplication(subscriber, deviceIds, subType, Operation.Status.PENDING.toString(),
                             applicationReleaseId, tenantId);
@@ -419,164 +416,12 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
 
     }
 
-    //todo remove below methods
-
-    @Override public ApplicationInstallResponse installApplicationForUsers(String applicationUUID,
-            List<String> userList) throws ApplicationManagementException {
-        if (log.isDebugEnabled()) {
-            log.debug("Install application release which has UUID " + applicationUUID + " to " + userList.size()
-                    + " users.");
-        }
-
-        //todo check valid user list - throw BadRequest exception
-        ApplicationDTO applicationDTO = getApplicationDTO(applicationUUID);
-        DeviceType appDeviceType = APIUtil.getDeviceTypeData(applicationDTO.getDeviceTypeId());
-        Map<DeviceIdentifier, Integer> compatibleDevices = new HashMap<>();
-        List<DeviceIdentifier> installedDeviceIdentifiers = new ArrayList<>();
-        Map<Integer, DeviceSubscriptionDTO> deviceSubscriptions = new HashMap<>();
-
-        for (String user : userList) {
-            try {
-                List<Device> userDevices = HelperUtil.getDeviceManagementProviderService().getDevicesOfUser(user);
-                List<Device> filteredDevices = new ArrayList<>();
-
-                //todo improve for web clips
-                for (Device device : userDevices) {
-                    if (appDeviceType.getName().equals(device.getType())) {
-                        filteredDevices.add(device);
-                    }
-                }
-
-                SubscribingDeviceIdHolder subscribingDeviceIdHolder = getSubscribingDeviceIdHolder(filteredDevices);
-                compatibleDevices.putAll(subscribingDeviceIdHolder.getCompatibleDevices());
-                deviceSubscriptions.putAll(subscribingDeviceIdHolder.getDeviceSubscriptions());
-                installedDeviceIdentifiers.addAll(subscribingDeviceIdHolder.getInstalledDevices());
-            } catch (DeviceManagementException e) {
-                String msg = "Error occurred when extracting the device list of user[" + user + "].";
-                log.error(msg);
-                throw new ApplicationManagementException(msg, e);
-            }
-        }
-
-        if (compatibleDevices.keySet().isEmpty()) {
-            ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse();
-            applicationInstallResponse.setAlreadyInstalledDevices(installedDeviceIdentifiers);
-            return applicationInstallResponse;
-        }
-        Activity activity = addAppInstallOperationToDevices(applicationDTO, new ArrayList<>(compatibleDevices.keySet()),
-                appDeviceType.getName());
-
-        ApplicationInstallResponse applicationInstallResponse = new ApplicationInstallResponse();
-        applicationInstallResponse.setActivity(activity);
-        applicationInstallResponse.setAlreadyInstalledDevices(installedDeviceIdentifiers);
-
-        addSubscriptions(applicationDTO.getApplicationReleaseDTOs().get(0).getId(), activity, compatibleDevices,
-                new ArrayList<>(deviceSubscriptions.keySet()), userList, SubsciptionType.USER.toString());
-        return applicationInstallResponse;
-    }
-
-    //todo not implemented below code properly
-
-    @Override public ApplicationInstallResponseTmp installApplicationForRoles(String applicationUUID,
-            List<String> roleList) throws ApplicationManagementException {
-        if (log.isDebugEnabled()) {
-            log.debug("Install application: " + applicationUUID + " to " + roleList.size() + " roles.");
-        }
-        ApplicationManager applicationManager = DataHolder.getInstance().getApplicationManager();
-        ApplicationDTO application = applicationManager.getApplicationByRelease(applicationUUID);
-        List<DeviceIdentifier> deviceList = new ArrayList<>();
-        for (String role : roleList) {
-            try {
-                List<Device> devicesOfRole = HelperUtil.getDeviceManagementProviderService().getAllDevicesOfRole(role);
-                devicesOfRole.stream()
-                        .map(device -> new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()))
-                        .forEach(deviceList::add);
-                if (log.isDebugEnabled()) {
-                    log.debug(devicesOfRole.size() + " found for role: " + role);
-                }
-            } catch (DeviceManagementException e) {
-                throw new ApplicationManagementException(
-                        "Error when extracting the device list from role[" + role + "].", e);
-            }
-        }
-
-        ApplicationInstallResponseTmp response = installToDevicesTmp(application, deviceList);
-
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
-        String subscriber = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
-        int applicationReleaseId = application.getApplicationReleaseDTOs().get(0).getId();
-
-        try {
-            ConnectionManagerUtil.openDBConnection();
-            subscriptionDAO.subscribeRoleToApplication(tenantId, subscriber, roleList, application.getId(),
-                    applicationReleaseId);
-        } catch (ApplicationManagementDAOException e) {
-            //todo
-            throw new ApplicationManagementException("");
-        } finally {
-            ConnectionManagerUtil.closeDBConnection();
-        }
-
-        return response;
-    }
-
-    @Override public ApplicationInstallResponseTmp installApplicationForGroups(String applicationUUID,
-            List<String> deviceGroupList) throws ApplicationManagementException {
-        if (log.isDebugEnabled()) {
-            log.debug("Install application: " + applicationUUID + " to " + deviceGroupList.size() + " groups.");
-        }
-        ApplicationManager applicationManager = DataHolder.getInstance().getApplicationManager();
-        ApplicationDTO application = applicationManager.getApplicationByRelease(applicationUUID);
-        GroupManagementProviderService groupManagementProviderService = HelperUtil.getGroupManagementProviderService();
-        List<DeviceGroup> groupList = new ArrayList<>();
-        List<DeviceIdentifier> deviceList = new ArrayList<>();
-        for (String groupName : deviceGroupList) {
-            try {
-                DeviceGroup deviceGroup = groupManagementProviderService.getGroup(groupName);
-                groupList.add(deviceGroup);
-                int deviceCount = groupManagementProviderService.getDeviceCount(deviceGroup.getGroupId());
-                List<Device> devicesOfGroups = groupManagementProviderService
-                        .getDevices(deviceGroup.getGroupId(), 0, deviceCount);
-                devicesOfGroups.stream()
-                        .map(device -> new DeviceIdentifier(device.getDeviceIdentifier(), device.getType()))
-                        .forEach(deviceList::add);
-            } catch (GroupManagementException e) {
-                throw new ApplicationManagementException(
-                        "Error when extracting the device list from group[" + groupName + "].", e);
-            }
-        }
-
-        ApplicationInstallResponseTmp response = installToDevicesTmp(application, deviceList);
-
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
-        String subscriber = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
-        int applicationReleaseId = application.getApplicationReleaseDTOs().get(0).getId();
-
-        try {
-            ConnectionManagerUtil.openDBConnection();
-            subscriptionDAO.subscribeGroupToApplication(tenantId, subscriber, groupList, application.getId(),
-                    applicationReleaseId);
-        } catch (ApplicationManagementDAOException e) {
-            //todo
-            throw new ApplicationManagementException("");
-        } finally {
-            ConnectionManagerUtil.closeDBConnection();
-        }
-
-        return response;
-    }
-
-    @Override public List<DeviceIdentifier> uninstallApplication(String applicationUUID,
-            List<DeviceIdentifier> deviceList) throws ApplicationManagementException {
-        return null;
-    }
-
     private Activity addAppInstallOperationToDevices(ApplicationDTO application,
             List<DeviceIdentifier> deviceIdentifierList, String deviceType) throws ApplicationManagementException {
         DeviceManagementProviderService deviceManagementProviderService = HelperUtil
                 .getDeviceManagementProviderService();
         try {
-            Operation operation = generateOperationPayloadByDeviceType(deviceType, application);
+            Operation operation = generateOperationPayloadByDeviceType(deviceType, application, null);
             //todo refactor add operation code to get successful operations
             return deviceManagementProviderService.addOperation(deviceType, operation, deviceIdentifierList);
         } catch (OperationManagementException e) {
@@ -588,105 +433,43 @@ public class SubscriptionManagerImpl implements SubscriptionManager {
         }
     }
 
-    private ApplicationInstallResponseTmp installToDevicesTmp(ApplicationDTO application,
+    private Operation generateOperationPayloadByDeviceType(String deviceType, ApplicationDTO application, String action)
-            List<DeviceIdentifier> deviceIdentifierList) throws ApplicationManagementException {
+            throws ApplicationManagementException {
-        DeviceManagementProviderService deviceManagementProviderService = HelperUtil
-                .getDeviceManagementProviderService();
-
-        ApplicationInstallResponseTmp response = validateDevices(deviceIdentifierList);
-        /*
-        Group the valid device list by device type. Following lambda expression produces a map containing device type
-        as the key and the list of device identifiers as the corresponding value.
-         */
-        Map<String, List<DeviceIdentifier>> deviceTypeIdentifierMap = response.getSuccessfulDevices().stream()
-                .collect(Collectors.groupingBy(DeviceIdentifier::getType));
-
-        for (Map.Entry<String, List<DeviceIdentifier>> entry : deviceTypeIdentifierMap.entrySet()) {
-            Operation operation = generateOperationPayloadByDeviceType(entry.getKey(), application);
         try {
-                Activity activity = deviceManagementProviderService
+
-                        .addOperation(entry.getKey(), operation, entry.getValue());
+            //todo rethink and modify the {@link MobileApp} usage
-                response.setActivity(activity);
+            MobileApp mobileApp = new MobileApp();
-            } catch (OperationManagementException e) {
+            if (DeviceTypes.ANDROID.toString().equalsIgnoreCase(deviceType)) {
-                response.setSuccessfulDevices(null);
+                if (SubAction.INSTALL.toString().equalsIgnoreCase(action)) {
-                response.setFailedDevices(deviceIdentifierList);
+                    return MDMAndroidOperationUtil.createInstallAppOperation(mobileApp);
-                throw new ApplicationManagementException(
+                } else if (SubAction.UNINSTALL.toString().equalsIgnoreCase(action)) {
-                        "Error occurred while adding the application install " + "operation to devices", e);
+                    return MDMAndroidOperationUtil.createAppUninstallOperation(mobileApp);
-            } catch (InvalidDeviceException e) {
+                } else {
-                //This exception should not occur because the validation has already been done.
+                    String msg = "Invalid Action is found. Action: " + action;
-                throw new ApplicationManagementException("The list of device identifiers are invalid");
+                    log.error(msg);
+                    throw new ApplicationManagementException(msg);
                 }
+            } else if (DeviceTypes.IOS.toString().equalsIgnoreCase(deviceType)) {
+                if (SubAction.INSTALL.toString().equalsIgnoreCase(action)) {
+                    return MDMIOSOperationUtil.createInstallAppOperation(mobileApp);
+                } else if (SubAction.UNINSTALL.toString().equalsIgnoreCase(action)) {
+                    return MDMIOSOperationUtil.createAppUninstallOperation(mobileApp);
+                } else {
+                    String msg = "Invalid Action is found. Action: " + action;
+                    log.error(msg);
+                    throw new ApplicationManagementException(msg);
+                }
+            } else {
+                String msg = "Invalid device type is found. Device Type: " + deviceType;
+                log.error(msg);
+                throw new ApplicationManagementException(msg);
             }
 
-        int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId(true);
+        } catch (UnknownApplicationTypeException e) {
-        String subscriber = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
+            String msg = "Unknown Application type is found.";
-        int applicationReleaseId = application.getApplicationReleaseDTOs().get(0).getId();
+            log.error(msg);
-        try {
+            throw new ApplicationManagementException(msg);
-            ConnectionManagerUtil.openDBConnection();
-            List<Device> deviceList = new ArrayList<>();
-            for (DeviceIdentifier deviceIdentifier : response.getSuccessfulDevices()) {
-                try {
-                    deviceList.add(deviceManagementProviderService.getDevice(deviceIdentifier));
-                } catch (DeviceManagementException e) {
-                    log.error("Unable to fetch device for device identifier: " + deviceIdentifier.toString());
         }
     }
-            subscriptionDAO.subscribeDeviceToApplicationTmp(tenantId, subscriber, deviceList, application.getId(),
-                    applicationReleaseId, String.valueOf(AppOperation.InstallState.UNINSTALLED));
-        } catch (ApplicationManagementDAOException e) {
-            //todo
-            throw new ApplicationManagementException("");
-        } finally {
-            ConnectionManagerUtil.closeDBConnection();
-        }
-
-        return response;
-    }
-
-    private Operation generateOperationPayloadByDeviceType(String deviceType, ApplicationDTO application) {
-        ProfileOperation operation = new ProfileOperation();
-        operation.setCode(INSTALL_APPLICATION);
-        operation.setType(Operation.Type.PROFILE);
-
-        //todo: generate operation payload correctly for all types of devices.
-        operation.setPayLoad(
-                "{'type':'enterprise', 'url':'" + application.getApplicationReleaseDTOs().get(0).getInstallerName()
-                        + "', 'app':'" + application.getApplicationReleaseDTOs().get(0).getUuid() + "'}");
-        return operation;
-    }
-
-    /**
-     * Validates the preconditions which is required to satisfy from the device which is required to install the
-     * application.
-     * <p>
-     * This method check two preconditions whether the application type is compatible to install in the device and
-     * whether the device is enrolled in the system.
-     *
-     * @param deviceIdentifierList List of {@link DeviceIdentifier} which the validation happens
-     * @return {@link ApplicationInstallResponseTmp} which contains compatible and incompatible device identifiers
-     */
-    private ApplicationInstallResponseTmp validateDevices(List<DeviceIdentifier> deviceIdentifierList) {
-        ApplicationInstallResponseTmp applicationInstallResponseTmp = new ApplicationInstallResponseTmp();
-        List<DeviceIdentifier> failedDevices = new ArrayList<>();
-        List<DeviceIdentifier> compatibleDevices = new ArrayList<>();
-
-        for (DeviceIdentifier deviceIdentifier : deviceIdentifierList) {
-            try {
-                if (!DeviceManagerUtil.isValidDeviceIdentifier(deviceIdentifier)) {
-                    log.error("Device with ID: [" + deviceIdentifier.getId() + "] is not valid to install the "
-                            + "application.");
-                    applicationInstallResponseTmp.getFailedDevices().add(deviceIdentifier);
-                }
-            } catch (DeviceManagementException e) {
-                log.error("Error occurred while validating the device: [" + deviceIdentifier.getId() + "]", e);
-                failedDevices.add(deviceIdentifier);
-            }
-            compatibleDevices.add(deviceIdentifier);
-        }
-        applicationInstallResponseTmp.setFailedDevices(failedDevices);
-        applicationInstallResponseTmp.setSuccessfulDevices(compatibleDevices);
-
-        return applicationInstallResponseTmp;
-    }
 
 }

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

@@ -18,16 +18,14 @@
 
 package org.wso2.carbon.device.application.mgt.core.util;
 
-import org.apache.commons.lang.StringUtils;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.application.mgt.common.Filter;
 import org.wso2.carbon.device.application.mgt.common.services.*;
 import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
 import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException;
 import org.wso2.carbon.device.application.mgt.core.exception.UnexpectedServerErrorException;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 
 import javax.ws.rs.core.Response;

components/application-mgt/org.wso2.carbon.device.application.mgt.core/src/test/java/org.wso2.carbon.device.application.mgt.core/dao/ApplicationManagementDAOTest.java

@@ -10,7 +10,7 @@ import org.wso2.carbon.device.application.mgt.core.dao.common.ApplicationManagem
 import org.wso2.carbon.device.application.mgt.core.dto.ApplicationsDTO;
 import org.wso2.carbon.device.application.mgt.core.dto.DeviceTypeCreator;
 import org.wso2.carbon.device.application.mgt.core.util.ConnectionManagerUtil;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 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.DeviceTypeDAO;

components/application-mgt/org.wso2.carbon.device.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml

@@ -26,6 +26,7 @@
     <jaxrs:server id="applicationMgtService" address="/">
         <jaxrs:serviceBeans>
             <ref bean="applicationMgtServiceBean"/>
+            <ref bean="applicationMgtAdminServiceBean"/>
             <ref bean="swaggerResource"/>
         </jaxrs:serviceBeans>
         <jaxrs:providers>
@@ -53,6 +54,7 @@
     <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource" />
 
     <bean id="applicationMgtServiceBean" class="org.wso2.carbon.device.application.mgt.publisher.api.services.impl.ApplicationManagementPublisherAPIImpl"/>
+    <bean id="applicationMgtAdminServiceBean" class="org.wso2.carbon.device.application.mgt.publisher.api.services.impl.admin.ApplicationManagementPublisherAdminAPIImpl"/>
     <bean id="jsonProvider" class="org.wso2.carbon.device.application.mgt.addons.JSONMessageHandler"/>
     <bean id="multipartProvider" class="org.wso2.carbon.device.application.mgt.addons.MultipartCustomProvider"/>
 

components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/SubscriptionManagementAPI.java

@@ -20,7 +20,6 @@ package org.wso2.carbon.device.application.mgt.store.api.services;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
 import io.swagger.annotations.Extension;
 import io.swagger.annotations.ExtensionProperty;
@@ -28,22 +27,14 @@ import io.swagger.annotations.Info;
 import io.swagger.annotations.SwaggerDefinition;
 import io.swagger.annotations.Tag;
 import org.wso2.carbon.apimgt.annotations.api.Scopes;
-import org.wso2.carbon.device.application.mgt.common.ErrorResponse;
-import org.wso2.carbon.device.application.mgt.common.PaginationResult;
-import org.wso2.carbon.device.application.mgt.common.dto.ApplicationDTO;
-import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponseTmp;
-import org.wso2.carbon.device.application.mgt.common.EnterpriseInstallationDetails;
-import org.wso2.carbon.device.application.mgt.common.InstallationDetails;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 
 import javax.validation.Valid;
 import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
 import javax.ws.rs.POST;
 import javax.ws.rs.Path;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
 import javax.ws.rs.core.MediaType;
 import javax.ws.rs.core.Response;
 import java.util.List;
@@ -84,16 +75,14 @@ import java.util.List;
         }
 )
 @Path("/subscription")
-@Api(value = "Subscription Management", description = "This API carries all subscription management related " +
+@Api(value = "Subscription Management")
-        "operations " +
-        "such as install application to device, uninstall application from device, etc.")
 @Produces(MediaType.APPLICATION_JSON)
 public interface SubscriptionManagementAPI {
 
     String SCOPE = "scope";
 
     @POST
-    @Path("/install/{uuid}/devices")
+    @Path("/install/{uuid}/devices/{action}")
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
     @ApiOperation(
@@ -113,13 +102,19 @@ public interface SubscriptionManagementAPI {
             value = {
 
             })
-    Response installApplicationForDevices(
+    Response performAppOperationForDevices(
             @ApiParam(
                     name = "installationDetails",
                     value = "The application ID and list of devices/users/roles",
                     required = true
             )
             @PathParam("uuid") String uuid,
+            @ApiParam(
+                    name = "action",
+                    value = "Performing action.",
+                    required = true
+            )
+            @PathParam("action") String action,
             @ApiParam(
                     name = "installationDetails",
                     value = "The application ID and list of devices/users/roles",
@@ -129,7 +124,7 @@ public interface SubscriptionManagementAPI {
     );
 
     @POST
-    @Path("/install/{uuid}/{subType}")
+    @Path("/install/{uuid}/{subType}/{action}")
     @Produces(MediaType.APPLICATION_JSON)
     @Consumes(MediaType.APPLICATION_JSON)
     @ApiOperation(
@@ -149,7 +144,7 @@ public interface SubscriptionManagementAPI {
             value = {
 
             })
-    Response addBulkAppInstalltion(
+    Response performBulkAppOperation(
             @ApiParam(
                     name = "uuid",
                     value = "The application release UUID",
@@ -162,6 +157,12 @@ public interface SubscriptionManagementAPI {
                     required = true
             )
             @PathParam("subType") String subType,
+            @ApiParam(
+                    name = "action",
+                    value = "Performing action.",
+                    required = true
+            )
+            @PathParam("action") String action,
             @ApiParam(
                     name = "subscribers",
                     value = "Subscriber list of the application release.",
@@ -169,279 +170,4 @@ public interface SubscriptionManagementAPI {
             )
             @Valid List<String> subscribers
     );
-
-    @POST
-    @Path("/install/{uuid}/devices")
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-            consumes = MediaType.APPLICATION_JSON,
-            produces = MediaType.APPLICATION_JSON,
-            httpMethod = "POST",
-            value = "Install an application for devices",
-            notes = "This will install an application to a given list of devices",
-            tags = "Subscription Management",
-            extensions = {
-                    @Extension(properties = {
-                            @ExtensionProperty(name = SCOPE, value = "perm:app:subscription:install")
-                    })
-            }
-    )
-    @ApiResponses(
-            value = {
-
-            })
-    Response installApplicationForUsers(
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @PathParam("uuid") String uuid,
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @Valid List<String> users
-    );
-
-    @POST
-    @Path("/install/{uuid}/devices")
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-            consumes = MediaType.APPLICATION_JSON,
-            produces = MediaType.APPLICATION_JSON,
-            httpMethod = "POST",
-            value = "Install an application for devices",
-            notes = "This will install an application to a given list of devices",
-            tags = "Subscription Management",
-            extensions = {
-                    @Extension(properties = {
-                            @ExtensionProperty(name = SCOPE, value = "perm:app:subscription:install")
-                    })
-            }
-    )
-    @ApiResponses(
-            value = {
-                    @ApiResponse(
-                            code = 200,
-                            message = "OK. \n Successfully add an operation to install application for user devices..",
-                            response = PaginationResult.class,
-                            responseContainer = "PaginationResult"),
-                    @ApiResponse(
-                            code = 400,
-                            message =
-                                    "Bad Request. \n Found invalid payload with the request."),
-                    @ApiResponse(
-                            code = 403,
-                            message = "Don't have permission to install application release."),
-                    @ApiResponse(
-                            code = 404,
-                            message = "Not Found. \n Not found an application release for requested UUID."),
-                    @ApiResponse(
-                            code = 500,
-                            message = "Internal Server Error. \n Error occurred while adding operation to install "
-                                    + "application for users.",
-                            response = ErrorResponse.class)
-
-            })
-    Response installApplicationForRoles (
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @PathParam("uuid") String uuid,
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @Valid List<String> roles
-    );
-
-    @POST
-    @Path("/install/{uuid}/devices")
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-            consumes = MediaType.APPLICATION_JSON,
-            produces = MediaType.APPLICATION_JSON,
-            httpMethod = "POST",
-            value = "Install an application for devices",
-            notes = "This will install an application to a given list of devices",
-            tags = "Subscription Management",
-            extensions = {
-                    @Extension(properties = {
-                            @ExtensionProperty(name = SCOPE, value = "perm:app:subscription:install")
-                    })
-            }
-    )
-    @ApiResponses(
-            value = {
-
-            })
-    Response installApplicationForGroups (
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @PathParam("uuid") String uuid,
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @Valid List<String> groups
-    );
-
-//    ###########################
-
-
-    @POST
-    @Path("/uninstall/{uuid}/devices")
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-            consumes = MediaType.APPLICATION_JSON,
-            produces = MediaType.APPLICATION_JSON,
-            httpMethod = "POST",
-            value = "Install an application for devices",
-            notes = "This will install an application to a given list of devices",
-            tags = "Subscription Management",
-            extensions = {
-                    @Extension(properties = {
-                            @ExtensionProperty(name = SCOPE, value = "perm:app:subscription:uninstall")
-                    })
-            }
-    )
-    @ApiResponses(
-            value = {
-
-            })
-    Response uninstallApplicationForDevices(
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @PathParam("uuid") String uuid,
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @Valid List<DeviceIdentifier> deviceIdentifiers
-    );
-
-    @POST
-    @Path("/uninstall/{uuid}/devices")
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-            consumes = MediaType.APPLICATION_JSON,
-            produces = MediaType.APPLICATION_JSON,
-            httpMethod = "POST",
-            value = "Install an application for devices",
-            notes = "This will install an application to a given list of devices",
-            tags = "Subscription Management",
-            extensions = {
-                    @Extension(properties = {
-                            @ExtensionProperty(name = SCOPE, value = "perm:app:subscription:uninstall")
-                    })
-            }
-    )
-    @ApiResponses(
-            value = {
-
-            })
-    Response uninstallApplicationForUsers(
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @PathParam("uuid") String uuid,
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @Valid List<String> users
-    );
-
-    @POST
-    @Path("/uninstall/{uuid}/devices")
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-            consumes = MediaType.APPLICATION_JSON,
-            produces = MediaType.APPLICATION_JSON,
-            httpMethod = "POST",
-            value = "Install an application for devices",
-            notes = "This will install an application to a given list of devices",
-            tags = "Subscription Management",
-            extensions = {
-                    @Extension(properties = {
-                            @ExtensionProperty(name = SCOPE, value = "perm:app:subscription:uninstall")
-                    })
-            }
-    )
-    @ApiResponses(
-            value = {
-
-            })
-    Response uninstallApplicationForRoles (
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @PathParam("uuid") String uuid,
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @Valid List<String> roles
-    );
-
-    @POST
-    @Path("/uninstall/{uuid}/devices")
-    @Produces(MediaType.APPLICATION_JSON)
-    @Consumes(MediaType.APPLICATION_JSON)
-    @ApiOperation(
-            consumes = MediaType.APPLICATION_JSON,
-            produces = MediaType.APPLICATION_JSON,
-            httpMethod = "POST",
-            value = "Install an application for devices",
-            notes = "This will install an application to a given list of devices",
-            tags = "Subscription Management",
-            extensions = {
-                    @Extension(properties = {
-                            @ExtensionProperty(name = SCOPE, value = "perm:app:subscription:uninstall")
-                    })
-            }
-    )
-    @ApiResponses(
-            value = {
-
-            })
-    Response uninstallApplicationForGroups (
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @PathParam("uuid") String uuid,
-            @ApiParam(
-                    name = "installationDetails",
-                    value = "The application ID and list of devices/users/roles",
-                    required = true
-            )
-            @Valid List<String> groups
-    );
 }

components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/admin/ReviewManagementAdminAPI.java

@@ -49,7 +49,7 @@ import javax.ws.rs.core.Response;
 @SwaggerDefinition(
 info = @Info(
         version = "1.0.0",
-        title = "Admin Review Management Admin Service",
+        title = "Review Management Admin Service",
         extensions = {
                 @Extension(properties = {
                         @ExtensionProperty(name = "name", value = "ReviewManagementAdminService"),

components/application-mgt/org.wso2.carbon.device.application.mgt.store.api/src/main/java/org/wso2/carbon/device/application/mgt/store/api/services/impl/SubscriptionManagementAPIImpl.java

@@ -20,6 +20,7 @@ package org.wso2.carbon.device.application.mgt.store.api.services.impl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.application.mgt.common.ApplicationInstallResponse;
+import org.wso2.carbon.device.application.mgt.common.SubsciptionType;
 import org.wso2.carbon.device.application.mgt.core.exception.BadRequestException;
 import org.wso2.carbon.device.application.mgt.core.exception.ForbiddenException;
 import org.wso2.carbon.device.application.mgt.core.exception.NotFoundException;
@@ -48,14 +49,15 @@ public class SubscriptionManagementAPIImpl implements SubscriptionManagementAPI{
 
     @Override
     @POST
-    @Path("/install/{uuid}/devices")
+    @Path("/install/{uuid}/devices/{action}")
-    public Response installApplicationForDevices(
+    public Response performAppOperationForDevices(
             @PathParam("uuid") String uuid,
+            @PathParam("action") String action,
             @Valid List<DeviceIdentifier> deviceIdentifiers) {
         try {
             SubscriptionManager subscriptionManager = APIUtil.getSubscriptionManager();
             ApplicationInstallResponse response = subscriptionManager
-                    .installApplicationForDevices(uuid, deviceIdentifiers);
+                    .performBulkAppInstallation(uuid, deviceIdentifiers, SubsciptionType.DEVICE.toString(), action);
             return Response.status(Response.Status.OK).entity(response).build();
         } catch (NotFoundException e) {
             String msg = "Couldn't found an application release for UUI: " + uuid;
@@ -67,7 +69,8 @@ public class SubscriptionManagementAPIImpl implements SubscriptionManagementAPI{
             log.error(msg);
             return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
         } catch (ForbiddenException e) {
-            String msg = "Application release is not in the installable state. Hence you are not permitted to install the aplication.";
+            String msg = "Application release is not in the installable state. Hence you are not permitted to install "
+                    + "the application.";
             log.error(msg);
             return Response.status(Response.Status.FORBIDDEN).entity(msg).build();
         } catch (ApplicationManagementException e) {
@@ -80,14 +83,16 @@ public class SubscriptionManagementAPIImpl implements SubscriptionManagementAPI{
 
     @Override
     @POST
-    @Path("/install/{uuid}/{subType}")
+    @Path("/install/{uuid}/{subType}/{action}")
-    public Response addBulkAppInstalltion(
+    public Response performBulkAppOperation(
             @PathParam("uuid") String uuid,
-            @PathParam("uuid") String subType,
+            @PathParam("subType") String subType,
+            @PathParam("action") String action,
             @Valid List<String> subscribers) {
         try {
             SubscriptionManager subscriptionManager = APIUtil.getSubscriptionManager();
-            ApplicationInstallResponse response = subscriptionManager.addBulkApInstallation(uuid, subscribers, subType);
+            ApplicationInstallResponse response = subscriptionManager
+                    .performBulkAppInstallation(uuid, subscribers, subType, action);
             return Response.status(Response.Status.OK).entity(response).build();
         } catch (NotFoundException e) {
             String msg = "Couldn't found an application release for UUID: " + uuid + ". Hence, verify the payload";
@@ -110,101 +115,4 @@ public class SubscriptionManagementAPIImpl implements SubscriptionManagementAPI{
             return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
         }
     }
-
-    //todo remove following unwanted APIs
-
-    @Override
-    @POST
-    @Path("/install/{uuid}/users")
-    public Response installApplicationForUsers(
-            @PathParam("uuid") String uuid,
-            @Valid List<String> users) {
-        if (users.isEmpty()) {
-            String msg = "In order to install application release which has UUID " + uuid + ", you should provide list "
-                    + "of users. But found an empty list of users.";
-            log.error(msg);
-            return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
-        }
-        try {
-            SubscriptionManager subscriptionManager = APIUtil.getSubscriptionManager();
-            ApplicationInstallResponse response = subscriptionManager.installApplicationForUsers(uuid, users);
-            return Response.status(Response.Status.OK).entity(response).build();
-        } catch (NotFoundException e) {
-            String msg = "Couldn't found an application release for UUID: " + uuid + ". Hence, verify the payload";
-            log.error(msg);
-            return Response.status(Response.Status.NOT_FOUND).entity(msg).build();
-        } catch (BadRequestException e) {
-            String msg = "Found invalid payload for installing application which has UUID: " + uuid
-                    + ". Hence verify the payload";
-            log.error(msg);
-            return Response.status(Response.Status.BAD_REQUEST).entity(msg).build();
-        } catch (ForbiddenException e) {
-            String msg = "Application release is not in the installable state. Hence you are not permitted to install "
-                    + "the application.";
-            log.error(msg);
-            return Response.status(Response.Status.FORBIDDEN).entity(msg).build();
-        } catch (ApplicationManagementException e) {
-            String msg = "Error occurred while installing the application release which has UUID: " + uuid
-                    + " for user devices";
-            log.error(msg);
-            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).entity(msg).build();
-        }
-    }
-
-    @Override
-    @POST
-    @Path("/install/{uuid}/roles")
-    public Response installApplicationForRoles(
-            @PathParam("uuid") String uuid,
-            @Valid List<String> roles) {
-        return Response.status(Response.Status.BAD_REQUEST).entity("").build();
-    }
-
-    @Override
-    @POST
-    @Path("/install/{uuid}/groups")
-    public Response installApplicationForGroups(
-            @PathParam("uuid") String uuid,
-            @Valid List<String> groups) {
-        return Response.status(Response.Status.BAD_REQUEST).entity("").build();
-    }
-
-
-    @Override
-    @POST
-    @Path("/uninstall/{uuid}/devices")
-    public Response uninstallApplicationForDevices(
-            @PathParam("uuid") String uuid,
-            @Valid List<DeviceIdentifier> deviceIdentifiers) {
-        return Response.status(Response.Status.BAD_REQUEST).entity("").build();
-    }
-
-    @Override
-    @POST
-    @Path("/uninstall/{uuid}/users")
-    public Response uninstallApplicationForUsers(
-            @PathParam("uuid") String uuid,
-            @Valid List<String> users) {
-        return Response.status(Response.Status.BAD_REQUEST).entity("").build();
-    }
-
-    @Override
-    @POST
-    @Path("/uninstall/{uuid}/roles")
-    public Response uninstallApplicationForRoles(
-            @PathParam("uuid") String uuid,
-            @Valid List<String> roles) {
-        return Response.status(Response.Status.BAD_REQUEST).entity("").build();
-    }
-
-    @Override
-    @POST
-    @Path("/uninstall/{uuid}/groups")
-    public Response uninstallApplicationForGroups(
-            @PathParam("uuid") String uuid,
-            @Valid List<String> groups) {
-        return Response.status(Response.Status.BAD_REQUEST).entity("").build();
-
-    }
-
 }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/scep/SCEPManagerImpl.java

@@ -23,13 +23,12 @@ import org.wso2.carbon.certificate.mgt.core.internal.CertificateManagementDataHo
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
 
-import java.sql.SQLException;
 import java.util.HashMap;
 
 public class SCEPManagerImpl implements SCEPManager {

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/common/BaseDeviceManagementCertificateTest.java

@@ -27,7 +27,7 @@ import org.w3c.dom.Document;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.certificate.mgt.core.util.TestUtils;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.dao.GroupManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateManagementServiceImplTests.java

@@ -43,7 +43,7 @@ import org.wso2.carbon.certificate.mgt.core.util.CSRGenerator;
 import org.wso2.carbon.certificate.mgt.core.util.CertificateManagementConstants;
 import org.wso2.carbon.certificate.mgt.core.util.DummyCertificate;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import sun.misc.BASE64Encoder;
 import java.io.ByteArrayInputStream;

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.fcm/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/fcm/FCMNotificationStrategy.java

@@ -24,7 +24,7 @@ import com.google.gson.JsonPrimitive;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPMessageExecutor.java

@@ -8,7 +8,7 @@ import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.StringRequestEntity;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.InvalidConfigurationException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidConfigurationException;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
 
 import java.net.UnknownHostException;

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.http/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/http/HTTPNotificationStrategy.java

@@ -22,7 +22,7 @@ import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.InvalidConfigurationException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidConfigurationException;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/mqtt/MQTTNotificationStrategy.java

@@ -21,7 +21,7 @@ package org.wso2.carbon.device.mgt.extensions.push.notification.provider.mqtt;
 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.InvalidConfigurationException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidConfigurationException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;

components/device-mgt-extensions/org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp/src/main/java/org/wso2/carbon/device/mgt/extensions/push/notification/provider/xmpp/XMPPNotificationStrategy.java

@@ -20,7 +20,7 @@ package org.wso2.carbon.device.mgt.extensions.push.notification.provider.xmpp;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.InvalidConfigurationException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidConfigurationException;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;
 import org.wso2.carbon.device.mgt.common.push.notification.PushNotificationConfig;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/ApplicationWrapper.java

@@ -21,6 +21,7 @@ package org.wso2.carbon.device.mgt.jaxrs.beans;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+import org.wso2.carbon.device.mgt.common.app.mgt.MobileApp;
 
 import java.util.List;
 

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

@@ -27,7 +27,7 @@ import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.ConfigurationManagementService;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.device.mgt.jaxrs.util.MDMAppConstants;
+import org.wso2.carbon.device.mgt.common.MDMAppConstants;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
 import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
 

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

@@ -22,7 +22,6 @@ import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonParser;
-import io.swagger.annotations.ApiParam;
 import org.apache.axis2.AxisFault;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -30,18 +29,16 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.analytics.data.publisher.exception.DataPublisherConfigurationException;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.InvalidConfigurationException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidConfigurationException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService;
 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.common.policy.mgt.monitor.ComplianceFeature;
 import org.wso2.carbon.device.mgt.common.policy.mgt.monitor.PolicyComplianceException;
-import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMgtConstants;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
-import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.beans.OperationList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.Attribute;
 import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.AttributeType;

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

@@ -20,7 +20,7 @@ import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException;
 import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.Attribute;
 import org.wso2.carbon.device.mgt.jaxrs.beans.analytics.AttributeType;

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

@@ -24,13 +24,13 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceTypeNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceTypeNotFoundException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
-import org.wso2.carbon.device.mgt.common.InvalidConfigurationException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidConfigurationException;
-import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 import org.wso2.carbon.device.mgt.common.app.mgt.Application;

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

@@ -37,8 +37,8 @@ package org.wso2.carbon.device.mgt.jaxrs.service.impl;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceTypeNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceTypeNotFoundException;
 import org.wso2.carbon.device.mgt.common.Feature;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;

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

@@ -32,7 +32,7 @@ import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants.GeoServices;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException;
 import org.wso2.carbon.device.mgt.common.geo.service.*;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants;

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

@@ -22,11 +22,10 @@ package org.wso2.carbon.device.mgt.jaxrs.service.impl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.CarbonConstants;
-import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
 import org.wso2.carbon.device.mgt.common.GroupPaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;

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

@@ -23,7 +23,7 @@ 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.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;

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

@@ -40,7 +40,7 @@ import org.apache.commons.logging.LogFactory;
 import org.apache.http.HttpStatus;
 import org.eclipse.wst.common.uriresolver.internal.util.URIEncoder;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;

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

@@ -27,14 +27,14 @@ import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Operation;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
-import org.wso2.carbon.device.mgt.jaxrs.exception.UnknownApplicationTypeException;
+import org.wso2.carbon.device.mgt.common.exceptions.UnknownApplicationTypeException;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.admin.ApplicationManagementAdminService;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
-import org.wso2.carbon.device.mgt.jaxrs.util.MDMAndroidOperationUtil;
+import org.wso2.carbon.device.mgt.core.util.MDMAndroidOperationUtil;
-import org.wso2.carbon.device.mgt.jaxrs.util.MDMIOSOperationUtil;
+import org.wso2.carbon.device.mgt.core.util.MDMIOSOperationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ApplicationWrapper;
-import org.wso2.carbon.device.mgt.jaxrs.beans.MobileApp;
+import org.wso2.carbon.device.mgt.common.app.mgt.MobileApp;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.POST;

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

@@ -20,23 +20,20 @@ package org.wso2.carbon.device.mgt.jaxrs.service.impl.admin;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.solr.common.StringUtils;
-import org.wso2.carbon.apimgt.integration.generated.client.publisher.StringUtil;
 import org.wso2.carbon.base.MultitenantConstants;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
-import org.wso2.carbon.device.mgt.common.UserNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.UserNotFoundException;
 import org.wso2.carbon.device.mgt.jaxrs.beans.DeviceList;
 import org.wso2.carbon.device.mgt.jaxrs.beans.ErrorResponse;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.admin.DeviceManagementAdminService;
 import org.wso2.carbon.device.mgt.jaxrs.service.impl.util.RequestValidationUtil;
 import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
 
-import javax.validation.constraints.Past;
 import javax.validation.constraints.Size;
 import javax.ws.rs.*;
 import javax.ws.rs.core.MediaType;

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

@@ -38,7 +38,7 @@ package org.wso2.carbon.device.mgt.jaxrs.service.impl.admin;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.common.spi.DeviceManagementService;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;

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

@@ -18,13 +18,10 @@
  */
 package org.wso2.carbon.device.mgt.jaxrs.service.impl.admin;
 
-import io.swagger.annotations.ApiParam;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.netbeans.lib.cvsclient.commandLine.command.log;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.PrivacyComplianceException;
-import org.wso2.carbon.device.mgt.common.PrivacyComplianceException;
 import org.wso2.carbon.device.mgt.jaxrs.beans.PasswordResetWrapper;
 import org.wso2.carbon.device.mgt.jaxrs.service.api.admin.UserManagementAdminService;
 import org.wso2.carbon.device.mgt.jaxrs.util.CredentialManagementResponseBuilder;

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java

@@ -38,7 +38,7 @@ import org.wso2.carbon.core.util.Utils;
 import org.wso2.carbon.device.mgt.analytics.data.publisher.service.EventsPublisherService;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationEntry;
@@ -84,7 +84,6 @@ import javax.cache.Caching;
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManagerFactory;
-import javax.ws.rs.core.MediaType;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;

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

@@ -39,7 +39,7 @@ import org.wso2.carbon.device.mgt.analytics.data.publisher.service.EventsPublish
 import org.wso2.carbon.device.mgt.analytics.data.publisher.service.EventsPublisherServiceImpl;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService;

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

@@ -31,10 +31,9 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.ObjectFactory;
 import org.testng.annotations.Test;
 import org.wso2.carbon.context.CarbonContext;
-import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceTypeNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceTypeNotFoundException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;

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

@@ -30,7 +30,7 @@ import org.testng.IObjectFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.ObjectFactory;
 import org.testng.annotations.Test;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.spi.DeviceTypeGeneratorService;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;

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

@@ -29,7 +29,7 @@ import org.testng.IObjectFactory;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.ObjectFactory;
 import org.testng.annotations.Test;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;

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

@@ -6,7 +6,7 @@ import org.testng.Assert;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 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.service.DeviceManagementProviderService;

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

@@ -34,7 +34,7 @@ import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
 import org.wso2.carbon.device.mgt.common.GroupPaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;

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

@@ -32,7 +32,7 @@ import org.testng.annotations.BeforeClass;
 import org.testng.annotations.ObjectFactory;
 import org.testng.annotations.Test;
 import org.wso2.carbon.context.CarbonContext;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderServiceImpl;

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

@@ -18,6 +18,7 @@
 package org.wso2.carbon.device.mgt.common;
 
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;
 import org.wso2.carbon.device.mgt.common.license.mgt.LicenseManagementException;
 

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

@@ -18,6 +18,8 @@
  */
 package org.wso2.carbon.device.mgt.common;
 
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
+
 import java.util.List;
 
 public interface FeatureManager {

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

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.jaxrs.util;
+package org.wso2.carbon.device.mgt.common;
 
 /**
  * This class holds all the constants used for IOS and Android.

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/MobileApp.java

@@ -16,10 +16,11 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.jaxrs.beans;
+package org.wso2.carbon.device.mgt.common.app.mgt;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import org.wso2.carbon.device.mgt.common.app.mgt.MobileAppTypes;
 
 import java.util.Properties;
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/MobileAppTypes.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.jaxrs.beans;
+package org.wso2.carbon.device.mgt.common.app.mgt;
 
 public enum MobileAppTypes {
     ENTERPRISE,WEBAPP,PUBLIC

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/android/AppStoreApplication.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.jaxrs.beans.android;
+package org.wso2.carbon.device.mgt.common.app.mgt.android;
 
 import com.google.gson.Gson;
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/android/EnterpriseApplication.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.jaxrs.beans.android;
+package org.wso2.carbon.device.mgt.common.app.mgt.android;
 
 import com.google.gson.Gson;
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/android/WebApplication.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.jaxrs.beans.android;
+package org.wso2.carbon.device.mgt.common.app.mgt.android;
 
 import com.google.gson.Gson;
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ios/AppStoreApplication.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.jaxrs.beans.ios;
+package org.wso2.carbon.device.mgt.common.app.mgt.ios;
 
 import com.google.gson.Gson;
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ios/EnterpriseApplication.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.jaxrs.beans.ios;
+package org.wso2.carbon.device.mgt.common.app.mgt.ios;
 
 import com.google.gson.Gson;
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ios/RemoveApplication.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.jaxrs.beans.ios;
+package org.wso2.carbon.device.mgt.common.app.mgt.ios;
 
 import com.google.gson.Gson;
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/app/mgt/ios/WebClip.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.jaxrs.beans.ios;
+package org.wso2.carbon.device.mgt.common.app.mgt.ios;
 
 import com.google.gson.Gson;
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/DeviceManagementException.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 public class DeviceManagementException extends Exception {
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/DeviceNotFoundException.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 public class DeviceNotFoundException extends Exception {
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/DeviceTypeNotFoundException.java

@@ -15,7 +15,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 public class DeviceTypeNotFoundException extends Exception {
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/EntityDoesNotExistException.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 public class EntityDoesNotExistException extends RuntimeException {
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/FeatureManagementException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 
 public class FeatureManagementException extends Exception  {

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/IllegalTransactionStateException.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 public class IllegalTransactionStateException extends RuntimeException {
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/InvalidConfigurationException.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 /**
  * This exception is thrown when configured with invalid configuration.

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/InvalidDeviceException.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 public class InvalidDeviceException extends Exception {
     private static final long serialVersionUID = -3151279311929070297L;

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/PrivacyComplianceException.java

@@ -17,7 +17,7 @@
  */
 
 
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 public class PrivacyComplianceException extends Exception {
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/TransactionManagementException.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 public class TransactionManagementException extends Exception {
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/UnauthorizedDeviceAccessException.java

@@ -17,7 +17,7 @@
  *
  */
 
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 public class UnauthorizedDeviceAccessException extends RuntimeException {
     private static final long serialVersionUID = -3151289331929070297L;

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/UnknownApplicationTypeException.java

@@ -16,7 +16,7 @@
  *   under the License.
  *
  */
-package org.wso2.carbon.device.mgt.jaxrs.exception;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 public class UnknownApplicationTypeException extends Exception {
 

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/UnsupportedDatabaseEngineException.java

@@ -16,7 +16,7 @@
  * under the License.
  */
 
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 
 /**
  * This runtime exception will be thrown if the server has configured with unsupported DB engine.

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/exceptions/UserNotFoundException.java

@@ -1,4 +1,4 @@
-package org.wso2.carbon.device.mgt.common;
+package org.wso2.carbon.device.mgt.common.exceptions;
 /*
  * Copyright (c) 2019, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
  *

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/operation/mgt/OperationManager.java

@@ -18,8 +18,8 @@
 package org.wso2.carbon.device.mgt.common.operation.mgt;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;

components/device-mgt/org.wso2.carbon.device.mgt.common/src/main/java/org/wso2/carbon/device/mgt/common/spi/DeviceManagementService.java

@@ -20,6 +20,7 @@ package org.wso2.carbon.device.mgt.common.spi;
 
 import org.wso2.carbon.device.mgt.common.*;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManager;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.general.GeneralConfig;
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyMonitoringManager;
 import org.wso2.carbon.device.mgt.common.pull.notification.PullNotificationSubscriber;

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

@@ -21,9 +21,9 @@ import com.google.gson.Gson;
 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.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig;
-import org.wso2.carbon.device.mgt.common.InvalidConfigurationException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidConfigurationException;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.ProvisioningConfig;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManager;

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

@@ -24,9 +24,9 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.common.app.mgt.Application;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/archival/ArchivalServiceImpl.java

@@ -21,16 +21,13 @@ package org.wso2.carbon.device.mgt.core.archival;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.core.archival.beans.*;
 import org.wso2.carbon.device.mgt.core.archival.dao.*;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 
 import java.sql.SQLException;
-import java.util.ArrayList;
-import java.util.HashSet;
 import java.util.List;
-import java.util.Set;
 
 public class ArchivalServiceImpl implements ArchivalService {
     private static Log log = LogFactory.getLog(ArchivalServiceImpl.class);

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/archival/dao/ArchivalDestinationDAOFactory.java

@@ -20,8 +20,8 @@ package org.wso2.carbon.device.mgt.core.archival.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
+import org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.core.archival.dao.impl.DataDeletionDAOImpl;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/archival/dao/ArchivalSourceDAOFactory.java

@@ -21,8 +21,8 @@ package org.wso2.carbon.device.mgt.core.archival.dao;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
+import org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.core.archival.dao.impl.ArchivalDAOImpl;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.archival.ArchivalTaskConfiguration;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/authorization/DeviceAccessAuthorizationServiceImpl.java

@@ -23,7 +23,7 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.CarbonConstants;
 import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAuthorizationResult;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/config/DeviceConfigurationManager.java

@@ -20,17 +20,13 @@ package org.wso2.carbon.device.mgt.core.config;
 
 import org.w3c.dom.Document;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
 import org.wso2.carbon.utils.CarbonUtils;
-import org.xml.sax.SAXException;
 
-import javax.xml.XMLConstants;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
-import javax.xml.validation.Schema;
-import javax.xml.validation.SchemaFactory;
 import java.io.File;
 
 /**

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

@@ -21,12 +21,11 @@ package org.wso2.carbon.device.mgt.core.dao;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
+import org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
-import org.wso2.carbon.device.mgt.common.UnsupportedDatabaseEngineException;
+import org.wso2.carbon.device.mgt.common.exceptions.UnsupportedDatabaseEngineException;
 import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.device.mgt.core.config.datasource.JNDILookupDefinition;
-import org.wso2.carbon.device.mgt.core.dao.impl.AbstractApplicationDAOImpl;
 import org.wso2.carbon.device.mgt.core.dao.impl.ApplicationMappingDAOImpl;
 import org.wso2.carbon.device.mgt.core.dao.impl.DeviceTypeDAOImpl;
 import org.wso2.carbon.device.mgt.core.dao.impl.EnrollmentDAOImpl;

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

@@ -21,9 +21,9 @@ package org.wso2.carbon.device.mgt.core.dao;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
+import org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
-import org.wso2.carbon.device.mgt.common.UnsupportedDatabaseEngineException;
+import org.wso2.carbon.device.mgt.common.exceptions.UnsupportedDatabaseEngineException;
 import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.device.mgt.core.config.datasource.JNDILookupDefinition;
 import org.wso2.carbon.device.mgt.core.dao.impl.group.GenericGroupDAOImpl;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/device/details/mgt/impl/DeviceInformationManagerImpl.java

@@ -25,8 +25,8 @@ import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.device.mgt.analytics.data.publisher.exception.DataPublisherConfigurationException;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.common.device.details.DeviceInfo;
 import org.wso2.carbon.device.mgt.common.device.details.DeviceLocation;
 import org.wso2.carbon.device.mgt.core.dao.DeviceDAO;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java

@@ -21,7 +21,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.ComponentContext;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.app.mgt.ApplicationManagementException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationService;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfigurationManagementService;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/NotificationManagementServiceImpl.java

@@ -22,16 +22,14 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.EntityDoesNotExistException;
+import org.wso2.carbon.device.mgt.common.exceptions.EntityDoesNotExistException;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.common.notification.mgt.Notification;
 import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementException;
 import org.wso2.carbon.device.mgt.common.notification.mgt.NotificationManagementService;
-import org.wso2.carbon.device.mgt.core.dao.DeviceDAO;
-import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.notification.mgt.dao.NotificationDAO;
 import org.wso2.carbon.device.mgt.core.notification.mgt.dao.NotificationManagementDAOFactory;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/notification/mgt/dao/NotificationManagementDAOFactory.java

@@ -21,9 +21,9 @@ package org.wso2.carbon.device.mgt.core.notification.mgt.dao;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
+import org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
-import org.wso2.carbon.device.mgt.common.UnsupportedDatabaseEngineException;
+import org.wso2.carbon.device.mgt.common.exceptions.UnsupportedDatabaseEngineException;
 import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.device.mgt.core.config.datasource.JNDILookupDefinition;
 import org.wso2.carbon.device.mgt.core.notification.mgt.dao.impl.*;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/OperationManagerImpl.java

@@ -24,13 +24,13 @@ import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.MonitoringOperation;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.common.authorization.DeviceAccessAuthorizationException;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants;
 import org.wso2.carbon.device.mgt.common.operation.mgt.Activity;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/OperationManagementDAOFactory.java

@@ -21,9 +21,9 @@ package org.wso2.carbon.device.mgt.core.operation.mgt.dao;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceManagementConstants;
-import org.wso2.carbon.device.mgt.common.IllegalTransactionStateException;
+import org.wso2.carbon.device.mgt.common.exceptions.IllegalTransactionStateException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
-import org.wso2.carbon.device.mgt.common.UnsupportedDatabaseEngineException;
+import org.wso2.carbon.device.mgt.common.exceptions.UnsupportedDatabaseEngineException;
 import org.wso2.carbon.device.mgt.core.config.datasource.DataSourceConfig;
 import org.wso2.carbon.device.mgt.core.config.datasource.JNDILookupDefinition;
 import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/privacy/PrivacyComplianceProvider.java

@@ -20,7 +20,7 @@
 package org.wso2.carbon.device.mgt.core.privacy;
 
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.PrivacyComplianceException;
+import org.wso2.carbon.device.mgt.common.exceptions.PrivacyComplianceException;
 
 public interface PrivacyComplianceProvider {
 

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/privacy/impl/PrivacyComplianceProviderImpl.java

@@ -24,9 +24,9 @@ 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.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.PrivacyComplianceException;
+import org.wso2.carbon.device.mgt.common.exceptions.PrivacyComplianceException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.core.dao.DeviceManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.privacy.PrivacyComplianceProvider;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/push/notification/mgt/task/PushNotificationSchedulerTask.java

@@ -20,8 +20,8 @@ package org.wso2.carbon.device.mgt.core.push.notification.mgt.task;
 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.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationContext;
 import org.wso2.carbon.device.mgt.common.push.notification.NotificationStrategy;

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

@@ -19,16 +19,16 @@ package org.wso2.carbon.device.mgt.core.service;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceTypeNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceTypeNotFoundException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
-import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.MonitoringOperation;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.UserNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.UserNotFoundException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;
 import org.wso2.carbon.device.mgt.common.license.mgt.License;

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

@@ -34,22 +34,22 @@ import org.wso2.carbon.device.mgt.analytics.data.publisher.exception.DataPublish
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceEnrollmentInfoNotification;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.DeviceManager;
-import org.wso2.carbon.device.mgt.common.DeviceNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
 import org.wso2.carbon.device.mgt.common.DeviceNotification;
 import org.wso2.carbon.device.mgt.common.DevicePropertyNotification;
-import org.wso2.carbon.device.mgt.common.DeviceTypeNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceTypeNotFoundException;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 import org.wso2.carbon.device.mgt.common.FeatureManager;
 import org.wso2.carbon.device.mgt.common.InitialOperationConfig;
-import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
+import org.wso2.carbon.device.mgt.common.exceptions.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.MonitoringOperation;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.common.PaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
-import org.wso2.carbon.device.mgt.common.UserNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.UserNotFoundException;
 import org.wso2.carbon.device.mgt.common.app.mgt.Application;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.ConfigurationManagementException;
 import org.wso2.carbon.device.mgt.common.configuration.mgt.PlatformConfiguration;

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

@@ -20,7 +20,7 @@ package org.wso2.carbon.device.mgt.core.service;
 
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
 import org.wso2.carbon.device.mgt.common.GroupPaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;

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

@@ -25,11 +25,11 @@ import org.wso2.carbon.context.CarbonContext;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.Device;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.DeviceNotFoundException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceNotFoundException;
 import org.wso2.carbon.device.mgt.common.GroupPaginationRequest;
 import org.wso2.carbon.device.mgt.common.PaginationResult;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroup;
 import org.wso2.carbon.device.mgt.common.group.mgt.DeviceGroupConstants;
 import org.wso2.carbon.device.mgt.common.group.mgt.GroupAlreadyExistException;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/status/task/impl/DeviceStatusMonitoringTask.java

@@ -24,7 +24,7 @@ import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.DeviceStatusTaskPluginConfig;
 import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
-import org.wso2.carbon.device.mgt.common.TransactionManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.TransactionManagementException;
 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.operation.mgt.OperationEnrolmentMapping;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/task/impl/DeviceDetailsRetrieverTask.java

@@ -21,7 +21,7 @@ package org.wso2.carbon.device.mgt.core.task.impl;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
+import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;
 import org.wso2.carbon.device.mgt.common.OperationMonitoringTaskConfig;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;