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

Provide response based on headers

Browse Source
This commit is contained in:
charitha 2020-11-28 09:26:51 +05:30
parent 10d114ba1e
commit d75f48166e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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