Repository: ranger Updated Branches: refs/heads/master 360cdd683 -> 6a602cadc
Fix generic types in RangerAuditFields Change-Id: I074ce7c73bbca8c28e96aab0d07168b2b0f531fe 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/6a602cad Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/6a602cad Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/6a602cad Branch: refs/heads/master Commit: 6a602cadc520d47ec4342161d4db2a5240e40155 Parents: 360cdd6 Author: Zsombor Gegesy <gzsom...@gmail.com> Authored: Thu Feb 9 15:04:18 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Thu Mar 2 09:46:51 2017 +0000 ---------------------------------------------------------------------- .../org/apache/ranger/biz/ServiceDBStore.java | 17 ++++++++--------- .../java/org/apache/ranger/biz/TagDBStore.java | 11 +++++------ .../apache/ranger/service/RangerAuditFields.java | 6 +++--- .../service/RangerServiceDefServiceBase.java | 18 +++++++++--------- .../ranger/service/RangerTagDefServiceBase.java | 5 ++--- .../ranger/service/RangerTagServiceBase.java | 3 +-- .../org/apache/ranger/biz/TestServiceDBStore.java | 6 +++--- .../org/apache/ranger/rest/TestServiceREST.java | 3 +-- .../service/TestRangerPolicyServiceBase.java | 4 ---- .../service/TestRangerServiceDefServiceBase.java | 3 +-- .../service/TestRangerTagDefServiceBase.java | 4 ---- 11 files changed, 33 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java index 378d7f0..053df24 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java @@ -95,7 +95,6 @@ import org.apache.ranger.db.XXServiceVersionInfoDao; import org.apache.ranger.entity.XXAccessTypeDef; import org.apache.ranger.entity.XXAccessTypeDefGrants; import org.apache.ranger.entity.XXContextEnricherDef; -import org.apache.ranger.entity.XXDBBase; import org.apache.ranger.entity.XXDataHist; import org.apache.ranger.entity.XXDataMaskTypeDef; import org.apache.ranger.entity.XXEnumDef; @@ -233,7 +232,7 @@ public class ServiceDBStore extends AbstractServiceStore { StringUtil stringUtil; @Autowired - RangerAuditFields<XXDBBase> rangerAuditFields; + RangerAuditFields rangerAuditFields; @Autowired RangerPolicyService policyService; @@ -1426,7 +1425,7 @@ public class ServiceDBStore extends AbstractServiceStore { } XXServiceConfigMap xConfMap = new XXServiceConfigMap(); - xConfMap = (XXServiceConfigMap) rangerAuditFields.populateAuditFields(xConfMap, xCreatedService); + xConfMap = rangerAuditFields.populateAuditFields(xConfMap, xCreatedService); xConfMap.setServiceId(xCreatedService.getId()); xConfMap.setConfigkey(configKey); xConfMap.setConfigvalue(configValue); @@ -2897,7 +2896,7 @@ public class ServiceDBStore extends AbstractServiceStore { private XXPolicyItem createNewPolicyItemForPolicy(RangerPolicy policy, XXPolicy xPolicy, RangerPolicyItem policyItem, XXServiceDef xServiceDef, int itemOrder, int policyItemType) throws Exception { XXPolicyItem xPolicyItem = new XXPolicyItem(); - xPolicyItem = (XXPolicyItem) rangerAuditFields.populateAuditFields(xPolicyItem, xPolicy); + xPolicyItem = rangerAuditFields.populateAuditFields(xPolicyItem, xPolicy); xPolicyItem.setDelegateAdmin(policyItem.getDelegateAdmin()); xPolicyItem.setItemType(policyItemType); @@ -2938,7 +2937,7 @@ public class ServiceDBStore extends AbstractServiceStore { throw new Exception(user + ": user does not exist. policy='"+ policy.getName() + "' service='"+ policy.getService() + "'"); } XXPolicyItemUserPerm xUserPerm = new XXPolicyItemUserPerm(); - xUserPerm = (XXPolicyItemUserPerm) rangerAuditFields.populateAuditFields(xUserPerm, xPolicyItem); + xUserPerm = rangerAuditFields.populateAuditFields(xUserPerm, xPolicyItem); xUserPerm.setUserId(xUser.getId()); xUserPerm.setPolicyItemId(xPolicyItem.getId()); xUserPerm.setOrder(i); @@ -2954,7 +2953,7 @@ public class ServiceDBStore extends AbstractServiceStore { throw new Exception(group + ": group does not exist. policy='"+ policy.getName() + "' service='"+ policy.getService() + "'"); } XXPolicyItemGroupPerm xGrpPerm = new XXPolicyItemGroupPerm(); - xGrpPerm = (XXPolicyItemGroupPerm) rangerAuditFields.populateAuditFields(xGrpPerm, xPolicyItem); + xGrpPerm = rangerAuditFields.populateAuditFields(xGrpPerm, xPolicyItem); xGrpPerm.setGroupId(xGrp.getId()); xGrpPerm.setPolicyItemId(xPolicyItem.getId()); xGrpPerm.setOrder(i); @@ -2974,7 +2973,7 @@ public class ServiceDBStore extends AbstractServiceStore { for(int i = 0; i < condition.getValues().size(); i++) { String value = condition.getValues().get(i); XXPolicyItemCondition xPolItemCond = new XXPolicyItemCondition(); - xPolItemCond = (XXPolicyItemCondition) rangerAuditFields.populateAuditFields(xPolItemCond, xPolicyItem); + xPolItemCond = rangerAuditFields.populateAuditFields(xPolItemCond, xPolicyItem); xPolItemCond.setPolicyItemId(xPolicyItem.getId()); xPolItemCond.setType(xPolCond.getId()); xPolItemCond.setValue(value); @@ -3058,7 +3057,7 @@ public class ServiceDBStore extends AbstractServiceStore { } XXPolicyResource xPolRes = new XXPolicyResource(); - xPolRes = (XXPolicyResource) rangerAuditFields.populateAuditFields(xPolRes, xPolicy); + xPolRes = rangerAuditFields.populateAuditFields(xPolRes, xPolicy); xPolRes.setIsExcludes(policyRes.getIsExcludes()); xPolRes.setIsRecursive(policyRes.getIsRecursive()); @@ -3071,7 +3070,7 @@ public class ServiceDBStore extends AbstractServiceStore { for(int i = 0; i < values.size(); i++) { if(values.get(i)!=null){ XXPolicyResourceMap xPolResMap = new XXPolicyResourceMap(); - xPolResMap = (XXPolicyResourceMap) rangerAuditFields.populateAuditFields(xPolResMap, xPolRes); + xPolResMap = rangerAuditFields.populateAuditFields(xPolResMap, xPolRes); xPolResMap.setResourceId(xPolRes.getId()); xPolResMap.setValue(values.get(i)); xPolResMap.setOrder(i); http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java index fa97bc9..853724b 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java @@ -34,7 +34,6 @@ import org.apache.ranger.common.MessageEnums; import org.apache.ranger.common.RESTErrorUtil; import org.apache.ranger.common.RangerServiceTagsCache; import org.apache.ranger.db.RangerDaoManager; -import org.apache.ranger.entity.XXDBBase; import org.apache.ranger.entity.XXResourceDef; import org.apache.ranger.entity.XXService; import org.apache.ranger.entity.XXServiceDef; @@ -88,7 +87,7 @@ public class TagDBStore extends AbstractTagStore { RESTErrorUtil errorUtil; @Autowired - RangerAuditFields<XXDBBase> rangerAuditFields; + RangerAuditFields rangerAuditFields; @Autowired GUIDUtil guidUtil; @@ -1044,7 +1043,7 @@ public class TagDBStore extends AbstractTagStore { xAttrDef.setTagDefId(tagDefId); xAttrDef.setName(attrDef.getName()); xAttrDef.setType(attrDef.getType()); - xAttrDef = (XXTagAttributeDef) rangerAuditFields.populateAuditFieldsForCreate(xAttrDef); + xAttrDef = rangerAuditFields.populateAuditFieldsForCreate(xAttrDef); xAttrDef = daoManager.getXXTagAttributeDef().create(xAttrDef); @@ -1092,7 +1091,7 @@ public class TagDBStore extends AbstractTagStore { xTagAttr.setTagId(tagId); xTagAttr.setName(attr.getKey()); xTagAttr.setValue(attr.getValue()); - xTagAttr = (XXTagAttribute) rangerAuditFields.populateAuditFieldsForCreate(xTagAttr); + xTagAttr = rangerAuditFields.populateAuditFieldsForCreate(xTagAttr); xTagAttr = daoManager.getXXTagAttribute().create(xTagAttr); @@ -1161,7 +1160,7 @@ public class TagDBStore extends AbstractTagStore { resourceElement.setResDefId(xResDef.getId()); resourceElement.setResourceId(resourceId); - resourceElement = (XXServiceResourceElement) rangerAuditFields.populateAuditFieldsForCreate(resourceElement); + resourceElement = rangerAuditFields.populateAuditFieldsForCreate(resourceElement); resourceElement = daoManager.getXXServiceResourceElement().create(resourceElement); @@ -1171,7 +1170,7 @@ public class TagDBStore extends AbstractTagStore { resourceElementValue.setResElementId(resourceElement.getId()); resourceElementValue.setValue(resVal); resourceElementValue.setSortOrder(sortOrder); - resourceElementValue = (XXServiceResourceElementValue) rangerAuditFields.populateAuditFieldsForCreate(resourceElementValue); + resourceElementValue = rangerAuditFields.populateAuditFieldsForCreate(resourceElementValue); resourceElementValue = daoManager.getXXServiceResourceElementValue().create(resourceElementValue); sortOrder++; http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/security-admin/src/main/java/org/apache/ranger/service/RangerAuditFields.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerAuditFields.java b/security-admin/src/main/java/org/apache/ranger/service/RangerAuditFields.java index 7223f10..e6a519a 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerAuditFields.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerAuditFields.java @@ -23,9 +23,9 @@ import org.apache.ranger.entity.XXDBBase; import org.springframework.stereotype.Component; @Component -public class RangerAuditFields<T extends XXDBBase> { +public class RangerAuditFields { - public T populateAuditFields(T xObj, T parentObj) { + public <T extends XXDBBase, PARENT extends XXDBBase> T populateAuditFields(T xObj, PARENT parentObj) { xObj.setCreateTime(parentObj.getCreateTime()); xObj.setUpdateTime(parentObj.getUpdateTime()); xObj.setAddedByUserId(parentObj.getAddedByUserId()); @@ -33,7 +33,7 @@ public class RangerAuditFields<T extends XXDBBase> { return xObj; } - public T populateAuditFieldsForCreate(T xObj) { + public <T extends XXDBBase> T populateAuditFieldsForCreate(T xObj) { xObj.setCreateTime(DateUtil.getUTCDate()); xObj.setUpdateTime(DateUtil.getUTCDate()); xObj.setAddedByUserId(ContextUtil.getCurrentUserId()); http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java index ca3a7ba..c2e7b76 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java @@ -56,7 +56,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDefBase, V private static final Log LOG = LogFactory.getLog(RangerServiceDefServiceBase.class); @Autowired - RangerAuditFields<XXDBBase> rangerAuditFields; + RangerAuditFields rangerAuditFields; @Autowired JSONUtil jsonUtil; @@ -236,7 +236,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDefBase, V throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - xObj = (XXServiceConfigDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); + xObj = rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); @@ -282,7 +282,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDefBase, V throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - xObj = (XXResourceDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); + xObj = rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); @@ -341,7 +341,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDefBase, V throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - xObj = (XXAccessTypeDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); + xObj = rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); @@ -370,7 +370,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDefBase, V throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - xObj = (XXPolicyConditionDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); + xObj = rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); @@ -412,7 +412,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDefBase, V throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - xObj = (XXContextEnricherDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); + xObj = rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); @@ -438,7 +438,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDefBase, V throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - xObj = (XXEnumDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); + xObj = rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); @@ -471,7 +471,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDefBase, V throw restErrorUtil.createRESTException("enumDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - xObj = (XXEnumElementDef) rangerAuditFields.populateAuditFields(xObj, enumDef); + xObj = rangerAuditFields.populateAuditFields(xObj, enumDef); xObj.setEnumdefid(enumDef.getId()); xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); @@ -497,7 +497,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDefBase, V throw restErrorUtil.createRESTException("RangerServiceDef cannot be null.", MessageEnums.DATA_NOT_FOUND); } - xObj = (XXDataMaskTypeDef) rangerAuditFields.populateAuditFields(xObj, serviceDef); + xObj = rangerAuditFields.populateAuditFields(xObj, serviceDef); xObj.setDefid(serviceDef.getId()); xObj.setItemId(vObj.getItemId()); xObj.setName(vObj.getName()); http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefServiceBase.java index b85197c..408358c 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerTagDefServiceBase.java @@ -25,7 +25,6 @@ import java.util.List; import org.apache.commons.lang.StringUtils; import org.apache.ranger.common.GUIDUtil; import org.apache.ranger.common.RangerConfigUtil; -import org.apache.ranger.entity.XXDBBase; import org.apache.ranger.entity.XXTagAttributeDef; import org.apache.ranger.entity.XXTagDef; import org.apache.ranger.plugin.model.RangerTagDef; @@ -41,7 +40,7 @@ public abstract class RangerTagDefServiceBase<T extends XXTagDef, V extends Rang GUIDUtil guidUtil; @Autowired - RangerAuditFields<XXDBBase> rangerAuditFields; + RangerAuditFields rangerAuditFields; @Autowired RangerConfigUtil configUtil; @@ -108,7 +107,7 @@ public abstract class RangerTagDefServiceBase<T extends XXTagDef, V extends Rang xTagAttrDef = new XXTagAttributeDef(); } - xTagAttrDef = (XXTagAttributeDef) rangerAuditFields.populateAuditFields(xTagAttrDef, parentObj); + xTagAttrDef = rangerAuditFields.populateAuditFields(xTagAttrDef, parentObj); xTagAttrDef.setTagDefId(parentObj.getId()); xTagAttrDef.setName(attrDef.getName()); http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/security-admin/src/main/java/org/apache/ranger/service/RangerTagServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerTagServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerTagServiceBase.java index 6305099..e68aa92 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerTagServiceBase.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerTagServiceBase.java @@ -29,7 +29,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.ranger.common.GUIDUtil; import org.apache.ranger.common.MessageEnums; import org.apache.ranger.common.RangerConfigUtil; -import org.apache.ranger.entity.XXDBBase; import org.apache.ranger.entity.XXTagAttribute; import org.apache.ranger.entity.XXTag; import org.apache.ranger.entity.XXTagDef; @@ -45,7 +44,7 @@ public abstract class RangerTagServiceBase<T extends XXTag, V extends RangerTag> GUIDUtil guidUtil; @Autowired - RangerAuditFields<XXDBBase> rangerAuditFields; + RangerAuditFields rangerAuditFields; @Autowired RangerConfigUtil configUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java index 92b8151..531674a 100644 --- a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java +++ b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java @@ -109,7 +109,7 @@ public class TestServiceDBStore { XUserMgr xUserMgr; @Mock - RangerAuditFields<XXDBBase> rangerAuditFields; + RangerAuditFields rangerAuditFields; @Mock ContextUtil contextUtil; @@ -1218,7 +1218,7 @@ public class TestServiceDBStore { XXServiceConfigMap xConfMap = new XXServiceConfigMap(); Mockito.when(rangerAuditFields.populateAuditFields(xConfMap, xService)) - .thenReturn(xService); + .thenReturn(xConfMap); Mockito.when(svcService.getPopulatedViewObject(xService)).thenReturn( rangerService); @@ -2744,7 +2744,7 @@ public class TestServiceDBStore { XXServiceConfigMap xConfMap = new XXServiceConfigMap(); Mockito.when(rangerAuditFields.populateAuditFields(xConfMap, xService)) - .thenReturn(xService); + .thenReturn(xConfMap); Mockito.when(svcService.getPopulatedViewObject(xService)).thenReturn( rangerService); http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/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 c546747..4c83c87 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 @@ -45,7 +45,6 @@ import org.apache.ranger.common.UserSessionBase; import org.apache.ranger.db.RangerDaoManager; import org.apache.ranger.db.XXServiceDao; import org.apache.ranger.db.XXServiceDefDao; -import org.apache.ranger.entity.XXDBBase; import org.apache.ranger.entity.XXService; import org.apache.ranger.entity.XXServiceDef; import org.apache.ranger.plugin.model.RangerPolicy; @@ -141,7 +140,7 @@ public class TestServiceREST { XUserMgr userMgr; @Mock - RangerAuditFields<XXDBBase> rangerAuditFields; + RangerAuditFields rangerAuditFields; @Mock ContextUtil contextUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyServiceBase.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyServiceBase.java index 7910cbd..803a0cb 100644 --- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyServiceBase.java +++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerPolicyServiceBase.java @@ -30,7 +30,6 @@ import org.apache.ranger.common.RangerSearchUtil; import org.apache.ranger.common.UserSessionBase; import org.apache.ranger.db.RangerDaoManager; import org.apache.ranger.db.XXServiceDao; -import org.apache.ranger.entity.XXDBBase; import org.apache.ranger.entity.XXPolicy; import org.apache.ranger.entity.XXService; import org.apache.ranger.plugin.model.RangerPolicy; @@ -71,9 +70,6 @@ public class TestRangerPolicyServiceBase { ContextUtil contextUtil; @Mock - RangerAuditFields<XXDBBase> rangerAuditFields; - - @Mock RangerBizUtil rangerBizUtil; @Mock http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java index b73a629..06ac327 100644 --- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java +++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceDefServiceBase.java @@ -39,7 +39,6 @@ import org.apache.ranger.db.XXEnumElementDefDao; import org.apache.ranger.db.XXResourceDefDao; import org.apache.ranger.entity.XXAccessTypeDef; import org.apache.ranger.entity.XXContextEnricherDef; -import org.apache.ranger.entity.XXDBBase; import org.apache.ranger.entity.XXEnumDef; import org.apache.ranger.entity.XXEnumElementDef; import org.apache.ranger.entity.XXPolicyConditionDef; @@ -89,7 +88,7 @@ public class TestRangerServiceDefServiceBase { ContextUtil contextUtil; @Mock - RangerAuditFields<XXDBBase> rangerAuditFields; + RangerAuditFields rangerAuditFields; @Mock RangerBizUtil rangerBizUtil; http://git-wip-us.apache.org/repos/asf/ranger/blob/6a602cad/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefServiceBase.java ---------------------------------------------------------------------- diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefServiceBase.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefServiceBase.java index 803191c..15fd503 100644 --- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefServiceBase.java +++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerTagDefServiceBase.java @@ -17,7 +17,6 @@ package org.apache.ranger.service; import org.apache.ranger.db.RangerDaoManager; -import org.apache.ranger.entity.XXDBBase; import org.apache.ranger.entity.XXTagDef; import org.apache.ranger.plugin.model.RangerTagDef; import org.junit.Assert; @@ -47,9 +46,6 @@ public class TestRangerTagDefServiceBase { @Mock RangerDaoManager daoMgr; - @Mock - RangerAuditFields<XXDBBase> rangerAuditFields; - @Rule public ExpectedException thrown = ExpectedException.none();
