From 175c987b8ab68e4010e356f4ed426144f71dd833 Mon Sep 17 00:00:00 2001 From: lasantha Date: Fri, 23 Feb 2018 14:29:49 +0530 Subject: [PATCH] formatting device-location API --- .../device/mgt/jaxrs/service/api/GeoLocationBasedService.java | 2 +- .../mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java | 2 +- .../devicemgt/app/units/cdmf.unit.geo-devices/public/js/app.js | 2 +- .../device/mgt/jaxrs/service/api/GeoLocationBasedService.java | 2 +- .../mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java index 730ecb2545..dee70ef707 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java @@ -156,7 +156,7 @@ public interface GeoLocationBasedService { * Get data to show device locations in a map */ @GET - @Path("stats/deviceLocations") + @Path("stats/device-locations") @ApiOperation( consumes = "application/json", produces = "application/json", diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java index b9070a0df2..a87a8ba984 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java @@ -120,7 +120,7 @@ public class GeoLocationBasedServiceImpl implements GeoLocationBasedService { } } - @Path("stats/deviceLocations") + @Path("stats/device-locations") @GET @Consumes("application/json") @Produces("application/json") diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-devices/public/js/app.js b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-devices/public/js/app.js index 5ef3beeadb..3a4c73e122 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-devices/public/js/app.js +++ b/components/device-mgt/org.wso2.carbon.device.mgt.ui/src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.geo-devices/public/js/app.js @@ -99,7 +99,7 @@ var showMarkersOnChange=function(){ var minLat = bounds._southWest.lat; var minLong = bounds._southWest.lng; var zoom = map.getZoom(); - var backEndUrl = '/api/device-mgt/v1.0/geo-services/1.0.0/stats/deviceLocations'+ + var backEndUrl = '/api/device-mgt/v1.0/geo-services/1.0.0/stats/device-locations'+ '?'+'&minLat='+minLat+'&maxLat='+maxLat+'&minLong='+minLong+ '&maxLong='+maxLong+'&zoom='+zoom; markersLayer.clearLayers(); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java b/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java index b2fbeb4c87..4b737c34c2 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java @@ -156,7 +156,7 @@ public interface GeoLocationBasedService { * Get data to show device locations in a map */ @GET - @Path("stats/deviceLocations") + @Path("stats/device-locations") @ApiOperation( consumes = "application/json", produces = "application/json", diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java index b9070a0df2..a87a8ba984 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.v09.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/GeoLocationBasedServiceImpl.java @@ -120,7 +120,7 @@ public class GeoLocationBasedServiceImpl implements GeoLocationBasedService { } } - @Path("stats/deviceLocations") + @Path("stats/device-locations") @GET @Consumes("application/json") @Produces("application/json")