charithag
/
device-mgt-plugins
forked from community/device-mgt-plugins
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'application-mgt-new' of https://gitlab.com/entgra/carbon-device-mgt-plugins into application-mgt-new

Browse Source
revert-dabc3590
lasanthaDLPDS 5 years ago
parent 92adedcd8d d6267328c6
commit d506fe000e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File

3
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/AndroidEnterpriseService.java
Unescape View File

@ -487,6 +487,7 @@ public interface AndroidEnterpriseService {
@DELETE @DELETE
@Path("/store-layout/page/{id}") @Path("/store-layout/page/{id}")
@Consumes(MediaType.WILDCARD)
@ApiOperation( @ApiOperation(
produces = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON,
httpMethod = "DELETE", httpMethod = "DELETE",
@ -847,6 +848,7 @@ public interface AndroidEnterpriseService {
@DELETE @DELETE
@Path("/store-layout/cluster/{clusterId}/page/{pageId}") @Path("/store-layout/cluster/{clusterId}/page/{pageId}")
@Consumes(MediaType.WILDCARD)
@ApiOperation( @ApiOperation(
produces = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON,
httpMethod = "DELETE", httpMethod = "DELETE",
@ -1215,6 +1217,7 @@ public interface AndroidEnterpriseService {
@DELETE @DELETE
@Path("/managed-configs/mcm/{mcmId}") @Path("/managed-configs/mcm/{mcmId}")
@Consumes(MediaType.WILDCARD)
@ApiOperation( @ApiOperation(
produces = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON,
httpMethod = "DELETE", httpMethod = "DELETE",

3
components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.api/src/main/java/org/wso2/carbon/mdm/services/android/services/impl/AndroidEnterpriseServiceImpl.java
Unescape View File

@ -329,6 +329,7 @@ public class AndroidEnterpriseServiceImpl implements AndroidEnterpriseService {
@DELETE @DELETE
@Path("/store-layout/page/{id}") @Path("/store-layout/page/{id}")
@Consumes(MediaType.WILDCARD)
@Override @Override
public Response deletePage(@PathParam("id") String id) { public Response deletePage(@PathParam("id") String id) {
if (id == null || id.isEmpty()) { if (id == null || id.isEmpty()) {
@ -492,6 +493,7 @@ public class AndroidEnterpriseServiceImpl implements AndroidEnterpriseService {
@DELETE @DELETE
@Path("/store-layout/cluster/{clusterId}/page/{pageId}") @Path("/store-layout/cluster/{clusterId}/page/{pageId}")
@Consumes(MediaType.WILDCARD)
@Override @Override
public Response deleteCluster( @PathParam("clusterId") String clusterId, @PathParam("pageId") String pageId) { public Response deleteCluster( @PathParam("clusterId") String clusterId, @PathParam("pageId") String pageId) {
if (clusterId == null || clusterId.isEmpty()) { if (clusterId == null || clusterId.isEmpty()) {
@ -683,6 +685,7 @@ public class AndroidEnterpriseServiceImpl implements AndroidEnterpriseService {
@Override @Override
@DELETE @DELETE
@Path("/managed-configs/mcm/{mcmId}") @Path("/managed-configs/mcm/{mcmId}")
@Consumes(MediaType.WILDCARD)
public Response deleteManagedConfigs(@PathParam("mcmId") String mcmId) { public Response deleteManagedConfigs(@PathParam("mcmId") String mcmId) {
if (mcmId == null || mcmId.isEmpty()) { if (mcmId == null || mcmId.isEmpty()) {
return Response.status(Response.Status.BAD_REQUEST).entity( return Response.status(Response.Status.BAD_REQUEST).entity(

Write Preview
Loading…
Cancel
Save