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/22 13:27:26 UTC
[1/2] ranger git commit: RANGER-2107: Add @Service annotations to the
DAOs, and use Spring for injecting into as 'entityDao' by generic types,
and remove the unnecessary code from the 'RangerDaoManager' classes,
and from the RangerBizUtil
Repository: ranger
Updated Branches:
refs/heads/master 6504a70ee -> 845133347
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/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 7dda83e..22e290a 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
@@ -16,7 +16,6 @@
*/
package org.apache.ranger.biz;
-import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -303,147 +302,7 @@ public class TestRangerBizUtil {
String publicNameChk = rangerBizUtil.generatePublicName(vXPortalUser, null);
Assert.assertNull(publicNameChk);
}
-
- @Test
- public void testGetDisplayName_EmptyName() {
- String displayNameChk = rangerBizUtil.getDisplayName(null);
- Assert.assertEquals(rangerBizUtil.EMPTY_CONTENT_DISPLAY_NAME, displayNameChk);
- }
-
- @Test
- public void testGetDisplayName_AssetName() {
- XXAsset obj = new XXAsset();
- obj.setDescription(resourceName);
- String displayNameChk = rangerBizUtil.getDisplayName(obj);
- Assert.assertEquals(resourceName, displayNameChk);
- }
-
- @Test
- public void testGetDisplayName_MoreThanMaxLen() {
- XXAsset obj = new XXAsset();
- String name = resourceName;
- for(int i=0;i<16;i++){
- name = name + "_" + name + "1";
- }
- obj.setDescription(name);
- String displayNameChk = rangerBizUtil.getDisplayName(obj);
- Assert.assertEquals(displayNameChk.length(), 150);
- }
-
- @Test
- public void testGetDisplayNameForClassName(){
- XXAsset obj = new XXAsset();
- String displayNameChk = rangerBizUtil.getDisplayNameForClassName(obj);
- Assert.assertEquals("Asset",displayNameChk);
- }
-
- @Test
- public void testGetFileNameWithoutExtension(){
- File file = new File("test.txt");
- String fileNameChk = rangerBizUtil.getFileNameWithoutExtension(file);
- Assert.assertEquals("test",fileNameChk);
- }
-
- @Test
- public void testGetFileNameWithoutExtension_NoFile(){
- String fileNameChk = rangerBizUtil.getFileNameWithoutExtension(null);
- Assert.assertNull(fileNameChk);
- }
-
- @Test
- public void testGetFileNameWithoutExtension_noExt(){
- File file = new File("test");
- String fileNameChk = rangerBizUtil.getFileNameWithoutExtension(file);
- Assert.assertEquals("test",fileNameChk);
- }
-
- @Test
- public void testGetImageExtension_TestJPG(){
- String contentType = "img.JPG";
- String extChk = rangerBizUtil.getImageExtension(contentType);
- Assert.assertEquals("jpg",extChk);
- }
-
- @Test
- public void testGetImageExtension_TestJPEG(){
- String contentType = "img.JPEG";
- String extChk = rangerBizUtil.getImageExtension(contentType);
- Assert.assertEquals("jpg",extChk);
- }
-
- @Test
- public void testGetImageExtension_TestPNG(){
- String contentType = "img.PNG";
- String extChk = rangerBizUtil.getImageExtension(contentType);
- Assert.assertEquals("png",extChk);
- }
-
- @Test
- public void testGetImageExtension_NoExt(){
- String contentType = "img";
- String extChk = rangerBizUtil.getImageExtension(contentType);
- Assert.assertEquals("",extChk);
- }
-
- @Test
- public void testGetMimeType_ForJPG(){
- String mimeTypeChk = rangerBizUtil.getMimeType(RangerConstants.MIME_JPEG);
- Assert.assertEquals("jpg",mimeTypeChk);
- }
-
- @Test
- public void testGetMimeType_ForPNG(){
- String mimeTypeChk = rangerBizUtil.getMimeType(RangerConstants.MIME_PNG);
- Assert.assertEquals("png",mimeTypeChk);
- }
-
- @Test
- public void testGetMimeType_ForEmpty(){
- String mimeTypeChk = rangerBizUtil.getMimeType(1);
- Assert.assertEquals("",mimeTypeChk);
- }
-
- @Test
- public void testGetMimeTypeInt_ForUnknow(){
- int mimeTypeChk = rangerBizUtil.getMimeTypeInt("");
- Assert.assertEquals(RangerConstants.MIME_UNKNOWN, mimeTypeChk);
- }
-
- @Test
- public void testGetMimeTypeInt_Forjpg(){
- int mimeTypeChk = rangerBizUtil.getMimeTypeInt("jpg");
- Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk);
- }
-
- @Test
- public void testGetMimeTypeInt_ForJPEG(){
- int mimeTypeChk = rangerBizUtil.getMimeTypeInt("JPEG");
- Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk);
- }
-
- @Test
- public void testGetMimeTypeInt_EndsWithJPEG(){
- int mimeTypeChk = rangerBizUtil.getMimeTypeInt("txt.jpeg");
- Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk);
- }
-
- @Test
- public void testGetMimeTypeInt_EndsWithJPG(){
- int mimeTypeChk = rangerBizUtil.getMimeTypeInt("txt.jpg");
- Assert.assertEquals(RangerConstants.MIME_JPEG, mimeTypeChk);
- }
-
- @Test
- public void testGetMimeTypeInt_EndsWithPNG(){
- int mimeTypeChk = rangerBizUtil.getMimeTypeInt("txt.png");
- Assert.assertEquals(RangerConstants.MIME_PNG, mimeTypeChk);
- }
-
- @Test
- public void testGetMimeTypeInt_ForPNG(){
- int mimeTypeChk = rangerBizUtil.getMimeTypeInt("png");
- Assert.assertEquals(RangerConstants.MIME_PNG, mimeTypeChk);
- }
+
@Test
public void testMatchHdfsPolicy_NoResourceName(){
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/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 685c8ea..f4ea957 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
@@ -73,6 +73,9 @@ public class TestRangerServiceDefService {
@Mock
XUserService xUserService;
+ @Mock
+ XXServiceDefDao xServiceDefDao;
+
@Rule
public ExpectedException thrown = ExpectedException.none();
@@ -344,7 +347,6 @@ public class TestRangerServiceDefService {
@Test
public void test4getAllServiceDefs() {
- XXServiceDefDao xServiceDefDao = Mockito.mock(XXServiceDefDao.class);
XXPortalUserDao xPortalUserDao = Mockito.mock(XXPortalUserDao.class);
XXResourceDefDao xResourceDefDao = Mockito.mock(XXResourceDefDao.class);
@@ -497,7 +499,6 @@ public class TestRangerServiceDefService {
enumElementDefObj.setOrder(0);
xElementsList.add(enumElementDefObj);
- Mockito.when(daoManager.getXXServiceDef()).thenReturn(xServiceDefDao);
Mockito.when(xServiceDefDao.getAll()).thenReturn(xServiceDefList);
Mockito.when(daoManager.getXXPortalUser()).thenReturn(xPortalUserDao);
@@ -541,7 +542,6 @@ public class TestRangerServiceDefService {
List<RangerServiceDef> dbRangerServiceDef = serviceDefService
.getAllServiceDefs();
Assert.assertNotNull(dbRangerServiceDef);
- Mockito.verify(daoManager).getXXServiceConfigDef();
Mockito.verify(daoManager).getXXResourceDef();
Mockito.verify(daoManager).getXXAccessTypeDef();
Mockito.verify(daoManager).getXXPolicyConditionDef();
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/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 a56809d..74f1dd0 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
@@ -100,6 +100,9 @@ public class TestRangerServiceDefServiceBase {
@Mock
JSONUtil jsonUtil;
+ @Mock
+ BaseDao<XXServiceDef> baseDao;
+
@Rule
public ExpectedException thrown = ExpectedException.none();
@@ -784,14 +787,8 @@ public class TestRangerServiceDefServiceBase {
searchFilter.setParam(SearchFilter.POLICY_NAME, "policyName");
searchFilter.setParam(SearchFilter.SERVICE_NAME, "serviceName");
- BaseDao baseDao = Mockito.mock(BaseDao.class);
-
- Mockito.when(daoManager.getDaoForClassName(Mockito.anyString()))
- .thenReturn(baseDao);
-
RangerServiceDefList dbRangerServiceDefList = rangerServiceDefService
.searchRangerServiceDefs(searchFilter);
Assert.assertNotNull(dbRangerServiceDefList);
- Mockito.verify(daoManager).getDaoForClassName(Mockito.anyString());
}
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
index 43c49e4..d90e978 100644
--- a/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
+++ b/security-admin/src/test/java/org/apache/ranger/service/TestRangerServiceServiceBase.java
@@ -66,6 +66,9 @@ public class TestRangerServiceServiceBase {
@Mock
RangerBizUtil bizUtil;
+ @Mock
+ BaseDao<XXService> baseDao;
+
@Rule
public ExpectedException thrown = ExpectedException.none();
@@ -205,13 +208,9 @@ public class TestRangerServiceServiceBase {
searchFilter.setParam(SearchFilter.POLICY_NAME, "policyName");
searchFilter.setParam(SearchFilter.SERVICE_NAME, "serviceName");
- BaseDao baseDao = Mockito.mock(BaseDao.class);
- Mockito.when(daoManager.getDaoForClassName(Mockito.anyString()))
- .thenReturn(baseDao);
RangerServiceList dbRangerServiceList = rangerServiceService
.searchRangerServices(searchFilter);
Assert.assertNotNull(dbRangerServiceList);
- Mockito.verify(daoManager).getDaoForClassName(Mockito.anyString());
}
}
[2/2] ranger git commit: RANGER-2107: Add @Service annotations to the
DAOs, and use Spring for injecting into as 'entityDao' by generic types,
and remove the unnecessary code from the 'RangerDaoManager' classes,
and from the RangerBizUtil
Posted by zs...@apache.org.
RANGER-2107: Add @Service annotations to the DAOs, and use Spring for injecting into as 'entityDao' by generic types, and remove the unnecessary code from the 'RangerDaoManager' classes, and from the RangerBizUtil
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/84513334
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/84513334
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/84513334
Branch: refs/heads/master
Commit: 84513334719958539fbddfbd12e3c95e4804a1fb
Parents: 6504a70
Author: Zsombor Gegesy <zs...@apache.org>
Authored: Sun May 20 22:55:04 2018 +0200
Committer: Zsombor Gegesy <zs...@apache.org>
Committed: Tue May 22 11:48:18 2018 +0200
----------------------------------------------------------------------
.../org/apache/ranger/biz/RangerBizUtil.java | 158 ---------
.../apache/ranger/common/RangerSearchUtil.java | 4 +-
.../org/apache/ranger/common/SearchUtil.java | 9 +-
.../org/apache/ranger/db/RangerDaoManager.java | 13 -
.../apache/ranger/db/RangerDaoManagerBase.java | 341 -------------------
.../org/apache/ranger/db/XXAccessAuditDao.java | 2 +
.../apache/ranger/db/XXAccessTypeDefDao.java | 2 +
.../ranger/db/XXAccessTypeDefGrantsDao.java | 2 +
.../java/org/apache/ranger/db/XXAssetDao.java | 2 +
.../org/apache/ranger/db/XXAuditMapDao.java | 2 +
.../org/apache/ranger/db/XXAuthSessionDao.java | 2 +
.../ranger/db/XXContextEnricherDefDao.java | 2 +
.../apache/ranger/db/XXCredentialStoreDao.java | 2 +
.../java/org/apache/ranger/db/XXDBBaseDao.java | 2 +
.../org/apache/ranger/db/XXDataHistDao.java | 3 +
.../apache/ranger/db/XXDataMaskTypeDefDao.java | 2 +
.../java/org/apache/ranger/db/XXEnumDefDao.java | 2 +
.../apache/ranger/db/XXEnumElementDefDao.java | 2 +
.../java/org/apache/ranger/db/XXGroupDao.java | 2 +
.../org/apache/ranger/db/XXGroupGroupDao.java | 2 +
.../apache/ranger/db/XXGroupPermissionDao.java | 2 +
.../org/apache/ranger/db/XXGroupUserDao.java | 2 +
.../org/apache/ranger/db/XXModuleDefDao.java | 2 +
.../java/org/apache/ranger/db/XXPermMapDao.java | 2 +
.../org/apache/ranger/db/XXPluginInfoDao.java | 3 +-
.../ranger/db/XXPolicyConditionDefDao.java | 2 +
.../java/org/apache/ranger/db/XXPolicyDao.java | 2 +
.../ranger/db/XXPolicyExportAuditDao.java | 2 +
.../apache/ranger/db/XXPolicyItemAccessDao.java | 2 +
.../ranger/db/XXPolicyItemConditionDao.java | 2 +
.../org/apache/ranger/db/XXPolicyItemDao.java | 2 +
.../ranger/db/XXPolicyItemDataMaskInfoDao.java | 2 +
.../ranger/db/XXPolicyItemGroupPermDao.java | 2 +
.../ranger/db/XXPolicyItemRowFilterInfoDao.java | 2 +
.../ranger/db/XXPolicyItemUserPermDao.java | 2 +
.../org/apache/ranger/db/XXPolicyLabelDao.java | 2 +
.../apache/ranger/db/XXPolicyLabelMapDao.java | 2 +
.../apache/ranger/db/XXPolicyResourceDao.java | 2 +
.../ranger/db/XXPolicyResourceMapDao.java | 2 +
.../ranger/db/XXPolicyWithAssignedIdDao.java | 2 +
.../org/apache/ranger/db/XXPortalUserDao.java | 2 +
.../apache/ranger/db/XXPortalUserRoleDao.java | 2 +
.../org/apache/ranger/db/XXResourceDao.java | 2 +
.../org/apache/ranger/db/XXResourceDefDao.java | 2 +
.../apache/ranger/db/XXServiceConfigDefDao.java | 2 +
.../apache/ranger/db/XXServiceConfigMapDao.java | 2 +
.../java/org/apache/ranger/db/XXServiceDao.java | 2 +
.../org/apache/ranger/db/XXServiceDefDao.java | 2 +
.../db/XXServiceDefWithAssignedIdDao.java | 2 +
.../apache/ranger/db/XXServiceResourceDao.java | 2 +
.../ranger/db/XXServiceResourceElementDao.java | 2 +
.../db/XXServiceResourceElementValueDao.java | 2 +
.../ranger/db/XXServiceVersionInfoDao.java | 3 +-
.../ranger/db/XXServiceWithAssignedIdDao.java | 2 +
.../org/apache/ranger/db/XXTagAttributeDao.java | 2 +
.../apache/ranger/db/XXTagAttributeDefDao.java | 2 +
.../java/org/apache/ranger/db/XXTagDao.java | 2 +
.../java/org/apache/ranger/db/XXTagDefDao.java | 2 +
.../apache/ranger/db/XXTagResourceMapDao.java | 2 +
.../java/org/apache/ranger/db/XXTrxLogDao.java | 2 +
.../apache/ranger/db/XXUgsyncAuditInfoDao.java | 2 +
.../java/org/apache/ranger/db/XXUserDao.java | 2 +
.../apache/ranger/db/XXUserPermissionDao.java | 2 +
.../service/AbstractBaseResourceService.java | 17 +-
.../ranger/service/AuthSessionService.java | 14 -
.../ranger/service/RangerBaseModelService.java | 15 +-
.../ranger/service/RangerPluginInfoService.java | 2 +-
.../ranger/service/RangerServiceDefService.java | 2 +-
.../apache/ranger/biz/TestRangerBizUtil.java | 143 +-------
.../service/TestRangerServiceDefService.java | 6 +-
.../TestRangerServiceDefServiceBase.java | 9 +-
.../service/TestRangerServiceServiceBase.java | 7 +-
72 files changed, 139 insertions(+), 720 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/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 da71446..b304e3e 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
@@ -19,13 +19,11 @@
package org.apache.ranger.biz;
-import java.io.File;
import java.security.SecureRandom;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
@@ -42,7 +40,6 @@ import org.apache.ranger.common.GUIDUtil;
import org.apache.ranger.common.MessageEnums;
import org.apache.ranger.common.PropertiesUtil;
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;
@@ -91,7 +88,6 @@ public class RangerBizUtil {
Set<Class<?>> groupEditableClasses;
private Class<?>[] groupEditableClassesList = {};
- Map<String, Integer> classTypeMappings = new HashMap<String, Integer>();
private int maxFirstNameLength;
int maxDisplayNameLength = 150;
public final String EMPTY_CONTENT_DISPLAY_NAME = "...";
@@ -122,39 +118,6 @@ public class RangerBizUtil {
random = new SecureRandom();
}
- public <T extends XXDBBase> List<? extends XXDBBase> getParentObjects(
- T object) {
- List<XXDBBase> parentObjectList = null;
- // if (checkParentAcess.contains(object.getMyClassType())) {
- // parentObjectList = new ArrayList<MBase>();
- // }
- return parentObjectList;
- }
-
- public int getClassType(Class<?> klass) {
- String className = klass.getName();
- // See if this mapping is already in the database
- Integer classType = classTypeMappings.get(className);
- if (classType == null) {
- // Instantiate the class and call the getClassType method
- if (XXDBBase.class.isAssignableFrom(klass)) {
- try {
- XXDBBase gjObj = (XXDBBase) klass.newInstance();
- classType = gjObj.getMyClassType();
- classTypeMappings.put(className, classType);
- } catch (Throwable ex) {
- logger.error("Error instantiating object for class "
- + className, ex);
- }
- }
- }
- if (classType == null) {
- return RangerCommonEnums.CLASS_TYPE_NONE;
- } else {
- return classType;
- }
- }
-
// Access control methods
public void checkSystemAdminAccess() {
UserSessionBase currentUserSession = ContextUtil
@@ -167,101 +130,6 @@ public class RangerBizUtil {
}
/**
- * @param contentType
- * @return
- */
- public int getMimeTypeInt(String contentType) {
- if ("JPEG".equalsIgnoreCase(contentType)
- || "JPG".equalsIgnoreCase(contentType)
- || contentType.endsWith("jpg") || contentType.endsWith("jpeg")) {
- return RangerConstants.MIME_JPEG;
- }
- if ("PNG".equalsIgnoreCase(contentType) || contentType.endsWith("png")) {
- return RangerConstants.MIME_PNG;
- }
- return RangerConstants.MIME_UNKNOWN;
- }
-
- /**
- * @param mimeType
- * @return
- */
- public String getMimeType(int mimeType) {
- switch (mimeType) {
- case RangerConstants.MIME_JPEG:
- return "jpg";
- case RangerConstants.MIME_PNG:
- return "png";
- }
- return "";
- }
-
- /**
- * @param contentType
- * @return
- */
- public String getImageExtension(String contentType) {
- if (contentType.toLowerCase().endsWith("jpg")
- || contentType.toLowerCase().endsWith("jpeg")) {
- return "jpg";
- } else if (contentType.toLowerCase().endsWith("png")) {
- return "png";
- }
- return "";
- }
-
- /**
- * @param file
- * @return
- */
- public String getFileNameWithoutExtension(File file) {
- if (file != null) {
- String fileName = file.getName();
- if (fileName.indexOf(".") > 0) {
- return fileName.substring(0, fileName.indexOf("."));
- }
- return fileName;
-
- }
- return null;
- }
-
- public String getDisplayNameForClassName(XXDBBase obj) {
- String classTypeDisplayName = RangerConstants
- .getLabelFor_ClassTypes(obj.getMyClassType());
- if (classTypeDisplayName == null) {
- logger.error(
- "Error get name for class type. obj=" + obj.toString(),
- new Throwable());
- }
- return classTypeDisplayName;
- }
-
- public String getDisplayName(XXDBBase obj) {
- if (obj != null) {
- return handleGetDisplayName(obj.getMyDisplayValue());
- } else {
- return handleGetDisplayName(null);
- }
- }
-
- /**
- * @param displayValue
- * @return
- */
- private String handleGetDisplayName(String displayValue) {
- if (displayValue == null || displayValue.trim().isEmpty()) {
- return EMPTY_CONTENT_DISPLAY_NAME;
- }
-
- if (displayValue.length() > maxDisplayNameLength) {
- displayValue = displayValue.substring(0, maxDisplayNameLength - 3)
- .concat("...");
- }
- return displayValue;
- }
-
- /**
* @param userProfile
* @return
*/
@@ -284,32 +152,6 @@ public class RangerBizUtil {
return publicName;
}
- public void updateCloneReferences(XXDBBase obj) {
- if (obj == null) {
- return;
- }
- }
-
- public Long getForUserId(XXDBBase resource) {
- return null;
- }
-
- public void deleteReferencedObjects(XXDBBase obj) {
-
- if (obj == null) {
- return;
- }
- if (obj.getMyClassType() == RangerConstants.CLASS_TYPE_NONE) {
- return;
- }
-
- }
-
- public <T extends XXDBBase> Class<? extends XXDBBase> getContextObject(
- int objectClassType, Long objectId) {
- return null;
- }
-
public VXStringList mapStringListToVStringList(List<String> stringList) {
if (stringList == null) {
return null;
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
index 94374ab..7b0fd87 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/RangerSearchUtil.java
@@ -199,12 +199,12 @@ public class RangerSearchUtil extends SearchUtil {
public Query createSearchQuery(EntityManager em, String queryStr, String sortClause,
SearchFilter searchCriteria, List<SearchField> searchFields,
boolean isCountQuery) {
- return createSearchQuery(em, queryStr, sortClause, searchCriteria, searchFields, -1, false, isCountQuery);
+ return createSearchQuery(em, queryStr, sortClause, searchCriteria, searchFields, false, isCountQuery);
}
public Query createSearchQuery(EntityManager em, String queryStr, String sortClause,
SearchFilter searchCriteria, List<SearchField> searchFields,
- int objectClassType, boolean hasAttributes, boolean isCountQuery) {
+ boolean hasAttributes, boolean isCountQuery) {
StringBuilder queryClause = buildWhereClause(searchCriteria, searchFields);
super.addOrderByClause(queryClause, sortClause);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
index 2c918fd..6f28e7b 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java
@@ -690,7 +690,7 @@ public class SearchUtil {
public Query createSearchQuery(EntityManager em, String queryStr, String sortClause,
SearchCriteria searchCriteria, List<SearchField> searchFields,
- int objectClassType, boolean hasAttributes, boolean isCountQuery) {
+ boolean hasAttributes, boolean isCountQuery) {
// [1] Build where clause
StringBuilder queryClause = buildWhereClause(searchCriteria,
@@ -725,13 +725,6 @@ public class SearchUtil {
return query;
}
-
- public Query createSearchQuery(EntityManager em, String queryStr, String sortClause,
- SearchCriteria searchCriteria, List<SearchField> searchFields,
- boolean isCountQuery) {
- return createSearchQuery(em, queryStr, sortClause, searchCriteria,
- searchFields, -1, false, isCountQuery);
- }
public List<Integer> extractIntList(HttpServletRequest request,
SearchCriteria searchCriteria, String paramName,
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
index fddfda3..2788a61 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManager.java
@@ -25,9 +25,7 @@ import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import org.apache.log4j.Logger;
-import org.apache.ranger.common.RangerConstants;
import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.db.BaseDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -68,15 +66,4 @@ public class RangerDaoManager extends RangerDaoManagerBase {
return stringUtil;
}
- /*
- * (non-Javadoc)
- */
- @Override
- public BaseDao<?> getDaoForClassType(int classType) {
- if (classType == RangerConstants.CLASS_TYPE_NONE) {
- return null;
- }
- return super.getDaoForClassType(classType);
- }
-
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
index c57ecc8..da89e04 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/RangerDaoManagerBase.java
@@ -25,15 +25,11 @@
import javax.persistence.EntityManager;
-import org.apache.log4j.Logger;
-import org.apache.ranger.common.AppConstants;
import org.apache.ranger.common.RESTErrorUtil;
-import org.apache.ranger.common.db.BaseDao;
import org.springframework.beans.factory.annotation.Autowired;
public abstract class RangerDaoManagerBase {
- private static final Logger logger = Logger.getLogger(RangerDaoManagerBase.class);
@Autowired
protected RESTErrorUtil restErrorUtil;
@@ -42,343 +38,6 @@ public abstract class RangerDaoManagerBase {
public RangerDaoManagerBase() {
}
- public BaseDao<?> getDaoForClassType(int classType) {
- if (classType == AppConstants.CLASS_TYPE_AUTH_SESS) {
- return getXXAuthSession();
- }
- if (classType == AppConstants.CLASS_TYPE_USER_PROFILE) {
- return getXXPortalUser();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_ASSET) {
- return getXXAsset();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_RESOURCE) {
- return getXXResource();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_CRED_STORE) {
- return getXXCredentialStore();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_GROUP) {
- return getXXGroup();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_USER) {
- return getXXUser();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_GROUP_USER) {
- return getXXGroupUser();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_GROUP_GROUP) {
- return getXXGroupGroup();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_PERM_MAP) {
- return getXXPermMap();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_AUDIT_MAP) {
- return getXXAuditMap();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_POLICY_EXPORT_AUDIT) {
- return getXXPolicyExportAudit();
- }
- if (classType == AppConstants.CLASS_TYPE_TRX_LOG) {
- return getXXTrxLog();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_ACCESS_AUDIT) {
- return getXXAccessAudit();
- }
-
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY) {
- return getXXPolicy();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_SERVICE) {
- return getXXService();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY_ITEM) {
- return getXXPolicyItem();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_SERVICE_DEF) {
- return getXXServiceDef();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_SERVICE_CONFIG_DEF) {
- return getXXServiceConfigDef();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_RESOURCE_DEF) {
- return getXXResourceDef();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_ACCESS_TYPE_DEF) {
- return getXXAccessTypeDef();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_ACCESS_TYPE_DEF_GRANTS) {
- return getXXAccessTypeDefGrants();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY_CONDITION_DEF) {
- return getXXPolicyConditionDef();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_ENUM_DEF) {
- return getXXEnumDef();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_ENUM_ELEMENT_DEF) {
- return getXXEnumElementDef();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_SERVICE_CONFIG_MAP) {
- return getXXServiceConfigMap();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY_RESOURCE) {
- return getXXPolicyResource();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY_RESOURCE_MAP) {
- return getXXPolicyResourceMap();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY_ITEM_ACCESS) {
- return getXXPolicyItemAccess();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY_ITEM_CONDITION) {
- return getXXPolicyItemCondition();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY_ITEM_USER_PERM) {
- return getXXPolicyItemUserPerm();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY_ITEM_GRP_PERM) {
- return getXXPolicyItemGroupPerm();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_DATA_HIST) {
- return getXXDataHist();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY_WITH_ASSIGNED_ID) {
- return getXXPolicyWithAssignedId();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_SERVICE_WITH_ASSIGNED_ID) {
- return getXXServiceWithAssignedId();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_MODULE_DEF) {
- return getXXModuleDef();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_USER_PERMISSION) {
- return getXXUserPermission();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_GROUP_PERMISSION) {
- return getXXUserPermission();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_SERVICE_DEF_WITH_ASSIGNED_ID) {
- return getXXServiceDefWithAssignedId();
- }
-
- if (classType == AppConstants.CLASS_TYPE_XA_TAG_DEF) {
- return getXXTagDef();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_TAG_ATTR_DEF) {
- return getXXTagAttributeDef();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_SERVICE_RESOURCE) {
- return getXXServiceResource();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_SERVICE_RESOURCE_ELEMENT) {
- return getXXServiceResourceElement();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_SERVICE_RESOURCE_ELEMENT_VALUE) {
- return getXXServiceResourceElementValue();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_TAG) {
- return getXXTag();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_TAG_ATTR) {
- return getXXTagAttribute();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_TAG_RESOURCE_MAP) {
- return getXXTagResourceMap();
- }
- if (classType == AppConstants.CLASS_TYPE_XA_DATAMASK_DEF) {
- return getXXDataMaskTypeDef();
- }
- if (classType == AppConstants.CLASS_TYPE_RANGER_POLICY_ITEM_DATAMASK_INFO) {
- return getXXPolicyItemDataMaskInfo();
- }
- if (classType== AppConstants.CLASS_TYPE_RANGER_POLICY_ITEM_ROWFILTER_INFO) {
- return getXXPolicyItemRowFilterInfo();
- }
- if (classType== AppConstants.CLASS_TYPE_XA_SERVICE_VERSION_INFO) {
- return getXXServiceVersionInfo();
- }
- if (classType == AppConstants.CLASS_TYPE_UGYNC_AUDIT_INFO) {
- return getXXUgsyncAuditInfo();
- }
- logger.error("No DaoManager found for classType=" + classType, new Throwable());
- return null;
- }
-
- public BaseDao<?> getDaoForClassName(String className) {
- if ("XXDBBase".equals(className)) {
- return getXXDBBase();
- }
- if ("XXAuthSession".equals(className)) {
- return getXXAuthSession();
- }
- if ("XXPortalUser".equals(className)) {
- return getXXPortalUser();
- }
- if ("XXPortalUserRole".equals(className)) {
- return getXXPortalUserRole();
- }
- if ("XXAsset".equals(className)) {
- return getXXAsset();
- }
- if ("XXResource".equals(className)) {
- return getXXResource();
- }
- if ("XXCredentialStore".equals(className)) {
- return getXXCredentialStore();
- }
- if ("XXGroup".equals(className)) {
- return getXXGroup();
- }
- if ("XXUser".equals(className)) {
- return getXXUser();
- }
- if ("XXGroupUser".equals(className)) {
- return getXXGroupUser();
- }
- if ("XXGroupGroup".equals(className)) {
- return getXXGroupGroup();
- }
- if ("XXPermMap".equals(className)) {
- return getXXPermMap();
- }
- if ("XXAuditMap".equals(className)) {
- return getXXAuditMap();
- }
- if ("XXPolicyExportAudit".equals(className)) {
- return getXXPolicyExportAudit();
- }
- if ("XXTrxLog".equals(className)) {
- return getXXTrxLog();
- }
- if ("XXAccessAudit".equals(className)) {
- return getXXAccessAudit();
- }
- if ("XXPolicy".equals(className)) {
- return getXXPolicy();
- }
- if ("XXService".equals(className)) {
- return getXXService();
- }
- if ("XXPolicyItem".equals(className)) {
- return getXXPolicyItem();
- }
- if ("XXServiceDef".equals(className)) {
- return getXXServiceDef();
- }
- if ("XXServiceConfigDef".equals(className)) {
- return getXXServiceConfigDef();
- }
- if ("XXResourceDef".equals(className)) {
- return getXXResourceDef();
- }
- if ("XXAccessTypeDef".equals(className)) {
- return getXXAccessTypeDef();
- }
- if ("XXAccessTypeDefGrants".equals(className)) {
- return getXXAccessTypeDefGrants();
- }
- if ("XXPolicyConditionDef".equals(className)) {
- return getXXPolicyConditionDef();
- }
- if ("XXEnumDef".equals(className)) {
- return getXXEnumDef();
- }
- if ("XXEnumElementDef".equals(className)) {
- return getXXEnumElementDef();
- }
- if ("XXServiceConfigMap".equals(className)) {
- return getXXServiceConfigMap();
- }
- if ("XXPolicyResource".equals(className)) {
- return getXXPolicyResource();
- }
- if ("XXPolicyResourceMap".equals(className)) {
- return getXXPolicyResourceMap();
- }
- if ("XXPolicyItemAccess".equals(className)) {
- return getXXPolicyItemAccess();
- }
- if ("XXPolicyItemCondition".equals(className)) {
- return getXXPolicyItemCondition();
- }
- if ("XXPolicyItemUserPerm".equals(className)) {
- return getXXPolicyItemUserPerm();
- }
- if ("XXPolicyItemGroupPerm".equals(className)) {
- return getXXPolicyItemGroupPerm();
- }
- if ("XXDataHist".equals(className)) {
- return getXXDataHist();
- }
- if ("XXPolicyWithAssignedId".equals(className)) {
- return getXXPolicyWithAssignedId();
- }
- if ("XXServiceWithAssignedId".equals(className)) {
- return getXXServiceWithAssignedId();
- }
- if ("XXModuleDef".equals(className)) {
- return getXXModuleDef();
- }
- if ("XXUserPermission".equals(className)) {
- return getXXUserPermission();
- }
- if ("XXGroupPermission".equals(className)) {
- return getXXGroupPermission();
- }
- if ("XXServiceDefWithAssignedId".equals(className)) {
- return getXXServiceDefWithAssignedId();
- }
-
- if ("XXTagDef".equals(className)) {
- return getXXTagDef();
- }
- if ("XXTagAttributeDef".equals(className)) {
- return getXXTagAttributeDef();
- }
- if ("XXServiceResource".equals(className)) {
- return getXXServiceResource();
- }
- if ("XXServiceResourceElement".equals(className)) {
- return getXXServiceResourceElement();
- }
- if ("XXServiceResourceElementValue".equals(className)) {
- return getXXServiceResourceElementValue();
- }
- if ("XXTag".equals(className)) {
- return getXXTag();
- }
- if ("XXTagAttribute".equals(className)) {
- return getXXTagAttribute();
- }
- if ("XXTagResourceMap".equals(className)) {
- return getXXTagResourceMap();
- }
- if ("XXDataMaskTypeDef".equals(className)) {
- return getXXDataMaskTypeDef();
- }
- if ("XXPolicyItemDataMaskInfo".equals(className)) {
- return getXXPolicyItemDataMaskInfo();
- }
- if ("XXPolicyItemRowFilterInfo".equals(className)) {
- return getXXPolicyItemRowFilterInfo();
- }
- if ("XXServiceVersionInfo".equals(className)) {
- return getXXServiceVersionInfo();
- }
- if ("XXPluginInfo".equals(className)) {
- return getXXPluginInfo();
- }
- if ("XXPolicyLabel".equals(className)) {
- return getXXPolicyLabels();
- }
- if ("XXUgsyncAuditInfo".equals(className)) {
- return getXXUgsyncAuditInfo();
- }
- logger.error("No DaoManager found for className=" + className, new Throwable());
- return null;
- }
-
public XXDBBaseDao getXXDBBase() {
return new XXDBBaseDao(this);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
index d77330d..ffcc938 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAccessAuditDao.java
@@ -27,7 +27,9 @@ import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXAccessAudit;
import org.apache.ranger.entity.XXAccessAuditV4;
import org.apache.ranger.entity.XXAccessAuditV5;
+import org.springframework.stereotype.Service;
+@Service
public class XXAccessAuditDao extends BaseDao<XXAccessAudit> {
private static final Logger logger = Logger.getLogger(XXAccessAuditDao.class);
public XXAccessAuditDao( RangerDaoManagerBase daoManager ) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefDao.java
index 8f3a506..e04280b 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXAccessTypeDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXAccessTypeDefDao extends BaseDao<XXAccessTypeDef> {
public XXAccessTypeDefDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefGrantsDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefGrantsDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefGrantsDao.java
index 14e723e..6459bda 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefGrantsDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAccessTypeDefGrantsDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXAccessTypeDefGrants;
+import org.springframework.stereotype.Service;
+@Service
public class XXAccessTypeDefGrantsDao extends BaseDao<XXAccessTypeDefGrants> {
public XXAccessTypeDefGrantsDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
index cf25c8e..1cd83ba 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAssetDao.java
@@ -25,7 +25,9 @@ import org.apache.log4j.Logger;
import org.apache.ranger.common.RangerCommonEnums;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXAsset;
+import org.springframework.stereotype.Service;
+@Service
public class XXAssetDao extends BaseDao<XXAsset> {
private static final Logger logger = Logger.getLogger(XXAssetDao.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
index 113dbca..f879138 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAuditMapDao.java
@@ -27,7 +27,9 @@ import javax.persistence.NoResultException;
import org.apache.log4j.Logger;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXAuditMap;
+import org.springframework.stereotype.Service;
+@Service
public class XXAuditMapDao extends BaseDao<XXAuditMap> {
private static final Logger logger = Logger.getLogger(XXAssetDao.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
index 475b278..b0270e9 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXAuthSessionDao.java
@@ -25,7 +25,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXAuthSession;
+import org.springframework.stereotype.Service;
+@Service
public class XXAuthSessionDao extends BaseDao<XXAuthSession> {
public XXAuthSessionDao( RangerDaoManagerBase daoManager ) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXContextEnricherDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXContextEnricherDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXContextEnricherDefDao.java
index c3d322d..57fbe8b 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXContextEnricherDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXContextEnricherDefDao.java
@@ -26,7 +26,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXContextEnricherDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXContextEnricherDefDao extends BaseDao<XXContextEnricherDef> {
public XXContextEnricherDefDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
index 1e6c443..93c297f 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXCredentialStoreDao.java
@@ -21,7 +21,9 @@
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXCredentialStore;
+import org.springframework.stereotype.Service;
+@Service
public class XXCredentialStoreDao extends BaseDao<XXCredentialStore> {
public XXCredentialStoreDao( RangerDaoManagerBase daoManager ) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
index 2a64c89..ddb0811 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXDBBaseDao.java
@@ -21,7 +21,9 @@
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXDBBase;
+import org.springframework.stereotype.Service;
+@Service
public class XXDBBaseDao extends BaseDao<XXDBBase> {
public XXDBBaseDao( RangerDaoManagerBase daoManager ) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXDataHistDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXDataHistDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXDataHistDao.java
index b5e7855..595912e 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXDataHistDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXDataHistDao.java
@@ -22,10 +22,13 @@ import java.util.Date;
import java.util.List;
import javax.persistence.NoResultException;
+
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXDataHist;
import org.apache.ranger.common.DateUtil;
+import org.springframework.stereotype.Service;
+@Service
public class XXDataHistDao extends BaseDao<XXDataHist> {
public XXDataHistDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXDataMaskTypeDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXDataMaskTypeDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXDataMaskTypeDefDao.java
index f6e1aff..3dd4376 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXDataMaskTypeDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXDataMaskTypeDefDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXDataMaskTypeDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXDataMaskTypeDefDao extends BaseDao<XXDataMaskTypeDef> {
public XXDataMaskTypeDefDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXEnumDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXEnumDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXEnumDefDao.java
index 2590455..bcfd36d 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXEnumDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXEnumDefDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXEnumDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXEnumDefDao extends BaseDao<XXEnumDef> {
public XXEnumDefDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXEnumElementDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXEnumElementDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXEnumElementDefDao.java
index 4b7fb70..3702821 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXEnumElementDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXEnumElementDefDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXEnumElementDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXEnumElementDefDao extends BaseDao<XXEnumElementDef> {
public XXEnumElementDefDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
index 19e2e11..9a87b4c 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupDao.java
@@ -27,7 +27,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXGroup;
+import org.springframework.stereotype.Service;
+@Service
public class XXGroupDao extends BaseDao<XXGroup> {
public XXGroupDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
index cbe95f9..21948b1 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupGroupDao.java
@@ -26,7 +26,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXGroupGroup;
+import org.springframework.stereotype.Service;
+@Service
public class XXGroupGroupDao extends BaseDao<XXGroupGroup> {
public XXGroupGroupDao( RangerDaoManagerBase daoManager ) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java
index 9281cb5..d634039 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupPermissionDao.java
@@ -26,7 +26,9 @@ import org.apache.log4j.Logger;
import org.apache.ranger.common.RangerCommonEnums;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXGroupPermission;
+import org.springframework.stereotype.Service;
+@Service
public class XXGroupPermissionDao extends BaseDao<XXGroupPermission> {
private static final Logger logger = Logger.getLogger(XXGroupPermissionDao.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
index c8c105d..1e41e70 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXGroupUserDao.java
@@ -31,7 +31,9 @@ import org.apache.commons.lang.StringUtils;
import org.apache.log4j.Logger;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXGroupUser;
+import org.springframework.stereotype.Service;
+@Service
public class XXGroupUserDao extends BaseDao<XXGroupUser> {
private static final Logger logger = Logger.getLogger(XXGroupUserDao.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXModuleDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXModuleDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXModuleDefDao.java
index 85f2846..c5b0daf 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXModuleDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXModuleDefDao.java
@@ -26,7 +26,9 @@ import org.apache.commons.collections.CollectionUtils;
import org.apache.ranger.common.RangerCommonEnums;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXModuleDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXModuleDefDao extends BaseDao<XXModuleDef>{
public XXModuleDefDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
index c455fdc..e856936 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPermMapDao.java
@@ -27,7 +27,9 @@ import javax.persistence.NoResultException;
import org.apache.log4j.Logger;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPermMap;
+import org.springframework.stereotype.Service;
+@Service
public class XXPermMapDao extends BaseDao<XXPermMap> {
private static final Logger logger = Logger.getLogger(XXResourceDao.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPluginInfoDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPluginInfoDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPluginInfoDao.java
index 8eb1636..57cdfea 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPluginInfoDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPluginInfoDao.java
@@ -24,10 +24,11 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.DateUtil;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPluginInfo;
+import org.springframework.stereotype.Service;
/**
*/
-
+@Service
public class XXPluginInfoDao extends BaseDao<XXPluginInfo> {
/**
* Default Constructor
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyConditionDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyConditionDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyConditionDefDao.java
index 21afcac..a12140a 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyConditionDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyConditionDefDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyConditionDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyConditionDefDao extends BaseDao<XXPolicyConditionDef> {
public XXPolicyConditionDefDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyDao.java
index 5623517..b4f8687 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyDao.java
@@ -24,10 +24,12 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicy;
+import org.springframework.stereotype.Service;
/**
*/
+@Service
public class XXPolicyDao extends BaseDao<XXPolicy> {
/**
* Default Constructor
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
index d2fc6e2..deed28e 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyExportAuditDao.java
@@ -21,7 +21,9 @@
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyExportAudit;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyExportAuditDao extends BaseDao<XXPolicyExportAudit> {
public XXPolicyExportAuditDao( RangerDaoManagerBase daoManager ) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemAccessDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemAccessDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemAccessDao.java
index de37e10..9be38de 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemAccessDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemAccessDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyItemAccess;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyItemAccessDao extends BaseDao<XXPolicyItemAccess> {
public XXPolicyItemAccessDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemConditionDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemConditionDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemConditionDao.java
index 11596ef..9b11545 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemConditionDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemConditionDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyItemCondition;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyItemConditionDao extends BaseDao<XXPolicyItemCondition> {
public XXPolicyItemConditionDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemDao.java
index 5677173..20ea7fa 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemDao.java
@@ -24,10 +24,12 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyItem;
+import org.springframework.stereotype.Service;
/**
*/
+@Service
public class XXPolicyItemDao extends BaseDao<XXPolicyItem> {
/**
* Default Constructor
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemDataMaskInfoDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemDataMaskInfoDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemDataMaskInfoDao.java
index a8418c6..67c7e99 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemDataMaskInfoDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemDataMaskInfoDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyItemDataMaskInfo;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyItemDataMaskInfoDao extends BaseDao<XXPolicyItemDataMaskInfo> {
public XXPolicyItemDataMaskInfoDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemGroupPermDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemGroupPermDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemGroupPermDao.java
index 8c05699..a6fd8c6 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemGroupPermDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemGroupPermDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyItemGroupPerm;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyItemGroupPermDao extends BaseDao<XXPolicyItemGroupPerm> {
public XXPolicyItemGroupPermDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemRowFilterInfoDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemRowFilterInfoDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemRowFilterInfoDao.java
index 4618e7d..01a36a5 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemRowFilterInfoDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemRowFilterInfoDao.java
@@ -19,11 +19,13 @@ package org.apache.ranger.db;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyItemRowFilterInfo;
+import org.springframework.stereotype.Service;
import javax.persistence.NoResultException;
import java.util.ArrayList;
import java.util.List;
+@Service
public class XXPolicyItemRowFilterInfoDao extends BaseDao<XXPolicyItemRowFilterInfo> {
public XXPolicyItemRowFilterInfoDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemUserPermDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemUserPermDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemUserPermDao.java
index 40a0da1..6672654 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemUserPermDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyItemUserPermDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyItemUserPerm;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyItemUserPermDao extends BaseDao<XXPolicyItemUserPerm> {
public XXPolicyItemUserPermDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyLabelDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyLabelDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyLabelDao.java
index 59221bf..9a8f198 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyLabelDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyLabelDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyLabel;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyLabelDao extends BaseDao<XXPolicyLabel> {
public XXPolicyLabelDao(RangerDaoManagerBase daoMgr) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyLabelMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyLabelMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyLabelMapDao.java
index a318513..942cd11 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyLabelMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyLabelMapDao.java
@@ -23,7 +23,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyLabelMap;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyLabelMapDao extends BaseDao<XXPolicyLabelMap> {
public XXPolicyLabelMapDao(RangerDaoManagerBase daoMgr) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyResourceDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyResourceDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyResourceDao.java
index 4b04b96..a7157de 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyResourceDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyResourceDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyResource;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyResourceDao extends BaseDao<XXPolicyResource> {
public XXPolicyResourceDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyResourceMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyResourceMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyResourceMapDao.java
index 7065737..55d8c50 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyResourceMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyResourceMapDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyResourceMap;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyResourceMapDao extends BaseDao<XXPolicyResourceMap> {
public XXPolicyResourceMapDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPolicyWithAssignedIdDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyWithAssignedIdDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyWithAssignedIdDao.java
index 2353bf0..21c4b64 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPolicyWithAssignedIdDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPolicyWithAssignedIdDao.java
@@ -19,7 +19,9 @@ package org.apache.ranger.db;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPolicyWithAssignedId;
+import org.springframework.stereotype.Service;
+@Service
public class XXPolicyWithAssignedIdDao extends BaseDao<XXPolicyWithAssignedId> {
public XXPolicyWithAssignedIdDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
index 9841131..d383cf5 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserDao.java
@@ -25,7 +25,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPortalUser;
+import org.springframework.stereotype.Service;
+@Service
public class XXPortalUserDao extends BaseDao<XXPortalUser> {
public XXPortalUserDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
index adf100a..8146c51 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXPortalUserRoleDao.java
@@ -27,7 +27,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXPortalUserRole;
+import org.springframework.stereotype.Service;
+@Service
public class XXPortalUserRoleDao extends BaseDao<XXPortalUserRole> {
public XXPortalUserRoleDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
index 9fa77f2..24a0e63 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXResourceDao.java
@@ -30,7 +30,9 @@ import javax.persistence.NoResultException;
import org.apache.log4j.Logger;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXResource;
+import org.springframework.stereotype.Service;
+@Service
public class XXResourceDao extends BaseDao<XXResource> {
private static final Logger logger = Logger.getLogger(XXResourceDao.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXResourceDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXResourceDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXResourceDefDao.java
index aee56e8..b2e311f 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXResourceDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXResourceDefDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXResourceDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXResourceDefDao extends BaseDao<XXResourceDef> {
public XXResourceDefDao(RangerDaoManagerBase daoMgr) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXServiceConfigDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceConfigDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceConfigDefDao.java
index 30a9ce8..5d54876 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceConfigDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceConfigDefDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXServiceConfigDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXServiceConfigDefDao extends BaseDao<XXServiceConfigDef> {
public XXServiceConfigDefDao(RangerDaoManagerBase daoMgr) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXServiceConfigMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceConfigMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceConfigMapDao.java
index 9f97b60..5e94855 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceConfigMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceConfigMapDao.java
@@ -24,7 +24,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXServiceConfigMap;
+import org.springframework.stereotype.Service;
+@Service
public class XXServiceConfigMapDao extends BaseDao<XXServiceConfigMap> {
public XXServiceConfigMapDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
index 93c65a8..a79ba7c 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceDao.java
@@ -24,10 +24,12 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXService;
+import org.springframework.stereotype.Service;
/**
*/
+@Service
public class XXServiceDao extends BaseDao<XXService> {
/**
* Default Constructor
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXServiceDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceDefDao.java
index dd32c3a..becf0de 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceDefDao.java
@@ -21,7 +21,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXServiceDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXServiceDefDao extends BaseDao<XXServiceDef> {
/**
* Default Constructor
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXServiceDefWithAssignedIdDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceDefWithAssignedIdDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceDefWithAssignedIdDao.java
index 7e866d2..5a4eb11 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceDefWithAssignedIdDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceDefWithAssignedIdDao.java
@@ -19,7 +19,9 @@ package org.apache.ranger.db;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXServiceDefWithAssignedId;
+import org.springframework.stereotype.Service;
+@Service
public class XXServiceDefWithAssignedIdDao extends BaseDao<XXServiceDefWithAssignedId> {
public XXServiceDefWithAssignedIdDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceDao.java
index f87c0ae..ee0e400 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceDao.java
@@ -28,7 +28,9 @@ import org.apache.commons.lang.StringUtils;
import org.apache.ranger.authorization.utils.StringUtil;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXServiceResource;
+import org.springframework.stereotype.Service;
+@Service
public class XXServiceResourceDao extends BaseDao<XXServiceResource> {
public XXServiceResourceDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementDao.java
index 72fe214..c9a1c21 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementDao.java
@@ -26,7 +26,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXServiceResourceElement;
+import org.springframework.stereotype.Service;
+@Service
public class XXServiceResourceElementDao extends BaseDao<XXServiceResourceElement> {
public XXServiceResourceElementDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementValueDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementValueDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementValueDao.java
index e726d04..364af6d 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementValueDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceResourceElementValueDao.java
@@ -26,7 +26,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXServiceResourceElementValue;
+import org.springframework.stereotype.Service;
+@Service
public class XXServiceResourceElementValueDao extends BaseDao<XXServiceResourceElementValue> {
public XXServiceResourceElementValueDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXServiceVersionInfoDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceVersionInfoDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceVersionInfoDao.java
index 0098bff..e100329 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceVersionInfoDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceVersionInfoDao.java
@@ -25,10 +25,11 @@ import javax.persistence.NoResultException;
import org.apache.commons.collections.CollectionUtils;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXServiceVersionInfo;
+import org.springframework.stereotype.Service;
/**
*/
-
+@Service
public class XXServiceVersionInfoDao extends BaseDao<XXServiceVersionInfo> {
/**
* Default Constructor
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXServiceWithAssignedIdDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXServiceWithAssignedIdDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXServiceWithAssignedIdDao.java
index b027872..6f11d16 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXServiceWithAssignedIdDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXServiceWithAssignedIdDao.java
@@ -19,7 +19,9 @@ package org.apache.ranger.db;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXServiceWithAssignedId;
+import org.springframework.stereotype.Service;
+@Service
public class XXServiceWithAssignedIdDao extends BaseDao<XXServiceWithAssignedId> {
public XXServiceWithAssignedIdDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDao.java
index e361b33..40c3a88 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDao.java
@@ -26,7 +26,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXTagAttribute;
+import org.springframework.stereotype.Service;
+@Service
public class XXTagAttributeDao extends BaseDao<XXTagAttribute> {
public XXTagAttributeDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDefDao.java
index 145399f..129f3c1 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTagAttributeDefDao.java
@@ -26,7 +26,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXTagAttributeDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXTagAttributeDefDao extends BaseDao<XXTagAttributeDef> {
public XXTagAttributeDefDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXTagDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTagDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTagDao.java
index 77428db..e14f836 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTagDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTagDao.java
@@ -28,7 +28,9 @@ import org.apache.commons.lang.StringUtils;
import org.apache.ranger.authorization.utils.StringUtil;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXTag;
+import org.springframework.stereotype.Service;
+@Service
public class XXTagDao extends BaseDao<XXTag> {
public XXTagDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXTagDefDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTagDefDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTagDefDao.java
index dfd2fcb..c0dd883 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTagDefDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTagDefDao.java
@@ -27,7 +27,9 @@ import javax.persistence.NoResultException;
import org.apache.commons.lang.StringUtils;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXTagDef;
+import org.springframework.stereotype.Service;
+@Service
public class XXTagDefDao extends BaseDao<XXTagDef> {
public XXTagDefDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXTagResourceMapDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTagResourceMapDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTagResourceMapDao.java
index bbcd546..f9e041a 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTagResourceMapDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTagResourceMapDao.java
@@ -27,7 +27,9 @@ import javax.persistence.NoResultException;
import org.apache.ranger.authorization.utils.StringUtil;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXTagResourceMap;
+import org.springframework.stereotype.Service;
+@Service
public class XXTagResourceMapDao extends BaseDao<XXTagResourceMap> {
public XXTagResourceMapDao(RangerDaoManagerBase daoManager) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
index b376abe..3613115 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXTrxLogDao.java
@@ -27,7 +27,9 @@ import javax.persistence.NoResultException;
import org.apache.log4j.Logger;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXTrxLog;
+import org.springframework.stereotype.Service;
+@Service
public class XXTrxLogDao extends BaseDao<XXTrxLog> {
private static final Logger logger = Logger.getLogger(XXTrxLogDao.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXUgsyncAuditInfoDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXUgsyncAuditInfoDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXUgsyncAuditInfoDao.java
index 1955923..816bbfa 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXUgsyncAuditInfoDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXUgsyncAuditInfoDao.java
@@ -21,6 +21,7 @@ import org.apache.log4j.Logger;
import org.apache.ranger.common.DateUtil;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXUgsyncAuditInfo;
+import org.springframework.stereotype.Service;
import javax.persistence.NoResultException;
import java.util.List;
@@ -28,6 +29,7 @@ import java.util.List;
/**
*/
+@Service
public class XXUgsyncAuditInfoDao extends BaseDao<XXUgsyncAuditInfo> {
protected static final Logger logger = Logger
.getLogger(XXUgsyncAuditInfoDao.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
index 7af1bf9..58bf4d8 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXUserDao.java
@@ -27,7 +27,9 @@ import javax.persistence.NoResultException;
import org.apache.log4j.Logger;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXUser;
+import org.springframework.stereotype.Service;
+@Service
public class XXUserDao extends BaseDao<XXUser> {
private static final Logger logger = Logger.getLogger(XXResourceDao.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/db/XXUserPermissionDao.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/db/XXUserPermissionDao.java b/security-admin/src/main/java/org/apache/ranger/db/XXUserPermissionDao.java
index 017c4fb..cb6a7e5 100644
--- a/security-admin/src/main/java/org/apache/ranger/db/XXUserPermissionDao.java
+++ b/security-admin/src/main/java/org/apache/ranger/db/XXUserPermissionDao.java
@@ -26,7 +26,9 @@ import org.apache.log4j.Logger;
import org.apache.ranger.common.RangerCommonEnums;
import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXUserPermission;
+import org.springframework.stereotype.Service;
+@Service
public class XXUserPermissionDao extends BaseDao<XXUserPermission>{
private static final Logger logger = Logger.getLogger(XXUserPermissionDao.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/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 4157fc7..b2213ed 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
@@ -92,6 +92,7 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
tEntityValueMap.put(XXDBBase.class, "Base");
}
+ @Autowired
BaseDao<T> entityDao;
@Autowired
@@ -140,12 +141,9 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
// return className;
}
- @SuppressWarnings("unchecked")
protected BaseDao<T> getDao() {
if (entityDao == null) {
- entityDao = (BaseDao<T>) daoManager.getDaoForClassName(tEntityClass
- .getSimpleName());
-
+ throw new NullPointerException("entityDao is not injected by Spring!");
}
return entityDao;
}
@@ -170,12 +168,6 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
return null;
}
- protected int getClassType() {
- return bizUtil.getClassType(tEntityClass);
- }
-
- protected int ownerRatingWeight;
-
/**
* constructor
*/
@@ -263,8 +255,6 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
+ ", objectId=" + resource.getId());
}
- bizUtil.updateCloneReferences(resource);
-
resource = getDao().create(resource);
V view = postCreate(resource);
@@ -402,7 +392,6 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
}
// Need to delete all dependent common objects like Notes and
// UserDataPref
- bizUtil.deleteReferencedObjects(resource);
try {
result = getDao().remove(resource);
} catch (Exception e) {
@@ -529,7 +518,7 @@ public abstract class AbstractBaseResourceService<T extends XXDBBase, V extends
EntityManager em = getDao().getEntityManager();
Query query = searchUtil.createSearchQuery(em, searchString, sortString,
- searchCriteria, searchFieldList, getClassType(), false,
+ searchCriteria, searchFieldList, false,
isCountQuery);
return query;
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/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 1b6b77c..b12984d 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
@@ -27,7 +27,6 @@ import org.apache.ranger.common.SearchCriteria;
import org.apache.ranger.common.SearchField;
import org.apache.ranger.common.SortField;
import org.apache.ranger.common.StringUtil;
-import org.apache.ranger.common.db.BaseDao;
import org.apache.ranger.entity.XXAuthSession;
import org.apache.ranger.entity.XXPortalUser;
import org.apache.ranger.view.VXAuthSession;
@@ -93,19 +92,6 @@ public class AuthSessionService extends
return NAME;
}
- @Override
- protected int getClassType() {
- return RangerConstants.CLASS_TYPE_AUTH_SESS;
- }
-
- /*
- * (non-Javadoc)
- */
- @Override
- protected BaseDao<XXAuthSession> getDao() {
- return daoManager.getXXAuthSession();
- }
-
/*
* (non-Javadoc)
*/
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java
index 482f10c..acba730 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerBaseModelService.java
@@ -84,7 +84,8 @@ public abstract class RangerBaseModelService<T extends XXDBBase, V extends Range
protected final String countQueryStr;
protected String queryStr;
- BaseDao<T> entityDao;
+ @Autowired
+ protected BaseDao<T> entityDao;
@SuppressWarnings("unchecked")
public RangerBaseModelService() {
@@ -139,12 +140,9 @@ public abstract class RangerBaseModelService<T extends XXDBBase, V extends Range
return null;
}
- @SuppressWarnings("unchecked")
protected BaseDao<T> getDao() {
if (entityDao == null) {
- entityDao = (BaseDao<T>) daoMgr.getDaoForClassName(tEntityClass
- .getSimpleName());
-
+ throw new NullPointerException("entityDao is not injected by Spring!");
}
return entityDao;
}
@@ -384,14 +382,9 @@ public abstract class RangerBaseModelService<T extends XXDBBase, V extends Range
EntityManager em = getDao().getEntityManager();
Query query = searchUtil.createSearchQuery(em, searchString, sortString, searchCriteria,
- searchFieldList, getClassType(), false, isCountQuery);
+ searchFieldList, false, isCountQuery);
return query;
}
-
- protected int getClassType() {
- return bizUtil.getClassType(tEntityClass);
- }
-
protected String getUserScreenName(Long userId) {
String ret = null;
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/service/RangerPluginInfoService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerPluginInfoService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerPluginInfoService.java
index d4d0605..2bbf0d4 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerPluginInfoService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerPluginInfoService.java
@@ -207,7 +207,7 @@ public class RangerPluginInfoService {
EntityManager em = daoManager.getEntityManager();
return searchUtil.createSearchQuery(em, searchString, sortString, searchCriteria,
- searchFieldList, bizUtil.getClassType(XXPluginInfo.class), false, isCountQuery);
+ searchFieldList, false, isCountQuery);
}
private long getCountForSearchQuery(SearchFilter searchCriteria, List<SearchField> searchFieldList) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/84513334/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefService.java
index 1e385a0..3f7068c 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefService.java
@@ -71,7 +71,7 @@ public class RangerServiceDefService extends RangerServiceDefServiceBase<XXServi
}
public List<RangerServiceDef> getAllServiceDefs() {
- List<XXServiceDef> xxServiceDefList = daoMgr.getXXServiceDef().getAll();
+ List<XXServiceDef> xxServiceDefList = getDao().getAll();
List<RangerServiceDef> serviceDefList = new ArrayList<RangerServiceDef>();
for (XXServiceDef xxServiceDef : xxServiceDefList) {