community/device-mgt-core
1
0
Fork 0
mirror of https://repository.entgra.net/community/device-mgt-core.git synced 2025-10-06 02:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixing issues of GET /compliance-data API

Browse Source
This commit is contained in:
dilanua 2016-07-08 18:01:10 +05:30
parent 58666bc4b0
commit c61ef1c98e
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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