You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/08/16 11:27:20 UTC
[1/2] ranger git commit: Remove duplicate RangerDaoManager fields
Repository: ranger
Updated Branches:
refs/heads/master 710236322 -> f7230f70a
Remove duplicate RangerDaoManager fields
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/3dc21364
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/3dc21364
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/3dc21364
Branch: refs/heads/master
Commit: 3dc21364c4b50444147aa45bc9bcc4c1325f8f2d
Parents: 7102363
Author: Zsombor Gegesy <gz...@gmail.com>
Authored: Mon Aug 14 21:59:46 2017 +0200
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Aug 16 12:17:42 2017 +0100
----------------------------------------------------------------------
.../service/AbstractBaseResourceService.java | 7 ++-----
.../ranger/service/AuthSessionService.java | 4 ++--
.../org/apache/ranger/service/UserService.java | 4 ++--
.../ranger/service/XAccessAuditService.java | 4 ----
.../apache/ranger/service/XAssetService.java | 6 +-----
.../apache/ranger/service/XAuditMapService.java | 14 +++++---------
.../ranger/service/XGroupPermissionService.java | 7 +------
.../apache/ranger/service/XGroupService.java | 14 +++++---------
.../ranger/service/XGroupUserService.java | 12 ++++--------
.../ranger/service/XModuleDefService.java | 7 ++-----
.../apache/ranger/service/XPermMapService.java | 20 ++++++++------------
.../apache/ranger/service/XResourceService.java | 17 +++++++----------
.../apache/ranger/service/XTrxLogService.java | 19 ++++++++-----------
.../ranger/service/XUserPermissionService.java | 7 +------
.../org/apache/ranger/service/XUserService.java | 7 +------
15 files changed, 49 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
index 3c2f263..a64bb30 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/AbstractBaseResourceService.java
@@ -88,9 +88,6 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
public List<SortField> sortFields = new ArrayList<SortField>();
public List<SearchField> searchFields = new ArrayList<SearchField>();
- @Autowired
- RangerDaoManager daoManager;
-
protected static final HashMap<Class<?>, String> tEntityValueMap = new HashMap<Class<?>, String>();
static {
tEntityValueMap.put(XXAuthSession.class, "Auth Session");
@@ -103,7 +100,7 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
StringUtil stringUtil;
@Autowired
- protected RangerDaoManager daoMgr;
+ protected RangerDaoManager daoManager;
@Autowired
protected SearchUtil searchUtil;
@@ -172,7 +169,7 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
@SuppressWarnings("unchecked")
protected BaseDao<T> getDao() {
if (entityDao == null) {
- entityDao = (BaseDao<T>) daoMgr.getDaoForClassName(tEntityClass
+ entityDao = (BaseDao<T>) daoManager.getDaoForClassName(tEntityClass
.getSimpleName());
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java b/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
index 249a695..1b6b77c 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/AuthSessionService.java
@@ -103,7 +103,7 @@ public class AuthSessionService extends
*/
@Override
protected BaseDao<XXAuthSession> getDao() {
- return daoMgr.getXXAuthSession();
+ return daoManager.getXXAuthSession();
}
/*
@@ -171,7 +171,7 @@ public class AuthSessionService extends
if (resource.getUserId() != null) {
viewObj.setUserId(resource.getUserId());
- XXPortalUser gjUser = daoMgr.getXXPortalUser().getById(resource.getUserId());
+ XXPortalUser gjUser = daoManager.getXXPortalUser().getById(resource.getUserId());
if (gjUser != null) {
viewObj.setEmailAddress(gjUser.getEmailAddress());
viewObj.setFamilyScreenName(gjUser.getLastName());
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/security-admin/src/main/java/org/apache/ranger/service/UserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/UserService.java b/security-admin/src/main/java/org/apache/ranger/service/UserService.java
index 91fb38b..3fb279e 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/UserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/UserService.java
@@ -291,7 +291,7 @@ public class UserService extends UserServiceBase<XXPortalUser, VXPortalUser> {
userProfile.setUserSource(sess.getAuthProvider());
}
- List<XXPortalUserRole> gjUserRoleList = daoMgr.getXXPortalUserRole().findByParentId(
+ List<XXPortalUserRole> gjUserRoleList = daoManager.getXXPortalUserRole().findByParentId(
user.getId());
for (XXPortalUserRole gjUserRole : gjUserRoleList) {
@@ -320,7 +320,7 @@ public class UserService extends UserServiceBase<XXPortalUser, VXPortalUser> {
userProfile.setUserSource(sess.getAuthProvider());
}
- List<XXPortalUserRole> gjUserRoleList = daoMgr.getXXPortalUserRole().findByParentId(
+ List<XXPortalUserRole> gjUserRoleList = daoManager.getXXPortalUserRole().findByParentId(
user.getId());
for (XXPortalUserRole gjUserRole : gjUserRoleList) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
index 8604bed..5d03fb2 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAccessAuditService.java
@@ -30,13 +30,11 @@ import org.apache.ranger.common.SearchField.DATA_TYPE;
import org.apache.ranger.common.SearchField.SEARCH_TYPE;
import org.apache.ranger.common.SortField;
import org.apache.ranger.common.SortField.SORT_ORDER;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXAccessAudit;
import org.apache.ranger.entity.XXService;
import org.apache.ranger.entity.XXServiceDef;
import org.apache.ranger.view.VXAccessAudit;
import org.apache.ranger.view.VXAccessAuditList;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
@@ -44,8 +42,6 @@ import org.springframework.stereotype.Service;
@Scope("singleton")
public class XAccessAuditService extends XAccessAuditServiceBase<XXAccessAudit, VXAccessAudit>{
public static final String NAME = "XAccessAudit";
- @Autowired
- RangerDaoManager appDaoMgr;
protected final String distinctCountQueryStr;
protected final String distinctQueryStr;
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java b/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
index 3aab900..132879a 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAssetService.java
@@ -37,7 +37,6 @@ import org.apache.ranger.common.SearchField.DATA_TYPE;
import org.apache.ranger.common.SearchField.SEARCH_TYPE;
import org.apache.ranger.common.StringUtil;
import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXAsset;
import org.apache.ranger.entity.XXTrxLog;
import org.apache.ranger.util.RangerEnumUtil;
@@ -54,9 +53,6 @@ public class XAssetService extends XAssetServiceBase<XXAsset, VXAsset> {
@Autowired
JSONUtil jsonUtil;
-
- @Autowired
- RangerDaoManager appDaoMgr;
@Autowired
StringUtil stringUtil;
@@ -87,7 +83,7 @@ public class XAssetService extends XAssetServiceBase<XXAsset, VXAsset> {
@Override
protected void validateForCreate(VXAsset vObj) {
- XXAsset xxAsset = appDaoMgr.getXXAsset()
+ XXAsset xxAsset = daoManager.getXXAsset()
.findByAssetName(vObj.getName());
if (xxAsset != null) {
String errorMessage = "Repository Name already exists";
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
index e090391..09fd963 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java
@@ -28,7 +28,6 @@ import org.apache.ranger.biz.RangerBizUtil;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.SearchField;
import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXAuditMap;
import org.apache.ranger.entity.XXPortalUser;
import org.apache.ranger.entity.XXTrxLog;
@@ -46,9 +45,6 @@ public class XAuditMapService extends
@Autowired
RangerEnumUtil xaEnumUtil;
-
- @Autowired
- RangerDaoManager rangerDaoManager;
@Autowired
RangerBizUtil rangerBizUtil;
@@ -117,7 +113,7 @@ public class XAuditMapService extends
value = xaEnumUtil.getLabel(enumName, enumValue);
} else {
value = ""+field.get(vObj);
- XXUser xUser = rangerDaoManager.getXXUser().getById(Long.parseLong(value));
+ XXUser xUser = daoManager.getXXUser().getById(Long.parseLong(value));
value = xUser.getName();
}
@@ -159,7 +155,7 @@ public class XAuditMapService extends
XXPortalUser xXPortalUser=null;
if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){
if(!stringUtil.isEmpty(vObj.getOwner())){
- xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());
+ xXPortalUser=daoManager.getXXPortalUser().findByLoginId(vObj.getOwner());
if(xXPortalUser!=null){
mObj.setAddedByUserId(xXPortalUser.getId());
}
@@ -167,7 +163,7 @@ public class XAuditMapService extends
}
if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){
if(!stringUtil.isEmpty(vObj.getUpdatedBy())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());
+ xXPortalUser= daoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());
if(xXPortalUser!=null){
mObj.setUpdatedByUserId(xXPortalUser.getId());
}
@@ -183,13 +179,13 @@ public class XAuditMapService extends
super.mapEntityToViewBean(vObj, mObj);
XXPortalUser xXPortalUser=null;
if(stringUtil.isEmpty(vObj.getOwner())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());
+ xXPortalUser= daoManager.getXXPortalUser().getById(mObj.getAddedByUserId());
if(xXPortalUser!=null){
vObj.setOwner(xXPortalUser.getLoginId());
}
}
if(stringUtil.isEmpty(vObj.getUpdatedBy())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());
+ xXPortalUser= daoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());
if(xXPortalUser!=null){
vObj.setUpdatedBy(xXPortalUser.getLoginId());
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/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 6329e6b..13d0a8f 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
@@ -23,12 +23,10 @@ import java.util.Map;
import org.apache.ranger.common.MessageEnums;
import org.apache.ranger.common.SearchField;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXGroup;
import org.apache.ranger.entity.XXGroupPermission;
import org.apache.ranger.view.VXGroupPermission;
import org.apache.ranger.view.VXModuleDef;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
@@ -36,9 +34,6 @@ import org.springframework.stereotype.Service;
@Scope("singleton")
public class XGroupPermissionService extends XGroupPermissionServiceBase<XXGroupPermission, VXGroupPermission>{
- @Autowired
- RangerDaoManager rangerDaoManager;
-
public XGroupPermissionService() {
searchFields.add(new SearchField("id", "obj.id",
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.FULL));
@@ -69,7 +64,7 @@ public class XGroupPermissionService extends XGroupPermissionServiceBase<XXGroup
@Override
public VXGroupPermission populateViewBean(XXGroupPermission xObj) {
VXGroupPermission vObj = super.populateViewBean(xObj);
- XXGroup xGroup = rangerDaoManager.getXXGroup().getById(
+ XXGroup xGroup = daoManager.getXXGroup().getById(
xObj.getGroupId());
if (xGroup == null) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/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 1253eec..fd57430 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
@@ -32,7 +32,6 @@ import org.apache.ranger.common.SearchField;
import org.apache.ranger.common.SortField;
import org.apache.ranger.common.StringUtil;
import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXAsset;
import org.apache.ranger.entity.XXGroup;
import org.apache.ranger.entity.XXPortalUser;
@@ -51,9 +50,6 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
private final Long createdByUserId;
@Autowired
- RangerDaoManager rangerDaoManager;
-
- @Autowired
RangerEnumUtil xaEnumUtil;
@Autowired
@@ -81,7 +77,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
@Override
protected void validateForCreate(VXGroup vObj) {
- XXGroup xxGroup = rangerDaoManager.getXXGroup().findByGroupName(
+ XXGroup xxGroup = daoManager.getXXGroup().findByGroupName(
vObj.getName());
if (xxGroup != null) {
throw restErrorUtil.createRESTException("XGroup already exists",
@@ -98,7 +94,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
}
public VXGroup getGroupByGroupName(String groupName) {
- XXGroup xxGroup = rangerDaoManager.getXXGroup().findByGroupName(groupName);
+ XXGroup xxGroup = daoManager.getXXGroup().findByGroupName(groupName);
if (xxGroup == null) {
throw restErrorUtil.createRESTException(
@@ -108,7 +104,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
}
public VXGroup createXGroupWithOutLogin(VXGroup vxGroup) {
- XXGroup xxGroup = rangerDaoManager.getXXGroup().findByGroupName(
+ XXGroup xxGroup = daoManager.getXXGroup().findByGroupName(
vxGroup.getName());
boolean groupExists = true;
@@ -118,7 +114,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
}
xxGroup = mapViewToEntityBean(vxGroup, xxGroup, 0);
- XXPortalUser xXPortalUser = rangerDaoManager.getXXPortalUser().getById(createdByUserId);
+ XXPortalUser xXPortalUser = daoManager.getXXPortalUser().getById(createdByUserId);
if (xXPortalUser != null) {
xxGroup.setAddedByUserId(createdByUserId);
xxGroup.setUpdatedByUserId(createdByUserId);
@@ -260,7 +256,7 @@ public class XGroupService extends XGroupServiceBase<XXGroup, VXGroup> {
public Map<Long, XXGroup> getXXGroupIdXXGroupMap(){
Map<Long, XXGroup> xXGroupMap=new HashMap<Long, XXGroup>();
try{
- List<XXGroup> xXGroupList=rangerDaoManager.getXXGroup().getAll();
+ List<XXGroup> xXGroupList=daoManager.getXXGroup().getAll();
if(!CollectionUtils.isEmpty(xXGroupList)){
for(XXGroup xXGroup:xXGroupList){
xXGroupMap.put(xXGroup.getId(), xXGroup);
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/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 52f8b1a..7e8568b 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
@@ -29,7 +29,6 @@ import org.apache.ranger.common.MessageEnums;
import org.apache.ranger.common.PropertiesUtil;
import org.apache.ranger.common.SearchField;
import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXAsset;
import org.apache.ranger.entity.XXGroup;
import org.apache.ranger.entity.XXGroupUser;
@@ -48,9 +47,6 @@ public class XGroupUserService extends
XGroupUserServiceBase<XXGroupUser, VXGroupUser> {
private final Long createdByUserId;
-
- @Autowired
- RangerDaoManager rangerDaoManager;
@Autowired
RangerEnumUtil xaEnumUtil;
@@ -87,7 +83,7 @@ public class XGroupUserService extends
XXGroup xGroup = daoManager.getXXGroup().findByGroupName(vxGroupUser.getName());
vxGroupUser.setParentGroupId(xGroup.getId());
xxGroupUser = mapViewToEntityBean(vxGroupUser, xxGroupUser, 0);
- XXPortalUser xXPortalUser = rangerDaoManager.getXXPortalUser().getById(createdByUserId);
+ XXPortalUser xXPortalUser = daoManager.getXXPortalUser().getById(createdByUserId);
if (xXPortalUser != null) {
xxGroupUser.setAddedByUserId(createdByUserId);
xxGroupUser.setUpdatedByUserId(createdByUserId);
@@ -120,11 +116,11 @@ public class XGroupUserService extends
// }
Long groupId = vObj.getParentGroupId();
- XXGroup xGroup = rangerDaoManager.getXXGroup().getById(groupId);
+ XXGroup xGroup = daoManager.getXXGroup().getById(groupId);
String groupName = xGroup.getName();
Long userId = vObj.getUserId();
- XXUser xUser = rangerDaoManager.getXXUser().getById(userId);
+ XXUser xUser = daoManager.getXXUser().getById(userId);
String userName = xUser.getName();
List<XXTrxLog> trxLogList = new ArrayList<XXTrxLog>();
@@ -151,7 +147,7 @@ public class XGroupUserService extends
value = xaEnumUtil.getLabel(enumName, enumValue);
} else {
value = ""+field.get(vObj);
- XXGroup xXGroup = rangerDaoManager.getXXGroup().getById(Long.parseLong(value));
+ XXGroup xXGroup = daoManager.getXXGroup().getById(Long.parseLong(value));
value = xXGroup.getName();
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/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 f66cdfe..d5ca385 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
@@ -22,7 +22,6 @@ import java.util.List;
import java.util.Map;
import org.apache.ranger.common.RangerConstants;
import org.apache.ranger.common.SearchField;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXGroup;
import org.apache.ranger.entity.XXGroupPermission;
import org.apache.ranger.entity.XXModuleDef;
@@ -41,8 +40,6 @@ import org.springframework.util.CollectionUtils;
public class XModuleDefService extends
XModuleDefServiceBase<XXModuleDef, VXModuleDef> {
- @Autowired
- RangerDaoManager rangerDaoManager;
@Autowired
XUserPermissionService xUserPermService;
@@ -95,9 +92,9 @@ public class XModuleDefService extends
Map<Long, XXGroup> xXGroupMap=xGroupService.getXXGroupIdXXGroupMap();
List<VXUserPermission> vXUserPermissionList = new ArrayList<VXUserPermission>();
List<VXGroupPermission> vXGroupPermissionList = new ArrayList<VXGroupPermission>();
- List<XXUserPermission> xuserPermissionList = rangerDaoManager
+ List<XXUserPermission> xuserPermissionList = daoManager
.getXXUserPermission().findByModuleId(xObj.getId(), false);
- List<XXGroupPermission> xgroupPermissionList = rangerDaoManager
+ List<XXGroupPermission> xgroupPermissionList = daoManager
.getXXGroupPermission().findByModuleId(xObj.getId(), false);
if(CollectionUtils.isEmpty(xXPortalUserIdXXUserMap)){
for (XXUserPermission xUserPerm : xuserPermissionList) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
index 1a59975..8664484 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java
@@ -28,7 +28,6 @@ import org.apache.ranger.biz.RangerBizUtil;
import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.SearchField;
import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXGroup;
import org.apache.ranger.entity.XXPermMap;
import org.apache.ranger.entity.XXPortalUser;
@@ -56,9 +55,6 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
RangerEnumUtil xaEnumUtil;
@Autowired
- RangerDaoManager rangerDaoManager;
-
- @Autowired
RangerBizUtil rangerBizUtil;
@Autowired
@@ -154,11 +150,11 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
if(isGroupPolicy){
groupId = vObj.getGroupId();
- XXGroup xGroup = rangerDaoManager.getXXGroup().getById(groupId);
+ XXGroup xGroup = daoManager.getXXGroup().getById(groupId);
groupName = xGroup.getName();
} else {
userId = vObj.getUserId();
- XXUser xUser = rangerDaoManager.getXXUser().getById(userId);
+ XXUser xUser = daoManager.getXXUser().getById(userId);
userName = xUser.getName();
}
@@ -189,8 +185,8 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
// }
// }
}
- Long assetId = rangerDaoManager.getXXResource().getById(vObj.getResourceId()).getAssetId();
- int policyType = rangerDaoManager.getXXAsset().getById(assetId).getAssetType();
+ Long assetId = daoManager.getXXResource().getById(vObj.getResourceId()).getAssetId();
+ int policyType = daoManager.getXXAsset().getById(assetId).getAssetType();
if(policyType != AppConstants.ASSET_KNOX){
if("ipAddress".equals(fieldName))
continue;
@@ -267,7 +263,7 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
XXPortalUser xXPortalUser=null;
if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){
if(!stringUtil.isEmpty(vObj.getOwner())){
- xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());
+ xXPortalUser=daoManager.getXXPortalUser().findByLoginId(vObj.getOwner());
if(xXPortalUser!=null){
mObj.setAddedByUserId(xXPortalUser.getId());
}
@@ -275,7 +271,7 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
}
if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){
if(!stringUtil.isEmpty(vObj.getUpdatedBy())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());
+ xXPortalUser= daoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());
if(xXPortalUser!=null){
mObj.setUpdatedByUserId(xXPortalUser.getId());
}
@@ -291,13 +287,13 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> {
super.mapEntityToViewBean(vObj, mObj);
XXPortalUser xXPortalUser=null;
if(stringUtil.isEmpty(vObj.getOwner())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());
+ xXPortalUser= daoManager.getXXPortalUser().getById(mObj.getAddedByUserId());
if(xXPortalUser!=null){
vObj.setOwner(xXPortalUser.getLoginId());
}
}
if(stringUtil.isEmpty(vObj.getUpdatedBy())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());
+ xXPortalUser= daoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());
if(xXPortalUser!=null){
vObj.setUpdatedBy(xXPortalUser.getLoginId());
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
index 004ded4..b3e7bd7 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
@@ -38,7 +38,6 @@ import org.apache.ranger.common.SortField;
import org.apache.ranger.common.StringUtil;
import org.apache.ranger.common.UserSessionBase;
import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXAsset;
import org.apache.ranger.entity.XXAuditMap;
import org.apache.ranger.entity.XXPermMap;
@@ -72,8 +71,6 @@ public class XResourceService extends
StringUtil stringUtil;
@Autowired
- RangerDaoManager rangerDaoManager;
- @Autowired
RangerBizUtil xaBizUtil;
@Autowired
@@ -187,7 +184,7 @@ public class XResourceService extends
}
Long assetId = vObj.getAssetId();
if(assetId != null){
- XXAsset xAsset = rangerDaoManager.getXXAsset().getById(assetId);
+ XXAsset xAsset = daoManager.getXXAsset().getById(assetId);
if(xAsset == null){
throw restErrorUtil.createRESTException("The repository for which "
+ "the policy is created, doesn't exist in the system.",
@@ -323,7 +320,7 @@ public class XResourceService extends
}
private void populateAssetProperties(VXResource vXResource) {
- XXAsset xxAsset = rangerDaoManager.getXXAsset().getById(
+ XXAsset xxAsset = daoManager.getXXAsset().getById(
vXResource.getAssetId());
if (xxAsset != null) {
vXResource.setAssetName(xxAsset.getName());
@@ -417,7 +414,7 @@ public class XResourceService extends
XXPortalUser xXPortalUser= null;
if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){
if(!stringUtil.isEmpty(vObj.getOwner())){
- xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());
+ xXPortalUser=daoManager.getXXPortalUser().findByLoginId(vObj.getOwner());
if(xXPortalUser!=null){
mObj.setAddedByUserId(xXPortalUser.getId());
}
@@ -425,7 +422,7 @@ public class XResourceService extends
}
if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){
if(!stringUtil.isEmpty(vObj.getUpdatedBy())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());
+ xXPortalUser= daoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());
if(xXPortalUser!=null){
mObj.setUpdatedByUserId(xXPortalUser.getId());
}
@@ -444,13 +441,13 @@ public class XResourceService extends
populateAssetProperties(vObj);
XXPortalUser xXPortalUser= null;
if(stringUtil.isEmpty(vObj.getOwner())){
- xXPortalUser=rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());
+ xXPortalUser=daoManager.getXXPortalUser().getById(mObj.getAddedByUserId());
if(xXPortalUser!=null){
vObj.setOwner(xXPortalUser.getLoginId());
}
}
if(stringUtil.isEmpty(vObj.getUpdatedBy())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());
+ xXPortalUser= daoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());
if(xXPortalUser!=null){
vObj.setUpdatedBy(xXPortalUser.getLoginId());
}
@@ -468,7 +465,7 @@ public class XResourceService extends
return null;
}
- XXAsset xAsset = rangerDaoManager.getXXAsset().getById(vObj.getAssetId());
+ XXAsset xAsset = daoManager.getXXAsset().getById(vObj.getAssetId());
String parentObjectName = xAsset.getName();
List<XXTrxLog> trxLogList = new ArrayList<XXTrxLog>();
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
index 7618981..302076e 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
@@ -39,13 +39,11 @@ import org.apache.ranger.common.SearchCriteria;
import org.apache.ranger.common.SearchField;
import org.apache.ranger.common.SortField;
import org.apache.ranger.common.SortField.SORT_ORDER;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXPortalUser;
import org.apache.ranger.entity.XXTrxLog;
import org.apache.ranger.entity.view.VXXTrxLog;
import org.apache.ranger.view.VXTrxLog;
import org.apache.ranger.view.VXTrxLogList;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils;
@@ -53,8 +51,7 @@ import org.springframework.util.CollectionUtils;
@Service
@Scope("singleton")
public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
- @Autowired
- RangerDaoManager rangerDaoManager;
+
public XTrxLogService(){
searchFields.add(new SearchField("attributeName", "obj.attributeName",
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.PARTIAL));
@@ -82,7 +79,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
@Override
public VXTrxLogList searchXTrxLogs(SearchCriteria searchCriteria) {
- EntityManager em = daoMgr.getEntityManager();
+ EntityManager em = daoManager.getEntityManager();
CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
CriteriaQuery<VXXTrxLog> selectCQ = criteriaBuilder.createQuery(VXXTrxLog.class);
Root<VXXTrxLog> rootEntityType = selectCQ.from(VXXTrxLog.class);
@@ -103,7 +100,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
VXTrxLog trxLog = mapCustomViewToViewObj(xTrxLog);
if(trxLog.getUpdatedBy() != null){
- XXPortalUser xXPortalUser= rangerDaoManager.getXXPortalUser().getById(
+ XXPortalUser xXPortalUser= daoManager.getXXPortalUser().getById(
Long.parseLong(trxLog.getUpdatedBy()));
if(xXPortalUser != null){
trxLog.setOwner(xXPortalUser.getLoginId());
@@ -121,7 +118,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
}
public Long searchXTrxLogsCount(SearchCriteria searchCriteria) {
- EntityManager em = daoMgr.getEntityManager();
+ EntityManager em = daoManager.getEntityManager();
CriteriaBuilder criteriaBuilder = em.getCriteriaBuilder();
CriteriaQuery<VXXTrxLog> selectCQ = criteriaBuilder.createQuery(VXXTrxLog.class);
Root<VXXTrxLog> rootEntityType = selectCQ.from(VXXTrxLog.class);
@@ -259,7 +256,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
XXPortalUser xXPortalUser=null;
if(mObj.getAddedByUserId()==null || mObj.getAddedByUserId()==0){
if(!stringUtil.isEmpty(vObj.getOwner())){
- xXPortalUser=rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getOwner());
+ xXPortalUser=daoManager.getXXPortalUser().findByLoginId(vObj.getOwner());
if(xXPortalUser!=null){
mObj.setAddedByUserId(xXPortalUser.getId());
}
@@ -267,7 +264,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
}
if(mObj.getUpdatedByUserId()==null || mObj.getUpdatedByUserId()==0){
if(!stringUtil.isEmpty(vObj.getUpdatedBy())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());
+ xXPortalUser= daoManager.getXXPortalUser().findByLoginId(vObj.getUpdatedBy());
if(xXPortalUser!=null){
mObj.setUpdatedByUserId(xXPortalUser.getId());
}
@@ -283,13 +280,13 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
super.mapEntityToViewBean(vObj, mObj);
XXPortalUser xXPortalUser=null;
if(stringUtil.isEmpty(vObj.getOwner())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getAddedByUserId());
+ xXPortalUser= daoManager.getXXPortalUser().getById(mObj.getAddedByUserId());
if(xXPortalUser!=null){
vObj.setOwner(xXPortalUser.getLoginId());
}
}
if(stringUtil.isEmpty(vObj.getUpdatedBy())){
- xXPortalUser= rangerDaoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());
+ xXPortalUser= daoManager.getXXPortalUser().getById(mObj.getUpdatedByUserId());
if(xXPortalUser!=null){
vObj.setUpdatedBy(xXPortalUser.getLoginId());
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/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 76b7400..47a1fad 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
@@ -22,23 +22,18 @@ import java.util.List;
import java.util.Map;
import org.apache.ranger.common.SearchField;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXModuleDef;
import org.apache.ranger.entity.XXPortalUser;
import org.apache.ranger.entity.XXUser;
import org.apache.ranger.entity.XXUserPermission;
import org.apache.ranger.view.VXModuleDef;
import org.apache.ranger.view.VXUserPermission;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Service;
@Service
@Scope("singleton")
public class XUserPermissionService extends XUserPermissionServiceBase<XXUserPermission, VXUserPermission>{
- @Autowired
- RangerDaoManager rangerDaoManager;
-
public XUserPermissionService() {
searchFields.add(new SearchField("id", "obj.id",
SearchField.DATA_TYPE.STRING, SearchField.SEARCH_TYPE.FULL));
@@ -62,7 +57,7 @@ public class XUserPermissionService extends XUserPermissionServiceBase<XXUserPer
public VXUserPermission populateViewBean(XXUserPermission xObj) {
VXUserPermission vObj = super.populateViewBean(xObj);
- XXPortalUser xPortalUser = rangerDaoManager.getXXPortalUser().getById(xObj.getUserId());
+ XXPortalUser xPortalUser = daoManager.getXXPortalUser().getById(xObj.getUserId());
if (xPortalUser != null) {
vObj.setUserName(xPortalUser.getLoginId());
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/3dc21364/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 294223b..9be833c 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
@@ -37,7 +37,6 @@ import org.apache.ranger.common.SearchField;
import org.apache.ranger.common.SortField;
import org.apache.ranger.common.StringUtil;
import org.apache.ranger.common.view.VTrxLogAttr;
-import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXGroupUser;
import org.apache.ranger.entity.XXPortalUser;
import org.apache.ranger.entity.XXPortalUserRole;
@@ -54,13 +53,9 @@ import org.springframework.util.CollectionUtils;
@Service
@Scope("singleton")
public class XUserService extends XUserServiceBase<XXUser, VXUser> {
-
private final Long createdByUserId;
@Autowired
- RangerDaoManager daoManager;
-
- @Autowired
XPermMapService xPermMapService;
@Autowired
@@ -253,7 +248,7 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> {
}
vObj.setStatus(xXPortalUser.getStatus());
vObj.setUserSource(xXPortalUser.getUserSource());
- List<XXPortalUserRole> gjUserRoleList = daoMgr.getXXPortalUserRole().findByParentId(
+ List<XXPortalUserRole> gjUserRoleList = daoManager.getXXPortalUserRole().findByParentId(
xXPortalUser.getId());
for (XXPortalUserRole gjUserRole : gjUserRoleList) {
[2/2] ranger git commit: RANGER-1734 - "Close the connection in the
HIVERangerAuthorizerTest"
Posted by co...@apache.org.
RANGER-1734 - "Close the connection in the HIVERangerAuthorizerTest"
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/f7230f70
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/f7230f70
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/f7230f70
Branch: refs/heads/master
Commit: f7230f70a4de21c7bac9028a05f9f7472077e809
Parents: 3dc2136
Author: Colm O hEigeartaigh <co...@apache.org>
Authored: Tue Aug 15 10:04:48 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Wed Aug 16 12:17:59 2017 +0100
----------------------------------------------------------------------
.../apache/ranger/services/hive/HIVERangerAuthorizerTest.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/f7230f70/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
----------------------------------------------------------------------
diff --git a/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java b/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
index c6f0b8f..2c9e955 100644
--- a/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
+++ b/hive-agent/src/test/java/org/apache/ranger/services/hive/HIVERangerAuthorizerTest.java
@@ -130,13 +130,13 @@ public class HIVERangerAuthorizerTest {
statement.close();
connection.close();
-
+
// Enable ranger authorization after the initial db setup and table creating is done.
conf.set(HiveConf.ConfVars.HIVE_AUTHORIZATION_ENABLED.varname, "true");
conf.set(HiveConf.ConfVars.HIVE_SERVER2_ENABLE_DOAS.varname, "true");
conf.set(HiveConf.ConfVars.HIVE_AUTHORIZATION_MANAGER.varname,
"org.apache.ranger.authorization.hive.authorizer.RangerHiveAuthorizerFactory");
-
+
}
@org.junit.AfterClass
@@ -907,6 +907,7 @@ public class HIVERangerAuthorizerTest {
Statement statement = connection.createStatement();
Assert.assertTrue(statement.execute("show grant user admin"));
statement.close();
+ connection.close();
}
}