Merge pull request #8 from milanperera/master

Implemented policy compliance checking function for Android plugin

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/pom.xml

@@ -76,7 +76,8 @@
                             org.wso2.carbon.registry.core.service,
                             org.wso2.carbon.registry.core.session,
                             org.wso2.carbon.registry.api,
-                            org.wso2.carbon.device.mgt.extensions.license.mgt.registry
+                            org.wso2.carbon.device.mgt.extensions.license.mgt.registry,
+                            com.google.gson.*
                         </Import-Package>
                         <Export-Package>
                             !org.wso2.carbon.device.mgt.mobile.internal,
@@ -165,5 +166,9 @@
             <artifactId>h2-database-engine</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
     </dependencies>
 </project>

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/android/AndroidPolicyMonitoringService.java

@@ -19,6 +19,10 @@
 
 package org.wso2.carbon.device.mgt.mobile.impl.android;
 
+import com.google.gson.Gson;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParser;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.device.mgt.common.Device;
@@ -43,15 +47,28 @@ public class AndroidPolicyMonitoringService implements PolicyMonitoringService {
     }
 
     @Override
-	public ComplianceData checkPolicyCompliance(DeviceIdentifier deviceIdentifier, Policy policy, Object o) throws PolicyComplianceException {
-		ComplianceData complianceData = new ComplianceData();
+    public ComplianceData checkPolicyCompliance(DeviceIdentifier deviceIdentifier, Policy policy,
+                                                Object compliancePayload) throws PolicyComplianceException {
         if (log.isDebugEnabled()) {
             log.debug("Checking policy compliance status of device '" + deviceIdentifier.getId() + "'");
         }
-		if (o == null || policy == null) {
+        if (compliancePayload == null || policy == null) {
             return null;
         }
-		List<ComplianceFeature> complianceFeatures = (List<ComplianceFeature>) o;
+        ComplianceData complianceData = new ComplianceData();
+        List<ComplianceFeature> complianceFeatures = new ArrayList<ComplianceFeature>();
+
+        // Parsing json string to get compliance features.
+        JsonElement jsonElement = new JsonParser().parse((String) compliancePayload);
+        JsonArray jsonArray = jsonElement.getAsJsonArray();
+        Gson gson = new Gson();
+        ComplianceFeature complianceFeature;
+
+        for (int i = 0; i < jsonArray.size(); i++) {
+            complianceFeature = gson.fromJson(jsonArray.get(i), ComplianceFeature.class);
+            complianceFeatures.add(complianceFeature);
+        }
+
         complianceData.setComplianceFeatures(complianceFeatures);
 
         for (ComplianceFeature cf : complianceFeatures) {

features/device-mgt/org.wso2.carbon.device.mgt.mobile.feature/pom.xml

@@ -58,6 +58,10 @@
             <artifactId>org.wso2.carbon.device.mgt.extensions.feature</artifactId>
             <type>zip</type>
         </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

pom.xml

@@ -511,6 +511,11 @@
                 <artifactId>axis2</artifactId>
                 <version>${axis2.orbit.version}</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.code.gson</groupId>
+                <artifactId>gson</artifactId>
+                <version>${google.gson.version}</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 
@@ -577,6 +582,7 @@
         <bouncycastle.version>1.49</bouncycastle.version>
         <apache.wss4j.version>2.0.0</apache.wss4j.version>
         <codehaus.plexus.version>3.0.21</codehaus.plexus.version>
+        <google.gson.version>2.2.4</google.gson.version>
 
     </properties>