Merge branch 'carbon-kernel-4.4.3' of https://github.com/wso2/carbon-device-mgt into carbon-kernel-4.4.3

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

@@ -0,0 +1,43 @@
+/*
+ *   Copyright (c) 2016, 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.mgt.common;
+
+public class InvalidDeviceException extends Exception {
+    private static final long serialVersionUID = -3151279311929070297L;
+
+    public InvalidDeviceException(String msg, Exception nestedEx) {
+        super(msg, nestedEx);
+    }
+
+    public InvalidDeviceException(String message, Throwable cause) {
+        super(message, cause);
+    }
+
+    public InvalidDeviceException(String msg) {
+        super(msg);
+    }
+
+    public InvalidDeviceException() {
+        super();
+    }
+
+    public InvalidDeviceException(Throwable cause) {
+        super(cause);
+    }
+}

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

@@ -32,10 +32,11 @@ public interface OperationManager {
      *
      * @param operation Operation to be added
      * @param devices   List of DeviceIdentifiers to execute the operation
-     * @throws OperationManagementException If some unusual behaviour is observed while adding the
+     * @throws OperationManagementException If some unusual behaviour is observed while adding the operation
-     *                                      operation
+     *         InvalidDeviceException       If addOperation request contains Invalid DeviceIdentifiers.
      */
