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

Code cleanup

Browse Source
merge-requests/7/head
prabathabey 9 years ago
parent 77d4c167af
commit 54f9d02ebb
3 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -55,7 +55,7 @@ public interface ActivityInfoProviderService {
code = 200, code = 200,
message = "OK. \n Activity details are successfully fetched", message = "OK. \n Activity details are successfully fetched",
response = Activity.class, response = Activity.class,
responseHeaders = { responseHeaders = {
@ResponseHeader( @ResponseHeader(
name = "Content-Type", name = "Content-Type",
description = "The content type of the body"), description = "The content type of the body"),

2
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/DeviceManagementService.java
Unescape View File

@ -504,7 +504,7 @@ public interface DeviceManagementService {
value = { value = {
@ApiResponse( @ApiResponse(
code = 200, code = 200,
message = "OK. \n Device has successfully been enrolled. Location header " + message = "OK. \n Device list searched for has successfully been retrieved. Location header " +
"contains URL of newly enrolled device", "contains URL of newly enrolled device",
response = DeviceWrapper.class, response = DeviceWrapper.class,
responseContainer = "List", responseContainer = "List",

12
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

@ -26,17 +26,16 @@ import org.wso2.carbon.device.mgt.core.service.DeviceManagementProviderService;
import org.wso2.carbon.device.mgt.jaxrs.service.api.ActivityInfoProviderService; import org.wso2.carbon.device.mgt.jaxrs.service.api.ActivityInfoProviderService;
import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils; import org.wso2.carbon.device.mgt.jaxrs.util.DeviceMgtAPIUtils;
import javax.ws.rs.HeaderParam; import javax.ws.rs.*;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import java.util.List; import java.util.List;
public class ActivityProviderServiceImpl implements ActivityInfoProviderService { public class ActivityProviderServiceImpl implements ActivityInfoProviderService {
private static final Log log = LogFactory.getLog(ActivityProviderServiceImpl.class); private static final Log log = LogFactory.getLog(ActivityProviderServiceImpl.class);
@GET
@Override @Override
@Path("/{id}") @Path("/{id}")
public Response getActivity( public Response getActivity(
@ -55,10 +54,11 @@ public class ActivityProviderServiceImpl implements ActivityInfoProviderService
return Response.status(Response.Status.OK).entity(operation).build(); return Response.status(Response.Status.OK).entity(operation).build();
} }
@GET
@Override @Override
@Path("/")
public Response getActivities( public Response getActivities(
@QueryParam("timestamp") String timestamp) { @QueryParam("timestamp") String timestamp,
@HeaderParam("If-Modified-Since") String ifModifiedSince) {
List<Activity> activities = null; List<Activity> activities = null;
DeviceManagementProviderService dmService; DeviceManagementProviderService dmService;
try { try {

Write Preview
Loading…
Cancel
Save