Provide response based on headers

revert-70ac1926
Charitha Goonetilleke 4 years ago
parent 10d114ba1e
commit d75f48166e

@ -305,16 +305,18 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
log.debug("Activity request: " + new Gson().toJson(activityPaginationRequest)); log.debug("Activity request: " + new Gson().toJson(activityPaginationRequest));
} }
int count = dmService.getActivitiesCount(activityPaginationRequest); int count = dmService.getActivitiesCount(activityPaginationRequest);
if (count > 0) {
activityList.setList(dmService.getActivities(activityPaginationRequest));
}
activityList.setCount(count);
if (log.isDebugEnabled()) { if (log.isDebugEnabled()) {
log.debug("Filtered Activity count: " + count); log.debug("Filtered Activity count: " + count);
}
if (count > 0) { if (count > 0) {
activityList.setList(dmService.getActivities(activityPaginationRequest));
if (log.isDebugEnabled()) {
log.debug("Fetched Activity count: " + activityList.getList().size()); log.debug("Fetched Activity count: " + activityList.getList().size());
} }
} else if (ifModifiedSince != null && !ifModifiedSince.isEmpty()) {
return Response.notModified().build();
} }
activityList.setCount(count);
return Response.ok().entity(activityList).build(); return Response.ok().entity(activityList).build();
} catch (OperationManagementException e) { } catch (OperationManagementException e) {
String msg String msg

Loading…
Cancel
Save