RANGER-1370: Add method to get longs from the PropertiesUtil and eliminate the public static variables, and fix inconsistency on the default value handling
Change-Id: I23e325e1e96d67d7e8390db324eaf682f12a8581 Signed-off-by: Colm O hEigeartaigh <cohei...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/52509846 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/52509846 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/52509846 Branch: refs/heads/master Commit: 525098460de96ce66877929b5cd0039d3fdc7862 Parents: 7802c83 Author: Zsombor Gegesy <gzsom...@gmail.com> Authored: Fri Feb 3 11:18:00 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Fri Feb 10 10:44:42 2017 +0000 ---------------------------------------------------------------------- .../apache/ranger/common/PropertiesUtil.java | 13 +++++++++++- .../ranger/service/XGroupPermissionService.java | 2 -- .../apache/ranger/service/XGroupService.java | 4 ++-- .../ranger/service/XGroupUserService.java | 4 ++-- .../ranger/service/XModuleDefService.java | 2 -- .../ranger/service/XUserPermissionService.java | 2 -- .../org/apache/ranger/service/XUserService.java | 5 ++--- .../ranger/common/TestPropertiesUtil.java | 22 ++++++++++++++------ 8 files changed, 34 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/52509846/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java index a0f83c7..830a049 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/PropertiesUtil.java @@ -269,7 +269,7 @@ public class PropertiesUtil extends PropertyPlaceholderConfigurer { public static Integer getIntProperty(String key, int defaultValue) { if (key == null) { - return null; + return defaultValue; } String rtrnVal = propertiesMap.get(key); if (rtrnVal == null) { @@ -278,6 +278,17 @@ public class PropertiesUtil extends PropertyPlaceholderConfigurer { return Integer.valueOf(rtrnVal); } + public static long getLongProperty(String key, long defaultValue) { + if (key == null) { + return defaultValue; + } + String rtrnVal = propertiesMap.get(key); + if (rtrnVal == null) { + return defaultValue; + } + return Long.valueOf(rtrnVal); + } + public static Integer getIntProperty(String key) { if (key == null) { return null; http://git-wip-us.apache.org/repos/asf/ranger/blob/52509846/security-admin/src/main/java/org/apache/ranger/service/XGroupPermissionService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupPermissionService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupPermissionService.java index 3df5233..6329e6b 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XGroupPermissionService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupPermissionService.java @@ -36,8 +36,6 @@ import org.springframework.stereotype.Service; @Scope("singleton") public class XGroupPermissionService extends XGroupPermissionServiceBase<XXGroupPermission, VXGroupPermission>{ - public static Long createdByUserId = 1L; - @Autowired RangerDaoManager rangerDaoManager; http://git-wip-us.apache.org/repos/asf/ranger/blob/52509846/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java index e259eae..c478dbc 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupService.java @@ -48,7 +48,7 @@ import org.springframework.util.CollectionUtils; @Scope("singleton") public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> { - public static Long createdByUserId = 1L; + private final Long createdByUserId; @Autowired RangerDaoManager rangerDaoManager; @@ -74,7 +74,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> { searchFields.add(new SearchField("isVisible", "obj.isVisible", SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL )); - createdByUserId = Long.valueOf(PropertiesUtil.getIntProperty("ranger.xuser.createdByUserId", 1)); + createdByUserId = PropertiesUtil.getLongProperty("ranger.xuser.createdByUserId", 1); sortFields.add(new SortField("name", "obj.name",true,SortField.SORT_ORDER.ASC)); } http://git-wip-us.apache.org/repos/asf/ranger/blob/52509846/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java index d1901d9..0d735da 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XGroupUserService.java @@ -47,7 +47,7 @@ import org.springframework.stereotype.Service; public class XGroupUserService extends XGroupUserServiceBase<XXGroupUser, VXGroupUser> { - public static Long createdByUserId = 1L; + private final Long createdByUserId; @Autowired RangerDaoManager rangerDaoManager; @@ -66,7 +66,7 @@ public class XGroupUserService extends SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL)); searchFields.add(new SearchField("xGroupId", "obj.parentGroupId", SearchField.DATA_TYPE.INTEGER, SearchField.SEARCH_TYPE.FULL)); - createdByUserId = Long.valueOf(PropertiesUtil.getIntProperty("ranger.xuser.createdByUserId", 1)); + createdByUserId = PropertiesUtil.getLongProperty("ranger.xuser.createdByUserId", 1); } http://git-wip-us.apache.org/repos/asf/ranger/blob/52509846/security-admin/src/main/java/org/apache/ranger/service/XModuleDefService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XModuleDefService.java b/security-admin/src/main/java/org/apache/ranger/service/XModuleDefService.java index b8403e8..f66cdfe 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XModuleDefService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XModuleDefService.java @@ -41,8 +41,6 @@ import org.springframework.util.CollectionUtils; public class XModuleDefService extends XModuleDefServiceBase<XXModuleDef, VXModuleDef> { - public static Long createdByUserId = 1L; - @Autowired RangerDaoManager rangerDaoManager; http://git-wip-us.apache.org/repos/asf/ranger/blob/52509846/security-admin/src/main/java/org/apache/ranger/service/XUserPermissionService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserPermissionService.java b/security-admin/src/main/java/org/apache/ranger/service/XUserPermissionService.java index 3a97ef8..76b7400 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XUserPermissionService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XUserPermissionService.java @@ -36,8 +36,6 @@ import org.springframework.stereotype.Service; @Scope("singleton") public class XUserPermissionService extends XUserPermissionServiceBase<XXUserPermission, VXUserPermission>{ - public static Long createdByUserId = 1L; - @Autowired RangerDaoManager rangerDaoManager; http://git-wip-us.apache.org/repos/asf/ranger/blob/52509846/security-admin/src/main/java/org/apache/ranger/service/XUserService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java index 0d07982..0f8156a 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java @@ -54,7 +54,7 @@ import org.springframework.util.CollectionUtils; @Scope("singleton") public class XUserService extends XUserServiceBase<XXUser, VXUser> { - public static Long createdByUserId = 1L; + private final Long createdByUserId; @Autowired RangerDaoManager daoManager; @@ -120,8 +120,7 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> { "XXPortalUser xXPortalUser, XXPortalUserRole xXPortalUserRole", "xXPortalUser.id=xXPortalUserRole.userId and xXPortalUser.loginId = obj.name ")); - - createdByUserId = Long.valueOf(PropertiesUtil.getIntProperty("ranger.xuser.createdByUserId", 1)); + createdByUserId = PropertiesUtil.getLongProperty("ranger.xuser.createdByUserId", 1); hiddenPasswordString = PropertiesUtil.getProperty("ranger.password.hidden","*****"); http://git-wip-us.apache.org/repos/asf/ranger/blob/52509846/security-admin/src/test/java/org/apache/ranger/common/TestPropertiesUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/common/TestPropertiesUtil.java b/security-admin/src/test/java/org/apache/ranger/common/TestPropertiesUtil.java index 7abed8e..4fb3a19 100644 --- a/security-admin/src/test/java/org/apache/ranger/common/TestPropertiesUtil.java +++ b/security-admin/src/test/java/org/apache/ranger/common/TestPropertiesUtil.java @@ -56,8 +56,8 @@ public class TestPropertiesUtil { @Test public void testGetIntPropertyNull1(){ String key=null; - PropertiesUtil.getIntProperty(key); - Assert.assertNull(key); + Integer value = PropertiesUtil.getIntProperty(key); + Assert.assertNull(value); } @Test @@ -71,8 +71,9 @@ public class TestPropertiesUtil { public void testGetIntPropertyNull(){ String key=null; int defaultValue=0; - PropertiesUtil.getIntProperty(key, defaultValue); - Assert.assertNull(key); + Integer value = PropertiesUtil.getIntProperty(key, defaultValue); + Assert.assertNotNull(value); + Assert.assertEquals(value.intValue(), defaultValue); } @Test @@ -80,9 +81,18 @@ public class TestPropertiesUtil { String key="1"; int defaultValue=1; Integer value= PropertiesUtil.getIntProperty(key, defaultValue); - Assert.assertEquals(value, Integer.valueOf(key)); + Assert.assertEquals(value, Integer.valueOf(defaultValue)); } - + + @Test + public void testGetLongProperty(){ + String key="longKey"; + long defaultValue=23L; + Long value = PropertiesUtil.getLongProperty(key, defaultValue); + Assert.assertNotNull(value); + Assert.assertEquals(value.intValue(), defaultValue); + } + @Test public void testGetBooleanPropertyNull() { String key = null;