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

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/beans/DeviceCompliance.java

@@ -24,7 +24,7 @@ import org.wso2.carbon.policy.mgt.common.monitor.ComplianceData;
 @ApiModel(value = "DeviceCompliance", description = "Device's policy compliance status")
 public class DeviceCompliance {
 
-    private int deviceID;
+    private String deviceID;
     private ComplianceData complianceData;
     private Long code;
 
@@ -44,11 +44,11 @@ public class DeviceCompliance {
         this.code = code;
     }
 
-    public int getDeviceID() {
+    public String getDeviceID() {
         return deviceID;
     }
 
-    public void setDeviceID(int deviceID) {
+    public void setDeviceID(String deviceID) {
         this.deviceID = deviceID;
     }
 

components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java

@@ -357,7 +357,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
         }
 
         if (policy == null) {
-            deviceCompliance.setDeviceID(Integer.valueOf(id));
+            deviceCompliance.setDeviceID(id);
             deviceCompliance.setComplianceData(null);
             //deviceCompliance.setCode(0001l); //code 0001 means no compliance data related to the device
             return Response.status(Response.Status.OK).entity(deviceCompliance).build();
@@ -366,7 +366,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
                 policyManagementService = DeviceMgtAPIUtils.getPolicyManagementService();
                 complianceData = policyManagementService.getDeviceCompliance(
                         new DeviceIdentifier(id, type));
-                deviceCompliance.setDeviceID(Integer.valueOf(id));
+                deviceCompliance.setDeviceID(id);
                 deviceCompliance.setComplianceData(complianceData);
                 //deviceCompliance.setCode(0002l); //code 0002 means there are compliance data related to the device
                 return Response.status(Response.Status.OK).entity(deviceCompliance).build();