Merge pull request #1196 from lasanthaDLPDS/master

Formatting device-location API

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",

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")

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();

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",

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")