This is an automated email from the ASF dual-hosted git repository. pradeep pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 4e96dededaa1fce91129004553f4d0e6d8703fee Author: Guru Thejus Arveti <[email protected]> AuthorDate: Fri Nov 8 13:58:29 2024 +0530 RANGER-4988: Adding syncSource and userRole queryParams to ranger searchUsers rest api for swagger Signed-off-by: Pradeep Agrawal <[email protected]> --- security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java | 2 +- .../src/test/java/org/apache/ranger/rest/TestXUserREST.java | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java index bd71c00b2..9f7e79f7f 100755 --- a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java @@ -389,7 +389,7 @@ public class XUserREST { @Path("/users") @Produces({ "application/json" }) @PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.SEARCH_X_USERS + "\")") - public VXUserList searchXUsers(@Context HttpServletRequest request) { + public VXUserList searchXUsers(@Context HttpServletRequest request, @QueryParam("syncSource") String syncSource, @QueryParam("userRole") String userRole) { String UserRoleParamName = RangerConstants.ROLE_USER; SearchCriteria searchCriteria = searchUtil.extractCommonCriterias( request, xUserService.sortFields); diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java index 5b478489c..4727d0990 100644 --- a/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java +++ b/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java @@ -515,7 +515,7 @@ public class TestXUserREST { testVXUserList.setVXUsers(vXUsersList); Mockito.when(xUserMgr.searchXUsers(testSearchCriteria)).thenReturn(testVXUserList); - VXUserList gotVXUserList=xUserRest.searchXUsers(request); + VXUserList gotVXUserList=xUserRest.searchXUsers(request, null, null); Mockito.verify(xUserMgr).searchXUsers(testSearchCriteria); Mockito.verify(searchUtil).extractCommonCriterias((HttpServletRequest)Mockito.any() ,(List<SortField>)Mockito.any()); @@ -1929,7 +1929,7 @@ public class TestXUserREST { Mockito.when(restErrorUtil.create403RESTException("Logged-In user is not allowed to access requested user data.")).thenThrow(new WebApplicationException()); thrown.expect(WebApplicationException.class); - xUserRest.searchXUsers(request); + xUserRest.searchXUsers(request, null, null); } @SuppressWarnings({ "unchecked", "static-access" }) @@ -1979,7 +1979,7 @@ public class TestXUserREST { Mockito.when(searchUtil.extractRoleString(request, testSearchCriteria, "userRole", "Role", null)).thenReturn(""); Mockito.when(xUserService.getXUserByUserName("testuser")).thenReturn(loggedInUser); Mockito.when(xUserMgr.searchXUsers(testSearchCriteria)).thenReturn(expecteUserList); - VXUserList gotVXUserList=xUserRest.searchXUsers(request); + VXUserList gotVXUserList=xUserRest.searchXUsers(request, null, null); assertEquals(gotVXUserList.getList().size(), 1); assertEquals(gotVXUserList.getList().get(0).getId(), expectedUser.getId());
