refactored windowsdevicemanager

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/AndroidDeviceManager.java

@@ -75,8 +75,7 @@ public class AndroidDeviceManager implements DeviceManager {
 	@Override
 	public boolean saveConfiguration(TenantConfiguration tenantConfiguration)
 			throws DeviceManagementException {
-		boolean status = false;
+		boolean status;
-		Resource resource;
 		try {
 			if (log.isDebugEnabled()) {
 				log.debug("Persisting android configurations in Registry");
@@ -89,7 +88,7 @@ public class AndroidDeviceManager implements DeviceManager {
 			Marshaller marshaller = context.createMarshaller();
 			marshaller.marshal(tenantConfiguration, writer);
 
-			resource = MobileDeviceManagementUtil.getRegistry().newResource();
+			Resource resource = MobileDeviceManagementUtil.getConfigurationRegistry().newResource();
 			resource.setContent(writer.toString());
 			resource.setMediaType(MobilePluginConstants.MEDIA_TYPE_XML);
 			MobileDeviceManagementUtil.putRegistryResource(resourcePath, resource);
@@ -115,12 +114,14 @@ public class AndroidDeviceManager implements DeviceManager {
 					MobileDeviceManagementUtil.getPlatformConfigPath(DeviceManagementConstants.
 							                                                 MobileDeviceTypes.MOBILE_DEVICE_TYPE_ANDROID);
 			resource = MobileDeviceManagementUtil.getRegistryResource(androidRegPath);
+			if(resource != null){
 				JAXBContext context = JAXBContext.newInstance(TenantConfiguration.class);
 				Unmarshaller unmarshaller = context.createUnmarshaller();
 				return (TenantConfiguration) unmarshaller.unmarshal(
 						new StringReader(new String((byte[]) resource.getContent(), Charset
 								.forName(MobilePluginConstants.CHARSET_UTF8))));
-
+			}
+			return new TenantConfiguration();
 		} catch (MobileDeviceMgtPluginException e) {
 			throw new DeviceManagementException(
 					"Error occurred while retrieving the Registry instance : " + e.getMessage(), e);

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 {
+    public ComplianceData checkPolicyCompliance(DeviceIdentifier deviceIdentifier, Policy policy,
-		ComplianceData complianceData = new ComplianceData();
+                                                Object compliancePayload) throws PolicyComplianceException {
         if (log.isDebugEnabled()) {
             log.debug("Checking policy compliance status of device '" + deviceIdentifier.getId() + "'");
         }
-		if (o == null || policy == null) {
+        ComplianceData complianceData = new ComplianceData();
-			return null;
+        if (compliancePayload == null || policy == null) {
+            return complianceData;
         }
-		List<ComplianceFeature> complianceFeatures = (List<ComplianceFeature>) o;
+        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) {

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/impl/windows/WindowsDeviceManager.java

@@ -79,7 +79,7 @@ public class WindowsDeviceManager implements DeviceManager {
             Marshaller marshaller = context.createMarshaller();
             marshaller.marshal(tenantConfiguration, writer);
 
-            resource = MobileDeviceManagementUtil.getRegistry().newResource();
+            resource = MobileDeviceManagementUtil.getConfigurationRegistry().newResource();
             resource.setContent(writer.toString());
             resource.setMediaType(MobilePluginConstants.MEDIA_TYPE_XML);
             MobileDeviceManagementUtil.putRegistryResource(resourcePath, resource);

components/device-mgt/org.wso2.carbon.device.mgt.mobile.impl/src/main/java/org/wso2/carbon/device/mgt/mobile/util/MobileDeviceManagementUtil.java

@@ -198,7 +198,7 @@ public class MobileDeviceManagementUtil {
 		return feature;
 	}
 
-	public static Registry getRegistry() throws MobileDeviceMgtPluginException {
+	public static Registry getConfigurationRegistry() throws MobileDeviceMgtPluginException {
 		try {
 			int tenantId = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId();
 			return MobileDeviceManagementDataHolder.getInstance().getRegistryService()
@@ -213,8 +213,10 @@ public class MobileDeviceManagementUtil {
 
 	public static Resource getRegistryResource(String path) throws MobileDeviceMgtPluginException {
 		try {
-			return MobileDeviceManagementUtil.getRegistry().get(path);
+			if(MobileDeviceManagementUtil.getConfigurationRegistry().resourceExists(path)){
-
+				return MobileDeviceManagementUtil.getConfigurationRegistry().get(path);
+			}
+			return null;
 		} catch (RegistryException e) {
 			throw new MobileDeviceMgtPluginException("Error in retrieving registry resource : " +
 			                                         e.getMessage(), e);
@@ -224,11 +226,11 @@ public class MobileDeviceManagementUtil {
 	public static boolean putRegistryResource(String path,
 	                                          Resource resource)
 			throws MobileDeviceMgtPluginException {
-		boolean status = false;
+		boolean status;
 		try {
-			MobileDeviceManagementUtil.getRegistry().beginTransaction();
+			MobileDeviceManagementUtil.getConfigurationRegistry().beginTransaction();
-			MobileDeviceManagementUtil.getRegistry().put(path, resource);
+			MobileDeviceManagementUtil.getConfigurationRegistry().put(path, resource);
-			MobileDeviceManagementUtil.getRegistry().commitTransaction();
+			MobileDeviceManagementUtil.getConfigurationRegistry().commitTransaction();
 			status = true;
 		} catch (RegistryException e) {
 			throw new MobileDeviceMgtPluginException(
@@ -279,11 +281,11 @@ public class MobileDeviceManagementUtil {
 	public static boolean createRegistryCollection(String path)
 			throws MobileDeviceMgtPluginException {
 		try {
-			if (! MobileDeviceManagementUtil.getRegistry().resourceExists(path)) {
+			if (! MobileDeviceManagementUtil.getConfigurationRegistry().resourceExists(path)) {
-				Resource resource = MobileDeviceManagementUtil.getRegistry().newCollection();
+				Resource resource = MobileDeviceManagementUtil.getConfigurationRegistry().newCollection();
-				MobileDeviceManagementUtil.getRegistry().beginTransaction();
+				MobileDeviceManagementUtil.getConfigurationRegistry().beginTransaction();
-				MobileDeviceManagementUtil.getRegistry().put(path, resource);
+				MobileDeviceManagementUtil.getConfigurationRegistry().put(path, resource);
-				MobileDeviceManagementUtil.getRegistry().commitTransaction();
+				MobileDeviceManagementUtil.getConfigurationRegistry().commitTransaction();
 			}
 			return true;
 		} catch (MobileDeviceMgtPluginException e) {

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>