-    Activity addOperation(Operation operation, List<DeviceIdentifier> devices) throws OperationManagementException;
+    Activity addOperation(Operation operation, List<DeviceIdentifier> devices) throws OperationManagementException,
+            InvalidDeviceException;
 
     /**
      * Method to retrieve the list of all operations to a device.
@@ -49,8 +50,8 @@ public interface OperationManager {
     /**
      * Method to retrieve all the operations applied to a device with pagination support.
      *
-     * @param deviceId       DeviceIdentifier of the device
+     * @param deviceId DeviceIdentifier of the device
-     * @param request        PaginationRequest object holding the data for pagination
+     * @param request  PaginationRequest object holding the data for pagination
      * @return PaginationResult - Result including the required parameters necessary to do pagination.
      * @throws OperationManagementException If some unusual behaviour is observed while fetching the
      *                                      operation list.

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

@@ -97,8 +97,8 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             if (deviceIds.size() > 0) {
                 type = deviceIds.get(0).getType().toLowerCase();
             }
-            Activity activity =  DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().
+            Activity activity = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().
-                   addOperation(type, operation, deviceIds);
+                    addOperation(type, operation, deviceIds);
             DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().notifyOperationToDevices
                     (operation, deviceIds);
             return activity;
@@ -106,6 +106,8 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             throw new ApplicationManagementException("Error in add operation at app installation", e);
         } catch (DeviceManagementException e) {
             throw new ApplicationManagementException("Error in notify operation at app installation", e);
+        } catch (InvalidDeviceException e) {
+            throw new ApplicationManagementException("Invalid DeviceIdentifiers found.", e);
         }
     }
 
@@ -140,6 +142,8 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
 
             return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider()
                     .addOperation(type, operation, deviceIdentifierList);
+        } catch (InvalidDeviceException e) {
+            throw new ApplicationManagementException("Invalid DeviceIdentifiers found.", e);
         } catch (DeviceManagementException e) {
             throw new ApplicationManagementException("Error in get devices for user: " + userName +
                     " in app installation", e);
@@ -179,6 +183,8 @@ public class ApplicationManagerProviderServiceImpl implements ApplicationManagem
             }
             return DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().addOperation(type, operation,
                     deviceIdentifierList);
+        } catch (InvalidDeviceException e) {
+            throw new ApplicationManagementException("Invalid DeviceIdentifiers found.", e);
         } catch (DeviceManagementException e) {
             throw new ApplicationManagementException("Error in get devices for user role " + userRole +
                     " in app installation", e);

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

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+ * Copyright (c) 2016, 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
@@ -43,9 +43,11 @@ import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOE
 import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
 import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationMappingDAO;
 import org.wso2.carbon.device.mgt.core.operation.mgt.dao.util.OperationDAOUtil;
+import org.wso2.carbon.device.mgt.core.operation.mgt.util.DeviceIDHolder;
 import org.wso2.carbon.device.mgt.core.operation.mgt.util.OperationCreateTimeComparator;
 import org.wso2.carbon.device.mgt.core.task.DeviceTaskManager;
 import org.wso2.carbon.device.mgt.core.task.impl.DeviceTaskManagerImpl;
+import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
 
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -88,7 +90,7 @@ public class OperationManagerImpl implements OperationManager {
 
     @Override
     public Activity addOperation(Operation operation,
-                                 List<DeviceIdentifier> deviceIds) throws OperationManagementException {
+                                 List<DeviceIdentifier> deviceIds) throws OperationManagementException, InvalidDeviceException {
         if (log.isDebugEnabled()) {
             log.debug("operation:[" + operation.toString() + "]");
             for (DeviceIdentifier deviceIdentifier : deviceIds) {
@@ -96,63 +98,70 @@ public class OperationManagerImpl implements OperationManager {
                         deviceIdentifier.getType() + "]");
             }
         }
-
-        List<DeviceIdentifier> authorizedDeviceList = this.getAuthorizedDevices(operation, deviceIds);
-        if (authorizedDeviceList.size() <= 0) {
-            log.info("User : " + getUser() + " is not authorized to perform operations on given device-list.");
-            return null;
-        }
-
         try {
-            OperationManagementDAOFactory.beginTransaction();
+            DeviceIDHolder deviceIDHolder = DeviceManagerUtil.validateDeviceIdentifiers(deviceIds);
-            org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation operationDto =
+            List<DeviceIdentifier> validDeviceIds = deviceIDHolder.getValidDeviceIDList();
-                    OperationDAOUtil.convertOperation(operation);
+            if (validDeviceIds.size() > 0) {
-            int operationId = this.lookupOperationDAO(operation).addOperation(operationDto);
+                List<DeviceIdentifier> authorizedDeviceList = this.getAuthorizedDevices(operation, deviceIds);
-            boolean isScheduledOperation = this.isTaskScheduledOperation(operation);
+                if (authorizedDeviceList.size() <= 0) {
-            boolean isNotRepeated = false;
+                    log.info("User : " + getUser() + " is not authorized to perform operations on given device-list.");
-            boolean hasExistingTaskOperation;
+                    return null;
-            int enrolmentId;
+                }
-            if (operationDto.getControl() ==
-                org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Control.NO_REPEAT) {
-                isNotRepeated = true;
-            }
 
-            //TODO have to create a sql to load device details from deviceDAO using single query.
+                OperationManagementDAOFactory.beginTransaction();
-            String operationCode = operationDto.getCode();
+                org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation operationDto =
-            for (DeviceIdentifier deviceId : deviceIds) {
+                        OperationDAOUtil.convertOperation(operation);
-                Device device = getDevice(deviceId);
+                int operationId = this.lookupOperationDAO(operation).addOperation(operationDto);
-                enrolmentId = device.getEnrolmentInfo().getId();
+                boolean isScheduledOperation = this.isTaskScheduledOperation(operation);
-                //Do not repeat the task operations
+                boolean isNotRepeated = false;
-                if (isScheduledOperation) {
+                boolean hasExistingTaskOperation;
-                    hasExistingTaskOperation = operationDAO.updateTaskOperation(enrolmentId, operationCode);
+                int enrolmentId;
-                    if (!hasExistingTaskOperation) {
+                if (operationDto.getControl() ==
+                        org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Control.NO_REPEAT) {
+                    isNotRepeated = true;
+                }
+
+                //TODO have to create a sql to load device details from deviceDAO using single query.
+                String operationCode = operationDto.getCode();
+                for (DeviceIdentifier deviceId : deviceIds) {
+                    Device device = getDevice(deviceId);
+                    enrolmentId = device.getEnrolmentInfo().getId();
+                    //Do not repeat the task operations
+                    if (isScheduledOperation) {
+                        hasExistingTaskOperation = operationDAO.updateTaskOperation(enrolmentId, operationCode);
+                        if (!hasExistingTaskOperation) {
+                            operationMappingDAO.addOperationMapping(operationId, enrolmentId);
+                        }
+                    } else if (isNotRepeated) {
+                        operationDAO.updateEnrollmentOperationsStatus(enrolmentId, operationCode,
+                                org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.PENDING,
+                                org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.REPEATED);
+                        operationMappingDAO.addOperationMapping(operationId, enrolmentId);
+                    } else {
                         operationMappingDAO.addOperationMapping(operationId, enrolmentId);
                     }
-                } else if (isNotRepeated) {
+                    if (notificationStrategy != null) {
-                    operationDAO.updateEnrollmentOperationsStatus(enrolmentId, operationCode,
+                        try {
-                                      org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.PENDING,
+                            notificationStrategy.execute(new NotificationContext(deviceId, operation));
-                                           org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status.REPEATED);
+                        } catch (PushNotificationExecutionFailedException e) {
-                    operationMappingDAO.addOperationMapping(operationId, enrolmentId);
+                            log.error("Error occurred while sending push notifications to " +
-                } else {
+                                    deviceId.getType() + " device carrying id '" +
-                    operationMappingDAO.addOperationMapping(operationId, enrolmentId);
+                                    deviceId + "'", e);
-                }
+                        }
-                if (notificationStrategy != null) {
-                    try {
-                        notificationStrategy.execute(new NotificationContext(deviceId, operation));
-                    } catch (PushNotificationExecutionFailedException e) {
-                        log.error("Error occurred while sending push notifications to " +
-                                deviceId.getType() + " device carrying id '" +
-                                deviceId + "'", e);
                     }
                 }
+
+                OperationManagementDAOFactory.commitTransaction();
+                Activity activity = new Activity();
+                activity.setActivityId(DeviceManagementConstants.OperationAttributes.ACTIVITY + operationId);
+                activity.setCode(operationCode);
+                activity.setCreatedTimeStamp(new Date().toString());
+                activity.setType(Activity.Type.valueOf(operationDto.getType().toString()));
+                return activity;
+            } else {
+                throw new InvalidDeviceException("Invalid device Identifiers found.");
             }
-            OperationManagementDAOFactory.commitTransaction();
+
-            Activity activity = new Activity();
-            activity.setActivityId(DeviceManagementConstants.OperationAttributes.ACTIVITY + operationId);
-            activity.setCode(operationCode);
-            activity.setCreatedTimeStamp(new Date().toString());
-            activity.setType(Activity.Type.valueOf(operationDto.getType().toString()));
-            return activity;
         } catch (OperationManagementDAOException e) {
             OperationManagementDAOFactory.rollbackTransaction();
             throw new OperationManagementException("Error occurred while adding operation", e);
@@ -809,9 +818,9 @@ public class OperationManagerImpl implements OperationManager {
     }
 
     private boolean isTaskScheduledOperation(Operation operation) {
-        TaskConfiguration taskConfiguration =  DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
+        TaskConfiguration taskConfiguration = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().
-                                                                                                 getTaskConfiguration();
+                getTaskConfiguration();
-        for (TaskConfiguration.Operation op:taskConfiguration.getOperations()) {
+        for (TaskConfiguration.Operation op : taskConfiguration.getOperations()) {
             if (operation.getCode().equals(op.getOperationName())) {
                 return true;
             }

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

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2016, 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.mgt.core.operation.mgt;
+
+public class OperationMgtConstants {
+
+    public final class DeviceConstants {
+        private DeviceConstants() {
+            throw new AssertionError();
+        }
+
+        public static final String DEVICE_ID_NOT_FOUND = "Device not found for device id: %s";
+        public static final String DEVICE_ID_SERVICE_NOT_FOUND =
+                "Issue in retrieving device management service instance for device found at %s";
+    }
+}

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

@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2016, 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.mgt.core.operation.mgt.util;
+
+import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
+
+import java.util.List;
+
+/**
+ * Holder class for storing valid & invalid device-ids.
+ */
+public class DeviceIDHolder {
+
+	private List<String> errorDeviceIdList;
+	private List<DeviceIdentifier> validDeviceIDList;
+
+	public List<String> getErrorDeviceIdList() {
+		return errorDeviceIdList;
+	}
+
+	public void setErrorDeviceIdList(List<String> errorDeviceIdList) {
+		this.errorDeviceIdList = errorDeviceIdList;
+	}
+
+	public List<DeviceIdentifier> getValidDeviceIDList() {
+		return validDeviceIDList;
+	}
+
+	public void setValidDeviceIDList(List<DeviceIdentifier> validDeviceIDList) {
+		this.validDeviceIDList = validDeviceIDList;
+	}
+}

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

