|
|
@ -321,7 +321,7 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
|
|
|
|
new ErrorResponse.ErrorResponseBuilder().setMessage(message).build()).build();
|
|
|
|
new ErrorResponse.ErrorResponseBuilder().setMessage(message).build()).build();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
LifecycleStateDevice updatedInfo = DeviceMgtAPIUtils.getDeviceStateManagementService()
|
|
|
|
LifecycleStateDevice updatedInfo = DeviceMgtAPIUtils.getDeviceStateManagementService()
|
|
|
|
.changeDeviceStatus(device, nextStatus);
|
|
|
|
.changeDeviceStatus(device.getEnrolmentInfo(), nextStatus);
|
|
|
|
return Response.status(Response.Status.OK).entity(updatedInfo).build();
|
|
|
|
return Response.status(Response.Status.OK).entity(updatedInfo).build();
|
|
|
|
} catch (InvalidStatusException e) {
|
|
|
|
} catch (InvalidStatusException e) {
|
|
|
|
String msg = "Error occured while changing status: Invalid status or invalid status change";
|
|
|
|
String msg = "Error occured while changing status: Invalid status or invalid status change";
|
|
|
@ -373,8 +373,8 @@ public class DeviceManagementAdminServiceImpl implements DeviceManagementAdminSe
|
|
|
|
return Response.status(Response.Status.NOT_FOUND).build();
|
|
|
|
return Response.status(Response.Status.NOT_FOUND).build();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
LifecycleStateDeviceList states = new LifecycleStateDeviceList();
|
|
|
|
LifecycleStateDeviceList states = new LifecycleStateDeviceList();
|
|
|
|
result = DeviceMgtAPIUtils.getDeviceStateManagementService()
|
|
|
|
result = (PaginationResult) DeviceMgtAPIUtils.getDeviceStateManagementService()
|
|
|
|
.getDeviceLifecycleHistory(request, device);
|
|
|
|
.getDeviceLifecycleHistory(device);
|
|
|
|
states.setLifecycleStates((List<LifecycleStateDevice>) result.getData());
|
|
|
|
states.setLifecycleStates((List<LifecycleStateDevice>) result.getData());
|
|
|
|
states.setCount(result.getRecordsTotal());
|
|
|
|
states.setCount(result.getRecordsTotal());
|
|
|
|
return Response.status(Response.Status.OK).entity(states).build();
|
|
|
|
return Response.status(Response.Status.OK).entity(states).build();
|
|
|
|