Merge branch 'application-mgt-new' into 'application-mgt-new'

Fix 415 error in delete endpoints of Android Enterprise API

See merge request entgra/carbon-device-mgt-plugins!96
merge-requests/97/head^2
Inosh Perara 5 years ago
commit d6267328c6

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

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

Loading…
Cancel
Save