community
/
device-mgt-core
12
0
Fork 47
Code Issues Pull Requests 26 Packages Projects Releases Wiki Activity

add changes to 'since' QueryParam and 'if-modified-since' HeaderParam

Browse Source
merge-requests/7/head
madhawap 9 years ago
parent a827e6289a
commit b3f95d19c1
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File

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

@ -81,7 +81,9 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
long ifModifiedSinceTimestamp = 0; long ifModifiedSinceTimestamp = 0;
long sinceTimestamp =0; long sinceTimestamp =0;
long timestamp =0;
boolean isIfModifiedSinceSet = false; boolean isIfModifiedSinceSet = false;
boolean isSinceSet = false;
if (ifModifiedSince != null && !ifModifiedSince.isEmpty()) { if (ifModifiedSince != null && !ifModifiedSince.isEmpty()) {
Date ifSinceDate; 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");
@ -92,8 +94,9 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
.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(); ifModifiedSinceTimestamp = ifSinceDate.getTime();
} isIfModifiedSinceSet = true;
if (since != null && !since.isEmpty()){ timestamp = ifModifiedSinceTimestamp/1000;
} else if (since != null && !since.isEmpty()){
Date sinceDate; Date sinceDate;
SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z"); SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z");
try{ try{
@ -103,20 +106,21 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
.setMessage("Invalid date string is provided in 'since' filter").build()); .setMessage("Invalid date string is provided in 'since' filter").build());
} }
sinceTimestamp = sinceDate.getTime(); sinceTimestamp = sinceDate.getTime();
} isSinceSet = true;
if (ifModifiedSinceTimestamp >= sinceTimestamp) { timestamp = sinceTimestamp/1000;
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(sinceTimestamp/1000); activities = dmService.getActivitiesUpdatedAfter(timestamp);
if (activities == null || activities.size() == 0) { if (activities == null || activities.size() == 0) {
if (isIfModifiedSinceSet) { if (isIfModifiedSinceSet) {
return Response.status(Response.Status.NOT_MODIFIED).entity("No activities " + return Response.status(Response.Status.NOT_MODIFIED).entity("No activities " +
"after the time provided in 'If-Modified-Since' header").build(); "after the time provided in 'If-Modified-Since' header").build();
} else if(isSinceSet){
return Response.status(Response.Status.NOT_MODIFIED).entity("No activities " +
"after the time provided in 'since' filter").build();
} }
throw new NotFoundException( throw new NotFoundException(
new ErrorResponse.ErrorResponseBuilder().setCode(404l).setMessage("No activities " + new ErrorResponse.ErrorResponseBuilder().setCode(404l).setMessage("No activities " +

Write Preview
Loading…
Cancel
Save