Policy related operations

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

@@ -26,6 +26,8 @@ import org.wso2.carbon.device.mgt.common.DeviceManagementException;
 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.operation.mgt.OperationManager;
+import org.wso2.carbon.device.mgt.core.dto.operation.mgt.*;
+import org.wso2.carbon.device.mgt.core.dto.operation.mgt.PolicyOperation;
 import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationDAO;
 import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOException;
 import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOFactory;
@@ -343,9 +345,22 @@ public class OperationManagerImpl implements OperationManager {
                             org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation.Status
                                     .valueOf(status.toString()));
 
-            Operation operation;
+            Operation operation = null;
+            PolicyOperation policyOperation;
+
             for (org.wso2.carbon.device.mgt.core.dto.operation.mgt.Operation dtoOperation : dtoOperationList) {
-                operation = OperationDAOUtil.convertOperation(dtoOperation);
+
+                if (dtoOperation instanceof org.wso2.carbon.device.mgt.core.dto.operation.mgt.PolicyOperation){
+                    policyOperation = (PolicyOperation)dtoOperation;
+                    for(org.wso2.carbon.device.mgt.core.dto.operation.mgt.ProfileOperation
+                            profileOperation:policyOperation.getProfileOperations()){
+                        operation = OperationDAOUtil.convertOperation(profileOperation);
+                    }
+                }else{
+                    operation = OperationDAOUtil.convertOperation(dtoOperation);
+                }
+
+
                 operations.add(operation);
             }
             return operations;

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/operation/mgt/dao/impl/OperationDAOImpl.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.core.dto.operation.mgt.Operation;
+import org.wso2.carbon.device.mgt.core.dto.operation.mgt.PolicyOperation;
 import org.wso2.carbon.device.mgt.core.dto.operation.mgt.ProfileOperation;
 import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationDAO;
 import org.wso2.carbon.device.mgt.core.operation.mgt.dao.OperationManagementDAOException;
@@ -276,7 +277,11 @@ public class OperationDAOImpl implements OperationDAO {
                     operationDetails = rs.getBytes("OPERATION_DETAILS");
                     bais = new ByteArrayInputStream(operationDetails);
                     ois = new ObjectInputStream(bais);
-                    operation = (ProfileOperation) ois.readObject();
+                    if (ois.readObject() instanceof PolicyOperation){
+                        operation = (PolicyOperation) ois.readObject();
+                    }else{
+                        operation = (PolicyOperation) ois.readObject();
+                    }
                 } else {
                     operation = new Operation();
                     operation.setId(rs.getInt("ID"));

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

@@ -23,6 +23,7 @@ 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.operation.mgt.OperationManagementException;
+import org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation;
 import org.wso2.carbon.device.mgt.core.operation.mgt.ProfileOperation;
 import org.wso2.carbon.policy.mgt.common.*;
 import org.wso2.carbon.policy.mgt.core.impl.PolicyAdministratorPointImpl;