Merge pull request #1145 from Kamidu/master

Fixing https://github.com/wso2/product-iots/issues/1565

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml

@@ -45,6 +45,7 @@
         <minRetriesToMarkInactive>20</minRetriesToMarkInactive>
         <!--<PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>-->
         <PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
+        <CacheEnable>true</CacheEnable>
     </PolicyConfiguration>
     <!--This specifies whether to enable the DeviceStatus Task in this node.-->
     <DeviceStatusTaskConfig>

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

@@ -34,6 +34,7 @@ public class PolicyConfiguration {
     private int minRetriesToMarkInactive;
     private List<String> platforms;
     private String policyEvaluationPoint;
+    private boolean cacheEnable;
 
     @XmlElement(name = "MonitoringClass", required = true)
     public String getMonitoringClass() {
@@ -108,4 +109,13 @@ public class PolicyConfiguration {
         this.policyEvaluationPoint = policyEvaluationPointName;
     }
 
+    @XmlElement(name = "CacheEnable", required = true)
+    public boolean getCacheEnable() {
+        return cacheEnable;
+    }
+
+    public void setCacheEnable(boolean cacheEnable) {
+        this.cacheEnable = cacheEnable;
+    }
+
 }

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml

@@ -57,6 +57,7 @@
         <!--Simple ->  Simple policy evaluation point-->
         <!--Merged ->  Merged policy evaluation point -->
         <PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
+        <CacheEnable>true</CacheEnable>
     </PolicyConfiguration>
     <!-- Default Page size configuration for paginated DM APIs-->
     <PaginationConfiguration>

components/device-mgt/org.wso2.carbon.device.mgt.core/src/test/resources/config/operation/cdm-config.xml

@@ -57,6 +57,7 @@
         <!--Simple ->  Simple policy evaluation point-->
         <!--Merged ->  Merged policy evaluation point -->
         <PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
+        <CacheEnable>true</CacheEnable>
     </PolicyConfiguration>
     <!-- Default Page size configuration for paginated DM APIs-->
     <PaginationConfiguration>

components/identity-extensions/org.wso2.carbon.identity.jwt.client.extension/src/test/resources/carbon-home/repository/conf/cdm-config.xml

@@ -62,6 +62,7 @@
         <!--Simple ->  Simple policy evaluation point-->
         <!--Merged ->  Merged policy evaluation point -->
         <PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
+        <CacheEnable>true</CacheEnable>
     </PolicyConfiguration>
     <!-- Default Page size configuration for paginated DM APIs-->
     <PaginationConfiguration>

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

@@ -23,6 +23,8 @@ 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.EnrolmentInfo;
+import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import org.wso2.carbon.device.mgt.core.config.policy.PolicyConfiguration;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
 import org.wso2.carbon.ntask.core.Task;
 import org.wso2.carbon.policy.mgt.common.PolicyManagementException;
@@ -39,6 +41,7 @@ import java.util.Map;
 public class DelegationTask implements Task {
 
     private static final Log log = LogFactory.getLog(DelegationTask.class);
+    private PolicyConfiguration policyConfiguration = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getPolicyConfiguration();
 
     @Override
     public void setProperties(Map<String, String> map) {
@@ -57,9 +60,9 @@ public class DelegationTask implements Task {
             PolicyManager policyManager = new PolicyManagerImpl();
             UpdatedPolicyDeviceListBean updatedPolicyDeviceList = policyManager.applyChangesMadeToPolicies();
             List<String> deviceTypes = updatedPolicyDeviceList.getChangedDeviceTypes();
-
+            if (policyConfiguration.getCacheEnable()) {
                 PolicyCacheManagerImpl.getInstance().rePopulateCache();
-
+            }
             if (log.isDebugEnabled()) {
                 log.debug("Number of device types which policies are changed .......... : " + deviceTypes.size());
             }

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

@@ -24,6 +24,8 @@ import org.wso2.carbon.context.PrivilegedCarbonContext;
 import org.wso2.carbon.device.mgt.common.DeviceIdentifier;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
+import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import org.wso2.carbon.device.mgt.core.config.policy.PolicyConfiguration;
 import org.wso2.carbon.ntask.common.TaskException;
 import org.wso2.carbon.ntask.core.TaskInfo;
 import org.wso2.carbon.ntask.core.TaskManager;
@@ -53,6 +55,7 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
     private ProfileManager profileManager;
     private FeatureManager featureManager;
     private PolicyCacheManager cacheManager;
+    private PolicyConfiguration policyConfiguration;
     // private PolicyEnforcementDelegator delegator;
 
     public PolicyAdministratorPointImpl() {
@@ -60,6 +63,7 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
         this.profileManager = new ProfileManagerImpl();
         this.featureManager = new FeatureManagerImpl();
         this.cacheManager = PolicyCacheManagerImpl.getInstance();
+        this.policyConfiguration = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getPolicyConfiguration();
         // this.delegator = new PolicyEnforcementDelegatorImpl();
     }
 
@@ -71,7 +75,9 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
 //        } catch (PolicyDelegationException e) {
 //            throw new PolicyManagementException("Error occurred while delegating policy operation to the devices", e);
 //        }
+        if (policyConfiguration.getCacheEnable()) {
             PolicyCacheManagerImpl.getInstance().rePopulateCache();
+        }
         return resultantPolicy;
     }
 
@@ -83,42 +89,54 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
 //        } catch (PolicyDelegationException e) {
 //            throw new PolicyManagementException("Error occurred while delegating policy operation to the devices", e);
 //        }
+        if (policyConfiguration.getCacheEnable()) {
             PolicyCacheManagerImpl.getInstance().rePopulateCache();
+        }
         return resultantPolicy;
     }
 
     @Override
     public boolean updatePolicyPriorities(List<Policy> policies) throws PolicyManagementException {
         boolean bool = policyManager.updatePolicyPriorities(policies);
+        if (policyConfiguration.getCacheEnable()) {
             PolicyCacheManagerImpl.getInstance().rePopulateCache();
+        }
         return bool;
     }
 
     @Override
     public void activatePolicy(int policyId) throws PolicyManagementException {
         policyManager.activatePolicy(policyId);
+        if (policyConfiguration.getCacheEnable()) {
             PolicyCacheManagerImpl.getInstance().rePopulateCache();
         }
+    }
 
     @Override
     public void inactivatePolicy(int policyId) throws PolicyManagementException {
         policyManager.inactivatePolicy(policyId);
+        if (policyConfiguration.getCacheEnable()) {
             PolicyCacheManagerImpl.getInstance().rePopulateCache();
         }
+    }
 
     @Override
     public boolean deletePolicy(Policy policy) throws PolicyManagementException {
         boolean bool = policyManager.deletePolicy(policy);
+        if (policyConfiguration.getCacheEnable()) {
             PolicyCacheManager policyCacheManager = PolicyCacheManagerImpl.getInstance();
             policyCacheManager.rePopulateCache();
+        }
         return bool;
     }
 
     @Override
     public boolean deletePolicy(int policyId) throws PolicyManagementException {
         boolean bool = policyManager.deletePolicy(policyId);
+        if (policyConfiguration.getCacheEnable()) {
             PolicyCacheManager policyCacheManager = PolicyCacheManagerImpl.getInstance();
             policyCacheManager.rePopulateCache();
+        }
         return bool;
     }
 
@@ -222,25 +240,37 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
     public Policy addPolicyToDevice(List<DeviceIdentifier> deviceIdentifierList, Policy policy) throws
             PolicyManagementException {
         policy = policyManager.addPolicyToDevice(deviceIdentifierList, policy);
+        if (policyConfiguration.getCacheEnable()) {
             PolicyCacheManagerImpl.getInstance().rePopulateCache();
+        }
         return policy;
     }
 
     @Override
     public Policy addPolicyToRole(List<String> roleNames, Policy policy) throws PolicyManagementException {
         policy = policyManager.addPolicyToRole(roleNames, policy);
+        if (policyConfiguration.getCacheEnable()) {
             PolicyCacheManagerImpl.getInstance().rePopulateCache();
+        }
         return policy;
     }
 
     @Override
     public List<Policy> getPolicies() throws PolicyManagementException {
+        if (policyConfiguration.getCacheEnable()) {
             return PolicyCacheManagerImpl.getInstance().getAllPolicies();
+        } else {
+            return policyManager.getPolicies();
+        }
     }
 
     @Override
     public Policy getPolicy(int policyId) throws PolicyManagementException {
+        if (policyConfiguration.getCacheEnable()) {
             return PolicyCacheManagerImpl.getInstance().getPolicy(policyId);
+        } else {
+            return policyManager.getPolicy(policyId);
+        }
     }
 
     @Override
@@ -340,7 +370,11 @@ public class PolicyAdministratorPointImpl implements PolicyAdministratorPoint {
 
     @Override
     public int getPolicyCount() throws PolicyManagementException {
+        if (policyConfiguration.getCacheEnable()) {
             return PolicyCacheManagerImpl.getInstance().getAllPolicies().size();
+        } else {
+            return policyManager.getPolicyCount();
+        }
     }
 
 }

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

@@ -33,6 +33,8 @@ import org.wso2.carbon.device.mgt.common.policy.mgt.Policy;
 import org.wso2.carbon.device.mgt.common.policy.mgt.PolicyCriterion;
 import org.wso2.carbon.device.mgt.common.policy.mgt.Profile;
 import org.wso2.carbon.device.mgt.common.policy.mgt.ProfileFeature;
+import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
+import org.wso2.carbon.device.mgt.core.config.policy.PolicyConfiguration;
 import org.wso2.carbon.device.mgt.core.operation.mgt.CommandOperation;
 import org.wso2.carbon.device.mgt.core.operation.mgt.OperationMgtConstants;
 import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
@@ -42,9 +44,6 @@ import org.wso2.carbon.device.mgt.core.service.GroupManagementProviderServiceImp
 import org.wso2.carbon.policy.mgt.common.*;
 import org.wso2.carbon.policy.mgt.core.cache.impl.PolicyCacheManagerImpl;
 import org.wso2.carbon.policy.mgt.core.dao.*;
-import org.wso2.carbon.policy.mgt.core.enforcement.PolicyDelegationException;
-import org.wso2.carbon.policy.mgt.core.enforcement.PolicyEnforcementDelegator;
-import org.wso2.carbon.policy.mgt.core.enforcement.PolicyEnforcementDelegatorImpl;
 import org.wso2.carbon.policy.mgt.core.internal.PolicyManagementDataHolder;
 import org.wso2.carbon.policy.mgt.core.mgt.PolicyManager;
 import org.wso2.carbon.policy.mgt.core.mgt.ProfileManager;
@@ -61,12 +60,14 @@ public class PolicyManagerImpl implements PolicyManager {
     private ProfileDAO profileDAO;
     private FeatureDAO featureDAO;
     private ProfileManager profileManager;
+    private PolicyConfiguration policyConfiguration;
     private static Log log = LogFactory.getLog(PolicyManagerImpl.class);
 
     public PolicyManagerImpl() {
         this.policyDAO = PolicyManagementDAOFactory.getPolicyDAO();
         this.profileDAO = PolicyManagementDAOFactory.getProfileDAO();
         this.featureDAO = PolicyManagementDAOFactory.getFeatureDAO();
+        this.policyConfiguration = DeviceConfigurationManager.getInstance().getDeviceManagementConfig().getPolicyConfiguration();
         this.profileManager = new ProfileManagerImpl();
     }
 
@@ -272,7 +273,12 @@ public class PolicyManagerImpl implements PolicyManager {
         boolean bool;
         try {
 //            List<Policy> existingPolicies = this.getPolicies();
-            List<Policy> existingPolicies = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+            List<Policy> existingPolicies; 
+            if (policyConfiguration.getCacheEnable()) {
+                existingPolicies = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+            } else {
+                existingPolicies = this.getPolicies();
+            }
             PolicyManagementDAOFactory.beginTransaction();
             bool = policyDAO.updatePolicyPriorities(policies);
 
@@ -683,7 +689,12 @@ public class PolicyManagerImpl implements PolicyManager {
         }
 
 //        List<Policy> tempPolicyList = this.getPolicies();
-        List<Policy> tempPolicyList = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+        List<Policy> tempPolicyList;
+        if (policyConfiguration.getCacheEnable()) {
+            tempPolicyList = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+        } else {
+            tempPolicyList = this.getPolicies();
+        }
 
         for (Policy policy : tempPolicyList) {
             for (Integer i : policyIdList) {
@@ -703,7 +714,12 @@ public class PolicyManagerImpl implements PolicyManager {
 //        try {
         // List<Profile> profileList = profileManager.getProfilesOfDeviceType(deviceTypeName);
 //            List<Policy> allPolicies = this.getPolicies();
-        List<Policy> allPolicies = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+        List<Policy> allPolicies;
+        if (policyConfiguration.getCacheEnable()) {
+            allPolicies = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+        } else {
+            allPolicies = this.getPolicies();
+        }
 
         for (Policy policy : allPolicies) {
             if (policy.getProfile().getDeviceType().equalsIgnoreCase(deviceTypeName)) {
@@ -745,7 +761,12 @@ public class PolicyManagerImpl implements PolicyManager {
         }
 
 //        List<Policy> tempPolicyList = this.getPolicies();
-        List<Policy> tempPolicyList = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+        List<Policy> tempPolicyList;
+        if (policyConfiguration.getCacheEnable()) {
+            tempPolicyList = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+        } else {
+            tempPolicyList = this.getPolicies();
+        }
 
         for (Policy policy : tempPolicyList) {
             for (Integer i : policyIdList) {
@@ -775,7 +796,12 @@ public class PolicyManagerImpl implements PolicyManager {
             PolicyManagementDAOFactory.closeConnection();
         }
 //        List<Policy> tempPolicyList = this.getPolicies();
-        List<Policy> tempPolicyList = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+        List<Policy> tempPolicyList;
+        if (policyConfiguration.getCacheEnable()) {
+            tempPolicyList = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+        } else {
+            tempPolicyList = this.getPolicies();
+        }
 
         for (Policy policy : tempPolicyList) {
             for (Integer i : policyIdList) {
@@ -868,8 +894,12 @@ public class PolicyManagerImpl implements PolicyManager {
 //            List<Policy> inactivePolicies = new ArrayList<>();
 
 //            List<Policy> allPolicies = this.getPolicies();
-            List<Policy> allPolicies = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+            List<Policy> allPolicies;
-
+            if (policyConfiguration.getCacheEnable()) {
+                allPolicies = PolicyCacheManagerImpl.getInstance().getAllPolicies();
+            } else {
+                allPolicies = this.getPolicies();
+            }
             for (Policy policy : allPolicies) {
                 if (policy.isUpdated()) {
                     updatedPolicies.add(policy);

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/carbon-home/repository/conf/cdm-config.xml

@@ -45,6 +45,7 @@
         <minRetriesToMarkInactive>20</minRetriesToMarkInactive>
         <!--<PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>-->
         <PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
+        <CacheEnable>true</CacheEnable>
     </PolicyConfiguration>
     <!--This specifies whether to enable the DeviceStatus Task in this node.-->
     <DeviceStatusTaskConfig>

components/webapp-authenticator-framework/org.wso2.carbon.webapp.authenticator.framework/src/test/resources/carbon-home/repository/conf/cdm-config.xml

@@ -57,6 +57,7 @@
         <!--Simple ->  Simple policy evaluation point-->
         <!--Merged ->  Merged policy evaluation point -->
         <PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
+        <CacheEnable>true</CacheEnable>
     </PolicyConfiguration>
     <!-- Default Page size configuration for paginated DM APIs-->
     <PaginationConfiguration>

features/device-mgt/org.wso2.carbon.device.mgt.basics.feature/src/main/resources/conf/cdm-config.xml

@@ -62,6 +62,7 @@
         <!--Simple ->  Simple policy evaluation point-->
         <!--Merged ->  Merged policy evaluation point -->
         <PolicyEvaluationPoint>Simple</PolicyEvaluationPoint>
+        <CacheEnable>true</CacheEnable>
     </PolicyConfiguration>
     <!-- Default Page size configuration for paginated DM APIs-->
     <PaginationConfiguration>