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

Merge branch 'corrective-policy' into 'corrective-policy'

Browse Source 
Fix geo fence deleting issue

See merge request entgra/carbon-device-mgt!659
This commit is contained in:
Dharmakeerthi Lasantha 2020-10-02 03:40:50 +00:00
commit c67b041fb2
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/api/GeoLocationBasedService.java
View File

@ -48,6 +48,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.PathParam; import javax.ws.rs.PathParam;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam; import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
@SwaggerDefinition( @SwaggerDefinition(
@ -972,8 +973,7 @@ public interface GeoLocationBasedService {
@DELETE @DELETE
@Path("/geo-fence/{fenceId}") @Path("/geo-fence/{fenceId}")
@ApiOperation( @ApiOperation(
consumes = "application/json", consumes = MediaType.APPLICATION_JSON,
produces = "application/json",
httpMethod = "DELETE", httpMethod = "DELETE",
value = "Delete Geo fence", value = "Delete Geo fence",
notes = "Delete an existing geo fence", notes = "Delete an existing geo fence",

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

@ -678,10 +678,9 @@ public class GeoLocationBasedServiceImpl implements GeoLocationBasedService {
} }
@Path("/geo-fence/{fenceId}")
@DELETE @DELETE
@Consumes("application/json") @Override
@Produces("application/json") @Path("/geo-fence/{fenceId}")
public Response deleteGeofence(@PathParam("fenceId") int fenceId) { public Response deleteGeofence(@PathParam("fenceId") int fenceId) {
try { try {
GeoLocationProviderService geoService = DeviceMgtAPIUtils.getGeoService(); GeoLocationProviderService geoService = DeviceMgtAPIUtils.getGeoService();

9
components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/geo/service/GeoLocationProviderServiceImpl.java
View File

@ -1327,7 +1327,12 @@ public class GeoLocationProviderServiceImpl implements GeoLocationProviderServic
public boolean deleteGeofenceData(int fenceId) throws GeoLocationBasedServiceException { public boolean deleteGeofenceData(int fenceId) throws GeoLocationBasedServiceException {
try { try {
DeviceManagementDAOFactory.beginTransaction(); DeviceManagementDAOFactory.beginTransaction();
return geofenceDAO.deleteGeofenceById(fenceId) > 0; if (geofenceDAO.deleteGeofenceById(fenceId) > 0) {
DeviceManagementDAOFactory.commitTransaction();
return true;
}
DeviceManagementDAOFactory.rollbackTransaction();
return false;
} catch (DeviceManagementDAOException e) { } catch (DeviceManagementDAOException e) {
String msg = "Error occurred while deleting geofence"; String msg = "Error occurred while deleting geofence";
log.error(msg, e); log.error(msg, e);
@ -1337,7 +1342,7 @@ public class GeoLocationProviderServiceImpl implements GeoLocationProviderServic
log.error(msg, e); log.error(msg, e);
throw new GeoLocationBasedServiceException(msg, e); throw new GeoLocationBasedServiceException(msg, e);
} finally { } finally {
DeviceManagementDAOFactory.commitTransaction(); DeviceManagementDAOFactory.closeConnection();
} }
} }