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

fixing the role filtering api issues

Browse Source
This commit is contained in:
kamidu 2017-03-23 12:21:41 +05:30
parent e205fd97cd
commit cda0dd417f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,7 +181,7 @@ public interface RoleManagementService {
@QueryParam("limit") int limit); @QueryParam("limit") int limit);
@GET @GET
@Path("/roles/filter/{prefix}") @Path("/filter/{prefix}")
@ApiOperation( @ApiOperation(
produces = MediaType.APPLICATION_JSON, produces = MediaType.APPLICATION_JSON,
httpMethod = "GET", httpMethod = "GET",

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

@ -88,6 +88,8 @@ public class RoleManagementServiceImpl implements RoleManagementService {
} }
} }
@GET
@Path("/filter/{prefix}")
@Override @Override
public Response getFilteredRoles( public Response getFilteredRoles(
@PathParam("prefix") String prefix, @PathParam("prefix") String prefix,
@ -109,7 +111,6 @@ public class RoleManagementServiceImpl implements RoleManagementService {
//Get the total role count that matches the given filter //Get the total role count that matches the given filter
List<String> filteredRoles = getRolesFromUserStore(filter, userStore); List<String> filteredRoles = getRolesFromUserStore(filter, userStore);
finalRoleList = new ArrayList<String>(); finalRoleList = new ArrayList<String>();
targetRoles.setCount(filteredRoles.size());
filteredRoles = FilteringUtil.getFilteredList(getRolesFromUserStore(filter, userStore), offset, limit); filteredRoles = FilteringUtil.getFilteredList(getRolesFromUserStore(filter, userStore), offset, limit);
for (String rolename : filteredRoles){ for (String rolename : filteredRoles){
@ -117,6 +118,7 @@ public class RoleManagementServiceImpl implements RoleManagementService {
finalRoleList.add(rolename); finalRoleList.add(rolename);
} }
} }
targetRoles.setCount(finalRoleList.size());
targetRoles.setList(finalRoleList); targetRoles.setList(finalRoleList);
return Response.ok().entity(targetRoles).build(); return Response.ok().entity(targetRoles).build();