You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by pr...@apache.org on 2017/03/02 03:59:45 UTC
[2/2] ranger git commit: RANGER-1413: Good coding practice in Ranger
recommended by static code analysis
RANGER-1413: Good coding practice in Ranger recommended by static code analysis
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/360cdd68
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/360cdd68
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/360cdd68
Branch: refs/heads/master
Commit: 360cdd683c0c74db58f12fa0fb3f912a8b6c6a98
Parents: c0c1b15
Author: pradeep <pr...@apache.org>
Authored: Tue Feb 28 23:02:43 2017 +0530
Committer: pradeep <pr...@apache.org>
Committed: Thu Mar 2 09:27:17 2017 +0530
----------------------------------------------------------------------
.../ranger/server/tomcat/EmbeddedServer.java | 3 +-
.../java/org/apache/ranger/biz/XUserMgr.java | 184 ++++++++++---------
2 files changed, 95 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/360cdd68/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
----------------------------------------------------------------------
diff --git a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
index 819fa03..635e63f 100644
--- a/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
+++ b/embeddedwebserver/src/main/java/org/apache/ranger/server/tomcat/EmbeddedServer.java
@@ -28,7 +28,6 @@ import java.util.Iterator;
import java.util.Properties;
import java.util.logging.Logger;
import java.util.List;
-import java.util.ArrayList;
import javax.servlet.ServletException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
@@ -490,7 +489,7 @@ public class EmbeddedServer {
}
}
List<CredentialProvider> providers = CredentialProviderFactory.getProviders(conf);
- List<String> aliasesList=new ArrayList<String>();
+ List<String> aliasesList;
CredentialProvider.CredentialEntry credEntry=null;
for(CredentialProvider provider: providers) {
//System.out.println("Credential Provider :" + provider);
http://git-wip-us.apache.org/repos/asf/ranger/blob/360cdd68/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
index 9139b95..62cffa5 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java
@@ -1463,100 +1463,104 @@ public class XUserMgr extends XUserMgrBase {
@Override
public VXUserList searchXUsers(SearchCriteria searchCriteria) {
- VXUserList vXUserList = new VXUserList();
- VXUser vXUserExactMatch = null;
- try{
- VXUserList vXUserListSort = new VXUserList();
- if(searchCriteria.getParamList() != null && searchCriteria.getParamList().get("name") != null){
- searchCriteria.setSortBy("name");
- vXUserListSort = xUserService.searchXUsers(searchCriteria);
- vXUserExactMatch = getXUserByUserName((String)searchCriteria.getParamList().get("name"));
- }
- if(vXUserExactMatch != null){
- List<VXUser> vXUsers = new ArrayList<VXUser>();
- if(searchCriteria.getStartIndex() == 0){
- vXUsers.add(0,vXUserExactMatch);
- }
- for(VXUser vxUser:vXUserListSort.getVXUsers()){
- if(vxUser.getId() != vXUserExactMatch.getId()){
- vXUsers.add(vxUser);
- }
- }
- vXUserList.setVXUsers(vXUsers);
- vXUserList.setStartIndex(searchCriteria.getStartIndex());
- vXUserList.setResultSize(vXUserList.getVXUsers().size());
- vXUserList.setTotalCount(vXUserListSort.getTotalCount());
- vXUserList.setPageSize(searchCriteria.getMaxRows());
- vXUserList.setSortBy(searchCriteria.getSortBy());
- vXUserList.setSortType(searchCriteria.getSortType());
- }
- } catch (Exception e){
- logger.error("Error getting the exact match of user =>"+e);
- }
- if(vXUserList.getVXUsers().isEmpty()) {
- searchCriteria.setSortBy("id");
- vXUserList = xUserService.searchXUsers(searchCriteria);
- }
- if(vXUserList!=null && !hasAccessToModule(RangerConstants.MODULE_USER_GROUPS)){
- List<VXUser> vXUsers = new ArrayList<VXUser>();
- if(vXUserList!=null && vXUserList.getListSize()>0){
- for(VXUser vXUser:vXUserList.getList()){
- vXUser=getMaskedVXUser(vXUser);
- vXUsers.add(vXUser);
- }
- vXUserList.setVXUsers(vXUsers);
- }
- }
- return vXUserList;
+ VXUserList vXUserList = new VXUserList();
+ VXUser vXUserExactMatch = null;
+ try{
+ VXUserList vXUserListSort = new VXUserList();
+ if(searchCriteria.getParamList() != null && searchCriteria.getParamList().get("name") != null){
+ searchCriteria.setSortBy("name");
+ vXUserListSort = xUserService.searchXUsers(searchCriteria);
+ vXUserExactMatch = getXUserByUserName((String)searchCriteria.getParamList().get("name"));
+ }
+ if(vXUserExactMatch != null){
+ List<VXUser> vXUsers = new ArrayList<VXUser>();
+ if(searchCriteria.getStartIndex() == 0){
+ vXUsers.add(0,vXUserExactMatch);
+ }
+ for(VXUser vxUser:vXUserListSort.getVXUsers()){
+ if(vXUserExactMatch.getId()!=null && vxUser!=null){
+ if(!vXUserExactMatch.getId().equals(vxUser.getId())){
+ vXUsers.add(vxUser);
+ }
+ }
+ }
+ vXUserList.setVXUsers(vXUsers);
+ vXUserList.setStartIndex(searchCriteria.getStartIndex());
+ vXUserList.setResultSize(vXUserList.getVXUsers().size());
+ vXUserList.setTotalCount(vXUserListSort.getTotalCount());
+ vXUserList.setPageSize(searchCriteria.getMaxRows());
+ vXUserList.setSortBy(searchCriteria.getSortBy());
+ vXUserList.setSortType(searchCriteria.getSortType());
+ }
+ } catch (Exception e){
+ logger.error("Error getting the exact match of user =>"+e);
+ }
+ if(vXUserList.getVXUsers().isEmpty()) {
+ searchCriteria.setSortBy("id");
+ vXUserList = xUserService.searchXUsers(searchCriteria);
+ }
+ if(vXUserList!=null && !hasAccessToModule(RangerConstants.MODULE_USER_GROUPS)){
+ List<VXUser> vXUsers = new ArrayList<VXUser>();
+ if(vXUserList!=null && vXUserList.getListSize()>0){
+ for(VXUser vXUser:vXUserList.getList()){
+ vXUser=getMaskedVXUser(vXUser);
+ vXUsers.add(vXUser);
+ }
+ vXUserList.setVXUsers(vXUsers);
+ }
+ }
+ return vXUserList;
}
@Override
public VXGroupList searchXGroups(SearchCriteria searchCriteria) {
- VXGroupList vXGroupList= new VXGroupList();
- VXGroup vXGroupExactMatch = null;
- try{
- VXGroupList vXGroupListSort= new VXGroupList();
- if(searchCriteria.getParamList() != null && searchCriteria.getParamList().get("name") != null){
- searchCriteria.setSortBy("name");
- vXGroupListSort = xGroupService.searchXGroups(searchCriteria);
- vXGroupExactMatch = getGroupByGroupName((String)searchCriteria.getParamList().get("name"));
- }
- if(vXGroupExactMatch != null){
- List<VXGroup> vXGroups = new ArrayList<VXGroup>();
- if(searchCriteria.getStartIndex() == 0){
- vXGroups.add(0,vXGroupExactMatch);
- }
- for(VXGroup vXGroup:vXGroupListSort.getList()){
- if(vXGroup.getId() != vXGroupExactMatch.getId()){
- vXGroups.add(vXGroup);
- }
- }
- vXGroupList.setVXGroups(vXGroups);
- vXGroupList.setStartIndex(searchCriteria.getStartIndex());
- vXGroupList.setResultSize(vXGroupList.getList().size());
- vXGroupList.setTotalCount(vXGroupListSort.getTotalCount());
- vXGroupList.setPageSize(searchCriteria.getMaxRows());
- vXGroupList.setSortBy(searchCriteria.getSortBy());
- vXGroupList.setSortType(searchCriteria.getSortType());
- }
- } catch (Exception e){
- logger.error("Error getting the exact match of group =>"+e);
- }
- if(vXGroupList.getList().isEmpty()) {
- searchCriteria.setSortBy("id");
- vXGroupList=xGroupService.searchXGroups(searchCriteria);
- }
- if(vXGroupList!=null && !hasAccessToModule(RangerConstants.MODULE_USER_GROUPS)){
- if(vXGroupList!=null && vXGroupList.getListSize()>0){
- List<VXGroup> listMasked=new ArrayList<VXGroup>();
- for(VXGroup vXGroup:vXGroupList.getList()){
- vXGroup=getMaskedVXGroup(vXGroup);
- listMasked.add(vXGroup);
- }
- vXGroupList.setVXGroups(listMasked);
- }
- }
- return vXGroupList;
+ VXGroupList vXGroupList= new VXGroupList();
+ VXGroup vXGroupExactMatch = null;
+ try{
+ VXGroupList vXGroupListSort= new VXGroupList();
+ if(searchCriteria.getParamList() != null && searchCriteria.getParamList().get("name") != null){
+ searchCriteria.setSortBy("name");
+ vXGroupListSort = xGroupService.searchXGroups(searchCriteria);
+ vXGroupExactMatch = getGroupByGroupName((String)searchCriteria.getParamList().get("name"));
+ }
+ if(vXGroupExactMatch != null){
+ List<VXGroup> vXGroups = new ArrayList<VXGroup>();
+ if(searchCriteria.getStartIndex() == 0){
+ vXGroups.add(0,vXGroupExactMatch);
+ }
+ for(VXGroup vXGroup:vXGroupListSort.getList()){
+ if(vXGroupExactMatch.getId()!=null && vXGroup!=null){
+ if(!vXGroupExactMatch.getId().equals(vXGroup.getId())){
+ vXGroups.add(vXGroup);
+ }
+ }
+ }
+ vXGroupList.setVXGroups(vXGroups);
+ vXGroupList.setStartIndex(searchCriteria.getStartIndex());
+ vXGroupList.setResultSize(vXGroupList.getList().size());
+ vXGroupList.setTotalCount(vXGroupListSort.getTotalCount());
+ vXGroupList.setPageSize(searchCriteria.getMaxRows());
+ vXGroupList.setSortBy(searchCriteria.getSortBy());
+ vXGroupList.setSortType(searchCriteria.getSortType());
+ }
+ } catch (Exception e){
+ logger.error("Error getting the exact match of group =>"+e);
+ }
+ if(vXGroupList.getList().isEmpty()) {
+ searchCriteria.setSortBy("id");
+ vXGroupList=xGroupService.searchXGroups(searchCriteria);
+ }
+ if(vXGroupList!=null && !hasAccessToModule(RangerConstants.MODULE_USER_GROUPS)){
+ if(vXGroupList!=null && vXGroupList.getListSize()>0){
+ List<VXGroup> listMasked=new ArrayList<VXGroup>();
+ for(VXGroup vXGroup:vXGroupList.getList()){
+ vXGroup=getMaskedVXGroup(vXGroup);
+ listMasked.add(vXGroup);
+ }
+ vXGroupList.setVXGroups(listMasked);
+ }
+ }
+ return vXGroupList;
}
public Collection<String> getMaskedCollection(Collection<String> listunMasked){