Repository: ranger Updated Branches: refs/heads/master 4e04da655 -> f1a71e0a9
RANGER-2133 : Good coding practices for REST classes and unit tests Signed-off-by: Mehul Parikh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f1a71e0a Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f1a71e0a Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f1a71e0a Branch: refs/heads/master Commit: f1a71e0a9381bf53f4f020a92f0315548190bf7f Parents: 4e04da6 Author: Nikhil P <[email protected]> Authored: Thu Jun 14 19:29:49 2018 +0530 Committer: Mehul Parikh <[email protected]> Committed: Thu Jun 14 20:01:54 2018 +0530 ---------------------------------------------------------------------- .../main/java/org/apache/ranger/rest/XUserREST.java | 14 ++++++++++---- .../java/org/apache/ranger/rest/TestServiceREST.java | 2 -- .../java/org/apache/ranger/rest/TestXUserREST.java | 12 ++++-------- .../ranger/service/TestRangerServiceDefService.java | 1 - 4 files changed, 14 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/f1a71e0a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java ---------------------------------------------------------------------- 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 c206acb..79f347d 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/XUserREST.java @@ -544,14 +544,17 @@ public class XUserREST { @Produces({ "application/xml", "application/json" }) @PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.UPDATE_X_PERM_MAP + "\")") public VXPermMap updateXPermMap(VXPermMap vXPermMap) { - + VXPermMap vXPermMapRet = null; if (vXPermMap != null) { if (xResourceService.readResource(vXPermMap.getResourceId()) == null) { throw restErrorUtil.createRESTException("Invalid Input Data - No resource found with Id: " + vXPermMap.getResourceId()); } + else{ + vXPermMapRet = xUserMgr.updateXPermMap(vXPermMap); + } } - return xUserMgr.updateXPermMap(vXPermMap); + return vXPermMapRet; } @DELETE @@ -628,14 +631,17 @@ public class XUserREST { @Produces({ "application/xml", "application/json" }) @PreAuthorize("@rangerPreAuthSecurityHandler.isAPIAccessible(\"" + RangerAPIList.UPDATE_X_AUDIT_MAP + "\")") public VXAuditMap updateXAuditMap(VXAuditMap vXAuditMap) { - + VXAuditMap vXAuditMapRet = null; if (vXAuditMap != null) { if (xResourceService.readResource(vXAuditMap.getResourceId()) == null) { throw restErrorUtil.createRESTException("Invalid Input Data - No resource found with Id: " + vXAuditMap.getResourceId(), MessageEnums.INVALID_INPUT_DATA); } + else{ + vXAuditMapRet = xUserMgr.updateXAuditMap(vXAuditMap); + } } - return xUserMgr.updateXAuditMap(vXAuditMap); + return vXAuditMapRet; } @DELETE http://git-wip-us.apache.org/repos/asf/ranger/blob/f1a71e0a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java index 15ed862..e669c03 100644 --- a/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java +++ b/security-admin/src/test/java/org/apache/ranger/rest/TestServiceREST.java @@ -1836,9 +1836,7 @@ public class TestServiceREST { lastKnownVersion, 0L, pluginId, "", request); Assert.assertNotNull(dbServiceSecurePolicies); Mockito.verify(serviceUtil).isValidService(serviceName, request); - Mockito.verify(daoManager).getXXService(); Mockito.verify(xServiceDao).findByName(serviceName); - Mockito.verify(daoManager).getXXServiceDef(); Mockito.verify(xServiceDefDao).getById(xService.getType()); Mockito.verify(svcStore).getServiceByNameForDP(serviceName); Mockito.verify(bizUtil).isUserAllowed(rs, ServiceREST.Allowed_User_List_For_Grant_Revoke); http://git-wip-us.apache.org/repos/asf/ranger/blob/f1a71e0a/security-admin/src/test/java/org/apache/ranger/rest/TestXUserREST.java ---------------------------------------------------------------------- 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 529fd5b..e564e28 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 @@ -835,10 +835,9 @@ public class TestXUserREST { } @Test public void test45updateXPermMap() { - Mockito.when(xUserMgr.updateXPermMap(null)).thenReturn(null); - VXPermMap retVxGroup=xUserRest.updateXPermMap(null); + VXPermMap vXPermMap=null ; + VXPermMap retVxGroup=xUserRest.updateXPermMap(vXPermMap); assertNull(retVxGroup); - Mockito.verify(xUserMgr).updateXPermMap(null); } @Test public void test46updateXPermMap() { @@ -1039,12 +1038,9 @@ public class TestXUserREST { } @Test public void test58updateXAuditMapVXResourceNull() { - - Mockito.when(xUserMgr.updateXAuditMap(null)).thenReturn(null); - VXAuditMap retvXAuditMap=xUserRest.updateXAuditMap(null); - Mockito.verify(xUserMgr).updateXAuditMap(null); + VXAuditMap vXAuditMap =null; + VXAuditMap retvXAuditMap=xUserRest.updateXAuditMap(vXAuditMap); assertNull(retvXAuditMap); - } @Test public void test59deleteXAuditMap() { http://git-wip-us.apache.org/repos/asf/ranger/blob/f1a71e0a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java index f4ea957..a36b198 100644 --- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java +++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefService.java @@ -736,7 +736,6 @@ public class TestRangerServiceDefService { Mockito.verify(daoManager).getXXPolicyConditionDef(); Mockito.verify(daoManager).getXXContextEnricherDef(); Mockito.verify(daoManager).getXXEnumDef(); - Mockito.verify(daoManager).getXXEnumElementDef(); } }
