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

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

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

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

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

@@ -74,42 +74,54 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
     @GET
     @Override
     public Response getActivities(
-            @QueryParam("timestamp") long timestamp,
+            @QueryParam("since") String since,
             @QueryParam("offset") int offset,
             @QueryParam("limit") int limit,
             @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()) {
+            Date ifSinceDate;
+            SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z");
             try {
-                SimpleDateFormat format = new SimpleDateFormat("EEE, d MMM yyyy HH:mm:ss Z");
+                ifSinceDate = format.parse(ifModifiedSince);
-                Date sinceDate = format.parse(ifModifiedSince);
-                sinceTimestamp = sinceDate.getTime();
             } catch (ParseException e) {
                 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;
         DeviceManagementProviderService dmService;
         try {
             dmService = DeviceMgtAPIUtils.getDeviceManagementService();
-            activities = dmService.getActivitiesUpdatedAfter(timestamp);
+            activities = dmService.getActivitiesUpdatedAfter(sinceTimestamp/1000);
             if (activities == null || activities.size() == 0) {
-                if (isSinceModifiedIsSet) {
+                if (isIfModifiedSinceSet) {
                     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(
                         new ErrorResponse.ErrorResponseBuilder().setCode(404l).setMessage("No activities " +
                                 "found.").build());
             }
-
         } catch (OperationManagementException e) {
             String msg = "ErrorResponse occurred while fetching the activities updated after given time stamp.";
             log.error(msg, e);