EMM-1675:Added policy revoke operation

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

@@ -29,4 +29,11 @@ public class OperationMgtConstants {
         public static final String DEVICE_ID_SERVICE_NOT_FOUND =
                 "Issue in retrieving device management service instance for device found at %s";
     }
+
+    public final class OperationCodes {
+        private OperationCodes() {
+            throw new AssertionError();
+        }
+        public static final String POLICY_REVOKE = "POLICY_REVOKE";
+    }
 }

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

@@ -77,5 +77,5 @@ public interface PolicyManagerService {
 
     ComplianceData getDeviceCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 
-    boolean isCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
+    boolean isCompliant(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 }

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

@@ -201,7 +201,7 @@ public class PolicyManagerServiceImpl implements PolicyManagerService {
     }
 
     @Override
-    public boolean isCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException {
+    public boolean isCompliant(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException {
-        return monitoringManager.isCompliance(deviceIdentifier);
+        return monitoringManager.isCompliant(deviceIdentifier);
     }
 }

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

@@ -64,17 +64,14 @@ public class DelegationTask implements Task {
             if (!deviceTypes.isEmpty()) {
                 DeviceManagementProviderService service = PolicyManagementDataHolder.getInstance()
                         .getDeviceManagementService();
-                List<Device> devices = new ArrayList<>();
+                List<Device> devices;
+                List<Device> toBeNotified;
                 for (String deviceType : deviceTypes) {
                     try {
+                        devices = new ArrayList<>();
+                        toBeNotified = new ArrayList<>();
                         devices.addAll(service.getAllDevices(deviceType));
-                    } catch (DeviceManagementException e) {
-                        throw new PolicyManagementException("Error occurred while taking the devices", e);
-                    }
-                }
                         //HashMap<Integer, Integer> deviceIdPolicy = policyManager.getAppliedPolicyIdsDeviceIds();
-                List<Device> toBeNotified = new ArrayList<>();
-
                         for (Device device : devices) {
                             // if (deviceIdPolicy.containsKey(device.getId())) {
                             toBeNotified.add(device);
@@ -84,12 +81,16 @@ public class DelegationTask implements Task {
                             PolicyEnforcementDelegator enforcementDelegator = new PolicyEnforcementDelegatorImpl(toBeNotified);
                             enforcementDelegator.delegate();
                         }
+                    } catch (DeviceManagementException e) {
+                        throw new PolicyManagementException("Error occurred while fetching the devices", e);
+                    } catch (PolicyDelegationException e) {
+                        throw new PolicyManagementException("Error occurred while running the delegation task on " +
+                                                            "device-type : " + deviceType, e);
+                    }
+                }
             }
-
         } catch (PolicyManagementException e) {
             log.error("Error occurred while getting the policies applied to devices.", e);
-        } catch (PolicyDelegationException e) {
-            log.error("Error occurred while running the delegation task.", e);
         }
     }
 }

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

@@ -31,4 +31,6 @@ public interface PolicyEnforcementDelegator {
 
     void addPolicyOperation(List<DeviceIdentifier> deviceIdentifiers, Policy policy) throws PolicyDelegationException;
 
+    void addPolicyRevokeOperation(List<DeviceIdentifier> deviceIdentifiers) throws PolicyDelegationException;
+
 }

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

@@ -23,14 +23,18 @@ 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.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.operation.mgt.CommandOperation;
 import org.wso2.carbon.device.mgt.core.operation.mgt.OperationManagerImpl;
+import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMgtConstants;
 import org.wso2.carbon.policy.mgt.common.Policy;
 import org.wso2.carbon.policy.mgt.common.PolicyEvaluationException;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerService;
 import org.wso2.carbon.policy.mgt.core.PolicyManagerServiceImpl;
+import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
 import org.wso2.carbon.policy.mgt.core.util.PolicyManagerUtil;
 
 import java.util.ArrayList;