@@ -42,7 +42,7 @@ public class PushNotificationBasedOperationManager implements OperationManager {
 
     @Override
     public Activity addOperation(Operation operation,
-                                 List<DeviceIdentifier> devices) throws OperationManagementException {
+                                 List<DeviceIdentifier> devices) throws OperationManagementException, InvalidDeviceException {
         Activity activity = this.operationManager.addOperation(operation, devices);
         for (DeviceIdentifier deviceId : devices) {
             try {

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

@@ -222,7 +222,7 @@ public interface DeviceManagementProviderService {
                                   List<DeviceIdentifier> deviceIds) throws DeviceManagementException;
 
     Activity addOperation(String type, Operation operation,
-                          List<DeviceIdentifier> devices) throws OperationManagementException;
+                          List<DeviceIdentifier> devices) throws OperationManagementException, InvalidDeviceException;
 
     List<? extends Operation> getOperations(DeviceIdentifier deviceId) throws OperationManagementException;
 

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

@@ -1021,7 +1021,7 @@ public class DeviceManagementProviderServiceImpl implements DeviceManagementProv
 
     @Override
     public Activity addOperation(String type, Operation operation,
-                                 List<DeviceIdentifier> devices) throws OperationManagementException {
+                                 List<DeviceIdentifier> devices) throws OperationManagementException, InvalidDeviceException {
         return pluginRepository.getOperationManager(type, this.getTenantId()).addOperation(operation, devices);
     }
 

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

@@ -23,6 +23,7 @@ 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.InvalidDeviceException;
 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.config.DeviceConfigurationManager;
@@ -108,6 +109,8 @@ public class DeviceTaskManagerImpl implements DeviceTaskManager {
                     log.debug("No devices are available to perform the operations.");
                 }
             }
+        } catch (InvalidDeviceException e) {
+            throw new DeviceMgtTaskException("Invalid DeviceIdentifiers found.", e);
         } catch (DeviceManagementException e) {
             throw new DeviceMgtTaskException("Error occurred while retrieving the device list.", e);
         } catch (OperationManagementException e) {

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

@@ -34,6 +34,8 @@ import org.wso2.carbon.device.mgt.core.dao.DeviceTypeDAO;
 import org.wso2.carbon.device.mgt.core.dao.util.DeviceManagementDAOUtil;
 import org.wso2.carbon.device.mgt.core.dto.DeviceType;
 import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
+import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMgtConstants;
+import org.wso2.carbon.device.mgt.core.operation.mgt.util.DeviceIDHolder;
 import org.wso2.carbon.user.api.TenantManager;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.utils.CarbonUtils;
@@ -317,4 +319,53 @@ public final class DeviceManagerUtil {
         }
         return limit;
     }
+
+    public static DeviceIDHolder validateDeviceIdentifiers(List<DeviceIdentifier> deviceIDs) {
+
+        List<String> errorDeviceIdList = new ArrayList<String>();
+        List<DeviceIdentifier> validDeviceIDList = new ArrayList<DeviceIdentifier>();
+
+        int deviceIDCounter = 0;
+        for (DeviceIdentifier deviceIdentifier : deviceIDs) {
+
+            deviceIDCounter++;
+            String deviceID = deviceIdentifier.getId();
+
+            if (deviceID == null || deviceID.isEmpty()) {
+                errorDeviceIdList.add(String.format(OperationMgtConstants.DeviceConstants.DEVICE_ID_NOT_FOUND,
+                        deviceIDCounter));
+                continue;
+            }
+
+            try {
+
+                if (isValidDeviceIdentifier(deviceIdentifier)) {
+                    validDeviceIDList.add(deviceIdentifier);
+                } else {
+                    errorDeviceIdList.add(String.format(OperationMgtConstants.DeviceConstants.
+                            DEVICE_ID_NOT_FOUND, deviceID));
+                }
+            } catch (DeviceManagementException e) {
+                errorDeviceIdList.add(String.format(OperationMgtConstants.DeviceConstants.DEVICE_ID_SERVICE_NOT_FOUND,
+                        deviceIDCounter));
+            }
+        }
+
+        DeviceIDHolder deviceIDHolder = new DeviceIDHolder();
+        deviceIDHolder.setValidDeviceIDList(validDeviceIDList);
+        deviceIDHolder.setErrorDeviceIdList(errorDeviceIdList);
+
+        return deviceIDHolder;
+    }
+
+    public static boolean isValidDeviceIdentifier(DeviceIdentifier deviceIdentifier) throws DeviceManagementException {
+        Device device = DeviceManagementDataHolder.getInstance().getDeviceManagementProvider().getDevice(deviceIdentifier);
+        if (device == null || device.getDeviceIdentifier() == null ||
+                device.getDeviceIdentifier().isEmpty() || device.getEnrolmentInfo() == null) {
+            return false;
+        } else if (EnrolmentInfo.Status.REMOVED.equals(device.getEnrolmentInfo().getStatus())) {
+            return false;
+        }
+        return true;
+    }
 }

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

