|
|
@ -328,7 +328,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
|
|
|
if (policy == null) {
|
|
|
|
if (policy == null) {
|
|
|
|
deviceCompliance.setDeviceID(Integer.valueOf(id));
|
|
|
|
deviceCompliance.setDeviceID(Integer.valueOf(id));
|
|
|
|
deviceCompliance.setComplianceData(null);
|
|
|
|
deviceCompliance.setComplianceData(null);
|
|
|
|
deviceCompliance.setCode(0001l);
|
|
|
|
//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();
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
try {
|
|
|
|
try {
|
|
|
@ -337,7 +337,7 @@ public class DeviceManagementServiceImpl implements DeviceManagementService {
|
|
|
|
new DeviceIdentifier(id, type));
|
|
|
|
new DeviceIdentifier(id, type));
|
|
|
|
deviceCompliance.setDeviceID(Integer.valueOf(id));
|
|
|
|
deviceCompliance.setDeviceID(Integer.valueOf(id));
|
|
|
|
deviceCompliance.setComplianceData(complianceData);
|
|
|
|
deviceCompliance.setComplianceData(complianceData);
|
|
|
|
deviceCompliance.setCode(0002l);
|
|
|
|
//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();
|
|
|
|
} catch (PolicyComplianceException e) {
|
|
|
|
} catch (PolicyComplianceException e) {
|
|
|
|
String error = "Error occurred while getting the compliance data.";
|
|
|
|
String error = "Error occurred while getting the compliance data.";
|
|
|
|