@@ -58,7 +62,6 @@ public class PolicyEnforcementDelegatorImpl implements PolicyEnforcementDelegato
 
     @Override
     public void delegate() throws PolicyDelegationException {
-
         for (Device device : devices) {
             DeviceIdentifier identifier = new DeviceIdentifier();
             identifier.setId(device.getDeviceIdentifier());
@@ -70,14 +73,17 @@ public class PolicyEnforcementDelegatorImpl implements PolicyEnforcementDelegato
                 List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
                 deviceIdentifiers.add(identifier);
                 this.addPolicyOperation(deviceIdentifiers, policy);
+            } else {
+                //This means all the applicable policies have been removed. Hence sending policy-revoke operation.
+                List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
+                deviceIdentifiers.add(identifier);
+                this.addPolicyRevokeOperation(deviceIdentifiers);
             }
-
         }
     }
 
     @Override
     public Policy getEffectivePolicy(DeviceIdentifier identifier) throws PolicyDelegationException {
-
         try {
             PolicyManagerService policyManagerService = new PolicyManagerServiceImpl();
             return policyManagerService.getPEP().getEffectivePolicy(identifier);
@@ -96,11 +102,13 @@ public class PolicyEnforcementDelegatorImpl implements PolicyEnforcementDelegato
     @Override
     public void addPolicyOperation(List<DeviceIdentifier> deviceIdentifiers, Policy policy) throws
             PolicyDelegationException {
-
         try {
-            //ToDo Need to fix this to fetch OSGi service
+            String type = null;
-            OperationManager operationManager = new OperationManagerImpl();
+            if (deviceIdentifiers.size() > 0) {
-            operationManager.addOperation(PolicyManagerUtil.transformPolicy(policy), deviceIdentifiers);
+                type = deviceIdentifiers.get(0).getType();
+            }
+            PolicyManagementDataHolder.getInstance().getDeviceManagementService().addOperation(type,
+                                                          PolicyManagerUtil.transformPolicy(policy), deviceIdentifiers);
         } catch (InvalidDeviceException e) {
             String msg = "Invalid DeviceIdentifiers found.";
             log.error(msg, e);
@@ -110,7 +118,33 @@ public class PolicyEnforcementDelegatorImpl implements PolicyEnforcementDelegato
             log.error(msg, e);
             throw new PolicyDelegationException(msg, e);
         }
+    }
 
+    @Override
+    public void addPolicyRevokeOperation(List<DeviceIdentifier> deviceIdentifiers) throws PolicyDelegationException {
+        try {
+            String type = null;
+            if (deviceIdentifiers.size() > 0) {
+                type = deviceIdentifiers.get(0).getType();
+            }
+            PolicyManagementDataHolder.getInstance().getDeviceManagementService().addOperation(type,
+                                                                   this.getPolicyRevokeOperation(), 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);
+            throw new PolicyDelegationException(msg, e);
+        }
     }
 
+    private Operation getPolicyRevokeOperation() {
+        CommandOperation policyRevokeOperation = new CommandOperation();
+        policyRevokeOperation.setEnabled(true);
+        policyRevokeOperation.setCode(OperationMgtConstants.OperationCodes.POLICY_REVOKE);
+        policyRevokeOperation.setType(Operation.Type.COMMAND);
+        return policyRevokeOperation;
+    }
 }

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

@@ -114,7 +114,13 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
     @Override
     public boolean deletePolicy(int policyId) throws PolicyManagementException {
         boolean bool =policyManager.deletePolicy(policyId);
-        PolicyCacheManagerImpl.getInstance().rePopulateCache();
+        PolicyCacheManager policyCacheManager = PolicyCacheManagerImpl.getInstance();
+        policyCacheManager.rePopulateCache();
+        List<Policy> appliedPolicies = policyCacheManager.getAllPolicies();
+        //This means all the policies have been deleted. Hence triggering publishChanges to take immediate effect.
+        if (appliedPolicies.isEmpty()) {
+            this.publishChanges();
+        }
         return bool;
     }
 

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

@@ -33,7 +33,7 @@ public interface MonitoringManager {
             throws PolicyComplianceException;
 
 
-    boolean isCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
+    boolean isCompliant(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 
     ComplianceData getDevicePolicyCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException;
 

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

@@ -171,7 +171,7 @@ public class MonitoringManagerImpl implements MonitoringManager {
     }
 
     @Override
-    public boolean isCompliance(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException {
+    public boolean isCompliant(DeviceIdentifier deviceIdentifier) throws PolicyComplianceException {
         try {
             DeviceManagementProviderService service =
                     PolicyManagementDataHolder.getInstance().getDeviceManagementService();