Merge branch 'new-improvements' into 'master'

Fix role delete

See merge request entgra/carbon-device-mgt!582
revert-70ac1926
Dharmakeerthi Lasantha 4 years ago
commit 4ff9a9222c

@ -611,9 +611,9 @@ public interface RoleManagementService {
@DELETE
@Path("/{roleName}")
@Consumes(MediaType.WILDCARD)
@ApiOperation(
consumes = MediaType.APPLICATION_JSON,
produces = MediaType.APPLICATION_JSON,
consumes = MediaType.WILDCARD,
httpMethod = "DELETE",
value = "Deleting a Role",
notes = "Roles become obsolete over time due to various reasons. In a situation where your " +

@ -537,6 +537,7 @@ public class RoleManagementServiceImpl implements RoleManagementService {
@DELETE
@Path("/{roleName}")
@Consumes(MediaType.WILDCARD)
@Override
public Response deleteRole(@PathParam("roleName") String roleName, @QueryParam("user-store") String userStoreName) {
if (userStoreName != null && !userStoreName.isEmpty()) {

Loading…
Cancel
Save