@@ -22,6 +22,7 @@ import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.Feature;
+import org.wso2.carbon.device.mgt.common.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.policy.mgt.common.*;
 import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
@@ -105,6 +106,10 @@ public class PolicyManagerServiceImpl implements PolicyManagerService {
             PolicyManagementDataHolder.getInstance().getDeviceManagementService().addOperation(type,
                     PolicyManagerUtil.transformPolicy(policy), deviceIdentifiers);
             return policy;
+        } catch (InvalidDeviceException e) {
+            String msg = "Error occurred while getting the effective policies for invalid DeviceIdentifiers";
+            log.error(msg, e);
+            throw new PolicyManagementException(msg, e);
         } catch (PolicyEvaluationException e) {
             String msg = "Error occurred while getting the effective policies from the PEP service for device " +
                     deviceIdentifier.getId() + " - " + deviceIdentifier.getType();

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/main/java/org/wso2/carbon/policy/mgt/core/enforcement/PolicyEnforcementDelegatorImpl.java

@@ -22,6 +22,7 @@ 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.InvalidDeviceException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManagementException;
 import org.wso2.carbon.device.mgt.common.operation.mgt.OperationManager;
 import org.wso2.carbon.device.mgt.core.operation.mgt.OperationManagerImpl;
@@ -100,6 +101,10 @@ public class PolicyEnforcementDelegatorImpl implements PolicyEnforcementDelegato
             //ToDo Need to fix this to fetch OSGi service
             OperationManager operationManager = new OperationManagerImpl();
             operationManager.addOperation(PolicyManagerUtil.transformPolicy(policy), deviceIdentifiers);
+        } catch (InvalidDeviceException e) {
+            String msg = "Invalid DeviceIdentifiers found.";
+            log.error(msg, e);
+            throw new PolicyDelegationException(msg, e);
         } catch (OperationManagementException e) {
             String msg = "Error occurred while adding the operation to device.";
             log.error(msg, e);

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

@@ -21,10 +21,7 @@ package org.wso2.carbon.policy.mgt.core.impl;
 
 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.*;
-import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
-import org.wso2.carbon.device.mgt.common.DeviceManagementException;
-import org.wso2.carbon.device.mgt.common.EnrolmentInfo;
 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.operation.mgt.PolicyOperation;
@@ -170,7 +167,8 @@ public class ComplianceDecisionPointImpl implements ComplianceDecisionPoint {
                         addOperation(type, policyOperation, deviceIdentifiers);
 
             }
-
+        } catch (InvalidDeviceException e) {
+            throw new PolicyComplianceException("Invalid Device identifiers found.", e);
         } catch (OperationManagementException e) {
             throw new PolicyComplianceException("Error occurred while re-enforcing the policy to device " + deviceIdentifier.getId() + " - " +
                     deviceIdentifier.getType(), e);

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

@@ -25,6 +25,7 @@ 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.InvalidDeviceException;
 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.config.DeviceConfigurationManager;
@@ -354,6 +355,8 @@ public class MonitoringManagerImpl implements MonitoringManager {
         if (!deviceIdsToAddOperation.isEmpty()) {
             try {
                 this.addMonitoringOperationsToDatabase(new ArrayList<>(deviceIdsToAddOperation.values()));
+            } catch (InvalidDeviceException e) {
+                throw new PolicyComplianceException("Invalid Device Identifiers found.", e);
             } catch (OperationManagementException e) {
                 throw new PolicyComplianceException("Error occurred while adding monitoring operation to devices", e);
             }
@@ -387,7 +390,7 @@ public class MonitoringManagerImpl implements MonitoringManager {
     }
 
     private void addMonitoringOperationsToDatabase(List<Device> devices)
-            throws PolicyComplianceException, OperationManagementException {
+            throws PolicyComplianceException, OperationManagementException, InvalidDeviceException {
 
         List<DeviceIdentifier> deviceIdentifiers = this.getDeviceIdentifiersFromDevices(devices);
         CommandOperation monitoringOperation = new CommandOperation();