Merge branch 'master' of github.com:wso2/carbon-device-mgt

components/policy-mgt/org.wso2.carbon.policy.mgt.core/src/test/resources/sql/CreateH2TestDB.sql

@@ -238,5 +238,28 @@ CREATE  TABLE IF NOT EXISTS DM_USER_POLICY (
     ON DELETE NO ACTION
     ON UPDATE NO ACTION)
  ;
+ 
+ 
+ CREATE  TABLE IF NOT EXISTS DM_DEVICE_POLICY_APPLIED (
+  ID INT NOT NULL AUTO_INCREMENT ,
+  DEVICE_ID INT NOT NULL ,
+  POLICY_ID INT NOT NULL ,
+  POLICY_CONTENT BLOB NULL ,
+  APPLIED TINYINT(1) NULL ,
+  CREATED_TIME TIMESTAMP NULL ,
+  UPDATED_TIME TIMESTAMP NULL ,
+  APPLIED_TIME TIMESTAMP NULL ,
+  PRIMARY KEY (ID) ,
+  CONSTRAINT FK_DM_POLICY_DEVCIE_APPLIED
+    FOREIGN KEY (DEVICE_ID )
+    REFERENCES DM_DEVICE (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION,
+  CONSTRAINT FK_DM_POLICY_DEVICE_APPLIED_POLICY
+    FOREIGN KEY (POLICY_ID )
+    REFERENCES DM_POLICY (ID )
+    ON DELETE NO ACTION
+    ON UPDATE NO ACTION)
+;
 
 

components/policy-mgt/org.wso2.carbon.simple.policy.decision.point/src/main/java/org/wso2/carbon/simple/policy/decision/point/SimpleEvaluationImpl.java

@@ -57,8 +57,9 @@ public class SimpleEvaluationImpl implements SimpleEvaluation {
                 sortPolicies();
                 policy = policyList.get(0);
 
-                policyAdministratorPoint = policyManagerService.getPAP();
+                //TODO : UNCOMMENT THE FOLLOWING CASE
-                policyAdministratorPoint.setPolicyUsed(deviceIdentifier, policy);
+//                policyAdministratorPoint = policyManagerService.getPAP();
+//                policyAdministratorPoint.setPolicyUsed(deviceIdentifier, policy);
 
             }
 
@@ -76,7 +77,7 @@ public class SimpleEvaluationImpl implements SimpleEvaluation {
         Collections.sort(policyList);
     }
 
-    private PolicyManagerService getPolicyManagerService(){
+    private PolicyManagerService getPolicyManagerService() {
-       return PolicyDecisionPointDataHolder.getInstance().getPolicyManagerService();
+        return PolicyDecisionPointDataHolder.getInstance().getPolicyManagerService();
     }
 }