From b4f78337fadbe7b6b08e081e5f02e19d4ec3f2b6 Mon Sep 17 00:00:00 2001 From: lashanfaliq95 Date: Wed, 14 Mar 2018 13:49:11 +0530 Subject: [PATCH] last-known api updated the comment of the api and handled the error when a negative value is passed as the limit. --- .../service/impl/DeviceEventManagementServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java index e2c3c5642e..1d1482899c 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceEventManagementServiceImpl.java @@ -381,7 +381,8 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe } /** - * Returns the last know data point of the device type or last known data points upto the limit. + * Returns last known data points up to the limit if limit is specified. Otherwise returns last known data point. + * Limit need to be zero or positive. */ @GET @Path("/last-known/{type}/{deviceId}") @@ -407,10 +408,14 @@ public class DeviceEventManagementServiceImpl implements DeviceEventManagementSe if (limit == 0) { EventRecords eventRecords = getAllEventsForDevice(sensorTableName, query, sortByFields, 0, 1); return Response.status(Response.Status.OK.getStatusCode()).entity(eventRecords).build(); - } else { + } else if(limit>0){ EventRecords eventRecords = getAllEventsForDevice(sensorTableName, query, sortByFields, 0, limit); return Response.status(Response.Status.OK.getStatusCode()).entity(eventRecords).build(); } + else{ + String errorMessage = "Invalid limit value"; + return Response.status(Response.Status.BAD_REQUEST).entity(errorMessage).build(); + } } catch (AnalyticsException e) { String errorMsg = "Error on retrieving stats on table " + sensorTableName + " with query " + query; log.error(errorMsg);