You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by zs...@apache.org on 2018/05/10 09:49:36 UTC
ranger git commit: RANGER-2096: Remove unused code from
AbstractBaseResourceService
Repository: ranger
Updated Branches:
refs/heads/master e1912c8dc -> 5ab18c4dd
RANGER-2096: Remove unused code from AbstractBaseResourceService
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/5ab18c4d
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/5ab18c4d
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/5ab18c4d
Branch: refs/heads/master
Commit: 5ab18c4ddd5bda99a7f1722728bed41b84de788c
Parents: e1912c8
Author: Zsombor Gegesy <zs...@apache.org>
Authored: Wed May 2 21:48:29 2018 +0200
Committer: Zsombor Gegesy <zs...@apache.org>
Committed: Thu May 10 11:23:52 2018 +0200
----------------------------------------------------------------------
.../org/apache/ranger/biz/RangerBizUtil.java | 63 --------------------
.../service/AbstractBaseResourceService.java | 27 ---------
.../apache/ranger/biz/TestRangerBizUtil.java | 51 +---------------
3 files changed, 3 insertions(+), 138 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/5ab18c4d/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
index 00bda59..da71446 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/RangerBizUtil.java
@@ -46,7 +46,6 @@ import org.apache.ranger.common.RangerCommonEnums;
import org.apache.ranger.common.RangerConstants;
import org.apache.ranger.common.StringUtil;
import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.entity.XXAsset;
import org.apache.ranger.entity.XXDBBase;
@@ -61,8 +60,6 @@ import org.apache.ranger.entity.XXUser;
import org.apache.ranger.plugin.model.RangerBaseModelObject;
import org.apache.ranger.plugin.model.RangerService;
import org.apache.ranger.plugin.store.EmbeddedServiceDefsUtil;
-import org.apache.ranger.service.AbstractBaseResourceService;
-import org.apache.ranger.view.VXDataObject;
import org.apache.ranger.view.VXPortalUser;
import org.apache.ranger.view.VXResource;
import org.apache.ranger.view.VXResponse;
@@ -297,49 +294,6 @@ public class RangerBizUtil {
return null;
}
- public XXDBBase getMObject(int objClassType, Long objId) {
- XXDBBase obj = null;
-
- if (objId != null) {
- BaseDao<?> dao = daoManager.getDaoForClassType(objClassType);
-
- if (dao != null) {
- obj = (XXDBBase) dao.getById(objId);
- }
- }
-
- return obj;
- }
-
- public XXDBBase getMObject(VXDataObject vXDataObject) {
- if (vXDataObject != null) {
- return getMObject(vXDataObject.getMyClassType(),
- vXDataObject.getId());
- }
- return null;
- }
-
- public VXDataObject getVObject(int objClassType, Long objId) {
- if (objId == null) {
- return null;
- }
- if (objClassType == RangerConstants.CLASS_TYPE_USER_PROFILE) {
- return userMgr.mapXXPortalUserVXPortalUser(daoManager
- .getXXPortalUser().getById(objId));
- }
- try {
- AbstractBaseResourceService<?, ?> myService = AbstractBaseResourceService
- .getService(objClassType);
- if (myService != null) {
- return myService.readResource(objId);
- }
- } catch (Throwable t) {
- logger.error("Error reading resource. objectClassType="
- + objClassType + ", objectId=" + objId, t);
- }
- return null;
- }
-
public void deleteReferencedObjects(XXDBBase obj) {
if (obj == null) {
@@ -351,23 +305,6 @@ public class RangerBizUtil {
}
- /**
- * @param obj
- */
- void deleteObjects(List<XXDBBase> objs) {
-
- }
-
- void deleteObject(XXDBBase obj) {
- AbstractBaseResourceService<?, ?> myService = AbstractBaseResourceService
- .getService(obj.getMyClassType());
- if (myService != null) {
- myService.deleteResource(obj.getId());
- } else {
- logger.error("Service not found for obj=" + obj, new Throwable());
- }
- }
-
public <T extends XXDBBase> Class<? extends XXDBBase> getContextObject(
int objectClassType, Long objectId) {
return null;
http://git-wip-us.apache.org/repos/asf/ranger/blob/5ab18c4d/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 a64bb30..4157fc7 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
@@ -73,8 +73,6 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
public static final int OPERATION_CREATE_CONTEXT = 1;
public static final int OPERATION_UPDATE_CONTEXT = 2;
- static HashMap<Integer, AbstractBaseResourceService<?, ?>> serviceList = new HashMap<Integer, AbstractBaseResourceService<?, ?>>();
- static List<AbstractBaseResourceService<?, ?>> preServiceList = new ArrayList<AbstractBaseResourceService<?, ?>>();
protected Class<T> tEntityClass;
protected Class<V> tViewClass;
@@ -126,30 +124,6 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
protected abstract V mapEntityToViewBean(V viewBean, T t);
- public static void registerService(
- AbstractBaseResourceService<?, ?> baseService) {
- preServiceList.add(baseService);
- }
-
- static public AbstractBaseResourceService<?, ?> getService(int classType) {
- AbstractBaseResourceService<?, ?> service = serviceList.get(classType);
- if (service == null) {
- for (AbstractBaseResourceService<?, ?> myService : preServiceList) {
- if (myService.getClassType() == classType) {
- serviceList.put(myService.getClassType(), myService);
- service = myService;
- break;
- }
- }
- }
-
- if (service == null) {
- logger.error("Service not found for classType=" + classType,
- new Throwable());
- }
- return service;
- }
-
protected String getResourceName() {
String resourceName = tEntityValueMap.get(tEntityClass);
@@ -239,7 +213,6 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
+ className + " obj ";
distinctQueryStr = "SELECT distinct obj FROM " + className + " obj ";
sortFields.add(new SortField("id", "obj.id",true,SORT_ORDER.ASC));
- registerService(this);
}
// ----------------------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/5ab18c4d/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
index 174f919..81bc548 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestRangerBizUtil.java
@@ -28,25 +28,20 @@ import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.ContextUtil;
import org.apache.ranger.common.MessageEnums;
import org.apache.ranger.common.RESTErrorUtil;
-import org.apache.ranger.common.RangerCommonEnums;
import org.apache.ranger.common.RangerConstants;
import org.apache.ranger.common.StringUtil;
import org.apache.ranger.common.UserSessionBase;
-import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.db.RangerDaoManager;
import org.apache.ranger.db.XXAssetDao;
import org.apache.ranger.db.XXPortalUserDao;
import org.apache.ranger.db.XXResourceDao;
import org.apache.ranger.db.XXUserDao;
import org.apache.ranger.entity.XXAsset;
-import org.apache.ranger.entity.XXDBBase;
import org.apache.ranger.entity.XXPortalUser;
import org.apache.ranger.entity.XXResource;
import org.apache.ranger.entity.XXUser;
import org.apache.ranger.security.context.RangerContextHolder;
import org.apache.ranger.security.context.RangerSecurityContext;
-import org.apache.ranger.view.VXAsset;
-import org.apache.ranger.view.VXDataObject;
import org.apache.ranger.view.VXPortalUser;
import org.apache.ranger.view.VXResource;
import org.apache.ranger.view.VXResponse;
@@ -447,49 +442,9 @@ public class TestRangerBizUtil {
@Test
public void testGetMimeTypeInt_ForPNG(){
int mimeTypeChk = rangerBizUtil.getMimeTypeInt("png");
- Assert.assertEquals(RangerConstants.MIME_PNG, mimeTypeChk);
- }
-
- @SuppressWarnings({ "unchecked", "rawtypes" })
- @Test
- public void testGetMObject(){
- BaseDao baseDao = Mockito.mock(BaseDao.class);
- Mockito.when(daoManager.getDaoForClassType(RangerCommonEnums.CLASS_TYPE_USER_PROFILE)).thenReturn(baseDao);
- Mockito.when(baseDao.getById(id)).thenReturn(new XXAsset());
- XXDBBase mObjChk = rangerBizUtil.getMObject(RangerCommonEnums.CLASS_TYPE_USER_PROFILE,id);
- Assert.assertNotNull(mObjChk);
- }
-
- @Test
- public void testGetMObject_NoObjId(){
- XXDBBase mObjChk = rangerBizUtil.getMObject(RangerCommonEnums.CLASS_TYPE_USER_PROFILE,null);
- Assert.assertNull(mObjChk);
- }
-
- @SuppressWarnings({ "rawtypes", "unchecked" })
- @Test
- public void testGetMObject_VXDataObject(){
- VXAsset vXDataObject = new VXAsset();
- vXDataObject.setId(id);
- BaseDao baseDao = Mockito.mock(BaseDao.class);
- Mockito.when(daoManager.getDaoForClassType(vXDataObject.getMyClassType())).thenReturn(baseDao);
- Mockito.when(baseDao.getById(vXDataObject.getId())).thenReturn(new XXAsset());
- XXDBBase xXDBaseChk = rangerBizUtil.getMObject(vXDataObject);
- Assert.assertNotNull(xXDBaseChk);
- }
-
- @Test
- public void testGetMObject_NOVXDataObject(){
- XXDBBase xXDBaseChk = rangerBizUtil.getMObject(null);
- Assert.assertNull(xXDBaseChk);
- }
-
- @Test
- public void testGetVObject_NOObjId(){
- VXDataObject objchk = rangerBizUtil.getVObject(RangerConstants.CLASS_TYPE_USER_PROFILE, null);
- Assert.assertNull(objchk);
- }
-
+ Assert.assertEquals(RangerConstants.MIME_PNG, mimeTypeChk);
+ }
+
@Test
public void testMatchHdfsPolicy_NoResourceName(){
boolean bnlChk = rangerBizUtil.matchHbasePolicy(null, null, null, id, AppConstants.XA_PERM_TYPE_UNKNOWN);