Merge remote-tracking branch 'upstream/master'

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

@@ -17,6 +17,7 @@
  */
 package org.wso2.carbon.device.mgt.core;
 
+import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMgtConstants;
 import org.wso2.carbon.device.mgt.core.operation.mgt.PolicyOperation;
 
 public final class DeviceManagementConstants {
@@ -57,6 +58,7 @@ public final class DeviceManagementConstants {
 
         public static final String MONITOR_OPERATION_CODE = "MONITOR";
         public static final String POLICY_OPERATION_CODE = PolicyOperation.POLICY_OPERATION_CODE;
+        public static final String POLICY_REVOKE_OPERATION_CODE = OperationMgtConstants.OperationCodes.POLICY_REVOKE;
     }
 
     public static final class EmailAttributes {

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

@@ -881,6 +881,9 @@ public class OperationManagerImpl implements OperationManager {
             case DeviceManagementConstants.AuthorizationSkippedOperationCodes.MONITOR_OPERATION_CODE:
                 status = true;
                 break;
+            case DeviceManagementConstants.AuthorizationSkippedOperationCodes.POLICY_REVOKE_OPERATION_CODE:
+                status = true;
+                break;
             default:
                 status = false;
         }

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

@@ -68,15 +68,13 @@ public class PolicyEnforcementDelegatorImpl implements PolicyEnforcementDelegato
             identifier.setType(device.getType());
 
             Policy policy = this.getEffectivePolicy(identifier);
-
-            if (policy != null) {
             List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
             deviceIdentifiers.add(identifier);
+            if (policy != null) {
+                this.addPolicyRevokeOperation(deviceIdentifiers);
                 this.addPolicyOperation(deviceIdentifiers, policy);
             } else {
-                //This means all the applicable policies have been removed. Hence sending policy-revoke operation.
+                //This means all the applicable policies have been removed from device. Hence calling a policy revoke.
-                List<DeviceIdentifier> deviceIdentifiers = new ArrayList<>();
-                deviceIdentifiers.add(identifier);
                 this.addPolicyRevokeOperation(deviceIdentifiers);
             }
         }

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

@@ -107,20 +107,16 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
     @Override
     public boolean deletePolicy(Policy policy) throws PolicyManagementException {
         boolean bool = policyManager.deletePolicy(policy);
-        PolicyCacheManagerImpl.getInstance().rePopulateCache();
+        PolicyCacheManager policyCacheManager = PolicyCacheManagerImpl.getInstance();
+        policyCacheManager.rePopulateCache();
         return bool;
     }
 
     @Override
     public boolean deletePolicy(int policyId) throws PolicyManagementException {
-        boolean bool =policyManager.deletePolicy(policyId);
+        boolean bool = policyManager.deletePolicy(policyId);
         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;
     }