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

Merge pull request #297 from madhawap/rest-api-improvements

Browse Source 
add changes to 'since' QueryParam and 'if-modified-since' HeaderParam
This commit is contained in:
inoshperera 2016-06-14 18:49:01 +05:30 committed by GitHub
commit 96eb71314b
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -150,11 +150,11 @@ public interface ActivityInfoProviderService {
@Permission(scope = "activity-view", permissions = {"/permission/admin/device-mgt/admin/activities/view"}) @Permission(scope = "activity-view", permissions = {"/permission/admin/device-mgt/admin/activities/view"})
Response getActivities( Response getActivities(
@ApiParam( @ApiParam(
name = "timestamp", name = "since",
value = "Validates if the requested variant has not been modified since the time specified, this " + value = "Validates if the requested variant has not been modified since the time specified, this " +
"should be provided in unix format in seconds.", "should be provided in unix format in seconds.",
required = false) required = false)
@QueryParam("timestamp") long timestamp, @QueryParam("since") String since,
@ApiParam( @ApiParam(
name = "offset", name = "offset",
value = "Starting point within the complete list of items qualified.", value = "Starting point within the complete list of items qualified.",

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

@ -74,42 +74,54 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
@GET @GET
@Override @Override
public Response getActivities( public Response getActivities(
@QueryParam("timestamp") long timestamp, @QueryParam("since") String since,
@QueryParam("offset") int offset, @QueryParam("offset") int offset,
@QueryParam("limit") int limit, @QueryParam("limit") int limit,
@HeaderParam("If-Modified-Since") String ifModifiedSince) { @HeaderParam("If-Modified-Since") String ifModifiedSince) {
long sinceTimestamp = 0; long ifModifiedSinceTimestamp = 0;
boolean isSinceModifiedIsSet = false; long sinceTimestamp =0;
boolean isIfModifiedSinceSet = false;
if (ifModifiedSince != null && !ifModifiedSince.isEmpty()) { if (ifModifiedSince != null && !ifModifiedSince.isEmpty()) {
try { Date ifSinceDate;
SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z"); SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z");
Date sinceDate = format.parse(ifModifiedSince); try {
sinceTimestamp = sinceDate.getTime(); ifSinceDate = format.parse(ifModifiedSince);
} catch (ParseException e) { } catch (ParseException e) {
throw new InputValidationException(new ErrorResponse.ErrorResponseBuilder().setCode(400l) throw new InputValidationException(new ErrorResponse.ErrorResponseBuilder().setCode(400l)
.setMessage("Invalid date " + "string is provided in 'If-Modified-Since' header").build()); .setMessage("Invalid date string is provided in 'If-Modified-Since' header").build());
} }
ifModifiedSinceTimestamp = ifSinceDate.getTime();
} }
if (sinceTimestamp > timestamp) { if (since != null && !since.isEmpty()){
timestamp = sinceTimestamp; Date sinceDate;
isSinceModifiedIsSet = true; SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z");
try{
sinceDate = format.parse(since);
}catch (ParseException e){
throw new InputValidationException(new ErrorResponse.ErrorResponseBuilder().setCode(400l)
.setMessage("Invalid date string is provided in 'since' filter").build());
}
sinceTimestamp = sinceDate.getTime();
}
if (ifModifiedSinceTimestamp >= sinceTimestamp) {
sinceTimestamp = ifModifiedSinceTimestamp;
isIfModifiedSinceSet = true;
} }
List<Activity> activities; List<Activity> activities;
DeviceManagementProviderService dmService; DeviceManagementProviderService dmService;
try { try {
dmService = DeviceMgtAPIUtils.getDeviceManagementService(); dmService = DeviceMgtAPIUtils.getDeviceManagementService();
activities = dmService.getActivitiesUpdatedAfter(timestamp); activities = dmService.getActivitiesUpdatedAfter(sinceTimestamp/1000);
if (activities == null || activities.size() == 0) { if (activities == null || activities.size() == 0) {
if (isSinceModifiedIsSet) { if (isIfModifiedSinceSet) {
return Response.status(Response.Status.NOT_MODIFIED).entity("No activities " + return Response.status(Response.Status.NOT_MODIFIED).entity("No activities " +
"after the timestamp provided in 'If-Modified-Since' header").build(); "after the time provided in 'If-Modified-Since' header").build();
} }
throw new NotFoundException( throw new NotFoundException(
new ErrorResponse.ErrorResponseBuilder().setCode(404l).setMessage("No activities " + new ErrorResponse.ErrorResponseBuilder().setCode(404l).setMessage("No activities " +
"found.").build()); "found.").build());
} }
} catch (OperationManagementException e) { } catch (OperationManagementException e) {
String msg = "ErrorResponse occurred while fetching the activities updated after given time stamp."; String msg = "ErrorResponse occurred while fetching the activities updated after given time stamp.";
log.error(msg, e); log.error(msg, e);