You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/02/28 11:11:31 UTC
ranger git commit: code cleanup in the security admin module - use
collection.isEmpty / addAll / etc methods
Repository: ranger
Updated Branches:
refs/heads/master 8cb011185 -> 59ed6628e
code cleanup in the security admin module - use collection.isEmpty / addAll / etc methods
Change-Id: Iabdb8b0ce0ec954a36dc33f18bcaaf06964dd04e
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/59ed6628
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/59ed6628
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/59ed6628
Branch: refs/heads/master
Commit: 59ed6628e2b30e63f037a0dbbc27b8d28f773fc4
Parents: 8cb0111
Author: Zsombor Gegesy <gz...@gmail.com>
Authored: Tue Feb 21 13:51:50 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Tue Feb 28 11:05:24 2017 +0000
----------------------------------------------------------------------
.../src/main/java/org/apache/ranger/biz/AssetMgr.java | 6 +++---
.../src/main/java/org/apache/ranger/biz/KmsKeyMgr.java | 2 +-
.../main/java/org/apache/ranger/biz/RangerBizUtil.java | 9 +++------
.../main/java/org/apache/ranger/biz/ServiceDBStore.java | 2 +-
.../src/main/java/org/apache/ranger/biz/SessionMgr.java | 2 +-
.../src/main/java/org/apache/ranger/common/MapUtil.java | 2 +-
.../main/java/org/apache/ranger/common/SearchGroup.java | 6 +++---
.../main/java/org/apache/ranger/common/SearchUtil.java | 8 ++++----
.../main/java/org/apache/ranger/common/ServiceUtil.java | 6 ++----
.../main/java/org/apache/ranger/common/StringUtil.java | 2 +-
.../org/apache/ranger/patch/PatchMigration_J10002.java | 10 ++++------
.../apache/ranger/patch/PatchPersmissionModel_J10003.java | 2 +-
.../java/org/apache/ranger/patch/cliutil/MetricUtil.java | 8 ++++----
.../src/main/java/org/apache/ranger/rest/ServiceREST.java | 2 +-
.../main/java/org/apache/ranger/rest/ServiceRESTUtil.java | 2 +-
.../security/listener/RangerHttpSessionListener.java | 2 +-
.../security/web/filter/RangerCSRFPreventionFilter.java | 5 ++---
.../org/apache/ranger/service/RangerPolicyService.java | 6 +++---
.../ranger/service/RangerServiceDefServiceBase.java | 2 +-
.../apache/ranger/service/RangerServiceServiceBase.java | 2 +-
.../main/java/org/apache/ranger/service/UserService.java | 4 ++--
.../java/org/apache/ranger/service/XPolicyService.java | 2 +-
.../java/org/apache/ranger/service/XResourceService.java | 4 ++--
.../java/org/apache/ranger/service/XTrxLogService.java | 2 +-
.../main/java/org/apache/ranger/service/XUserService.java | 4 ++--
.../src/main/java/org/apache/ranger/solr/SolrUtil.java | 8 ++++----
.../main/java/org/apache/ranger/util/RangerEnumUtil.java | 4 ++--
.../main/java/org/apache/ranger/util/RangerRestUtil.java | 2 +-
.../java/org/apache/ranger/biz/TestServiceDBStore.java | 2 --
29 files changed, 54 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
index d4ab8d7..9244cd6 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/AssetMgr.java
@@ -906,7 +906,7 @@ public class AssetMgr extends AssetMgrBase {
}
if (searchCriteria.getParamList() != null
- && searchCriteria.getParamList().size() > 0) {
+ && !searchCriteria.getParamList().isEmpty()) {
int clientTimeOffsetInMinute = RestUtil.getClientTimeOffset();
Date temp = null;
DateUtil dateUtil = new DateUtil();
@@ -954,7 +954,7 @@ public class AssetMgr extends AssetMgrBase {
searchCriteria = new SearchCriteria();
}
if (searchCriteria.getParamList() != null
- && searchCriteria.getParamList().size() > 0) {
+ && !searchCriteria.getParamList().isEmpty()) {
int clientTimeOffsetInMinute = RestUtil.getClientTimeOffset();
Date temp = null;
DateUtil dateUtil = new DateUtil();
@@ -1068,7 +1068,7 @@ public class AssetMgr extends AssetMgrBase {
}
if (searchCriteria.getParamList() != null
- && searchCriteria.getParamList().size() > 0) {
+ && !searchCriteria.getParamList().isEmpty()) {
int clientTimeOffsetInMinute = RestUtil.getClientTimeOffset();
Date temp = null;
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
index e90b106..924aaa9 100755
--- a/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/KmsKeyMgr.java
@@ -176,7 +176,7 @@ public class KmsKeyMgr {
}
}
//details
- if (vxKmsKeyList != null && vxKmsKeyList.getVXKeys() != null && vxKmsKeyList.getVXKeys().size() > 0) {
+ if (vxKmsKeyList != null && vxKmsKeyList.getVXKeys() != null && !vxKmsKeyList.getVXKeys().isEmpty()) {
List<VXKmsKey> lstKMSKey = vxKmsKeyList.getVXKeys();
int startIndex=restErrorUtil.parseInt(
request.getParameter("startIndex"), 0,
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/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 5521ae8..cceb380 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
@@ -22,6 +22,7 @@ package org.apache.ranger.biz;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
@@ -1230,12 +1231,8 @@ public class RangerBizUtil {
List<String> pathToCheckArray = new ArrayList<String>();
List<String> wildcardPathArray = new ArrayList<String>();
- for (String p : pathToCheck.split(fileSeparator)) {
- pathToCheckArray.add(p);
- }
- for (String w : wildcardPath.split(fileSeparator)) {
- wildcardPathArray.add(w);
- }
+ Collections.addAll(pathToCheckArray, pathToCheck.split(fileSeparator));
+ Collections.addAll(wildcardPathArray, wildcardPath.split(fileSeparator));
if (pathToCheckArray.size() == wildcardPathArray.size()) {
boolean match = false;
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
index bd6279b..a75c19a 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java
@@ -2473,7 +2473,7 @@ public class ServiceDBStore extends AbstractServiceStore {
RangerServiceDef tagServiceDef = getServiceDef(createdService.getType());
List<RangerResourceDef> tagResourceDef = tagServiceDef.getResources();
- if (tagResourceDef != null && tagResourceDef.size() > 0) {
+ if (tagResourceDef != null && !tagResourceDef.isEmpty()) {
// Assumption : First (and perhaps the only) resourceDef is the name of the tag resource
RangerResourceDef theTagResourceDef = tagResourceDef.get(0);
tagResourceDefName = theTagResourceDef.getName();
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
index ec744ea..0122e6b 100644
--- a/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
+++ b/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java
@@ -369,7 +369,7 @@ public class SessionMgr {
searchCriteria = new SearchCriteria();
}
if (searchCriteria.getParamList() != null
- && searchCriteria.getParamList().size() > 0) {
+ && !searchCriteria.getParamList().isEmpty()) {
int clientTimeOffsetInMinute=RestUtil.getClientTimeOffset();
java.util.Date temp = null;
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java b/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
index 93fc76b..59d7333 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/MapUtil.java
@@ -47,7 +47,7 @@ public class MapUtil implements Serializable{
public static String getPolicyExportAuditSyncStatus(int key) {
String status="";
- if(policyExportAuditSyncStatusMessageMap==null || policyExportAuditSyncStatusMessageMap.size()==0){
+ if(policyExportAuditSyncStatusMessageMap==null || policyExportAuditSyncStatusMessageMap.isEmpty()){
init();
}
if(policyExportAuditSyncStatusMessageMap!=null && policyExportAuditSyncStatusMessageMap.containsKey(key)){
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java b/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java
index 77119b1..00935f3 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/SearchGroup.java
@@ -45,7 +45,7 @@ public class SearchGroup {
}
public String getWhereClause(String prefix) {
- if (values == null || values.size() == 0 || searchGroups == null || searchGroups.size() == 0) {
+ if (values == null || values.isEmpty() || searchGroups == null || searchGroups.isEmpty()) {
return "";
}
@@ -107,8 +107,8 @@ public class SearchGroup {
* @param query
*/
public void resolveValues(Query query, String prefix) {
- if ((values == null || values.size() == 0)
- || (searchGroups == null || searchGroups.size() == 0)) {
+ if ((values == null || values.isEmpty())
+ || (searchGroups == null || searchGroups.isEmpty())) {
return;
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/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 f4fcfb2..0723ee9 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
@@ -178,7 +178,7 @@ public class SearchUtil {
if (values != null && values.length > 1) {
List<Long> multiValues = extractLongList(request, searchCriteria,
paramName, userFriendlyParamName, paramName);
- if (multiValues != null && multiValues.size() > 0) {
+ if (multiValues != null && !multiValues.isEmpty()) {
return multiValues.get(0);
} else {
return null;
@@ -271,7 +271,7 @@ public class SearchUtil {
paramName);
valueList.add(value);
}
- if (valueList.size() > 0) {
+ if (!valueList.isEmpty()) {
searchCriteria.getParamList().put(listName, valueList);
}
return valueList;
@@ -489,7 +489,7 @@ public class SearchUtil {
intValueList = (Collection<Number>) paramValue;
}
- if (intValueList != null && intValueList.size() > 0) {
+ if (intValueList != null && !intValueList.isEmpty()) {
if (searchField.getCustomCondition() == null) {
if (intValueList.size() <= minInListLength) {
whereClause.append(" and ");
@@ -679,7 +679,7 @@ public class SearchUtil {
intValueList = (Collection<Number>) paramValue;
}
- if (intValueList != null && intValueList.size() > 0
+ if (intValueList != null && !intValueList.isEmpty()
&& intValueList.size() <= minInListLength) {
int count = -1;
for (Number value : intValueList) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
index 6864c5a..7f471b0 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java
@@ -231,7 +231,7 @@ public class ServiceUtil {
ret.setName(StringUtils.trim(resource.getPolicyName()));
ret.setDescription(resource.getDescription());
ret.setIsEnabled(resource.getResourceStatus() == RangerCommonEnums.STATUS_ENABLED);
- ret.setIsAuditEnabled(resource.getAuditList() != null && resource.getAuditList().size() > 0);
+ ret.setIsAuditEnabled(resource.getAuditList() != null && !resource.getAuditList().isEmpty());
Boolean isPathRecursive = resource.getIsRecursive() == RangerCommonEnums.BOOL_TRUE;
Boolean isTableExcludes = resource.getTableType() == RangerCommonEnums.POLICY_EXCLUSION;
@@ -424,9 +424,7 @@ public class ServiceUtil {
ret.put(resourceType, resource);
}
- for(String res : resourceString.split(",")) {
- resource.getValues().add(res);
- }
+ Collections.addAll(resource.getValues(), resourceString.split(","));
}
return ret;
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java b/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java
index da7231e..aab8669 100644
--- a/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/common/StringUtil.java
@@ -239,7 +239,7 @@ public class StringUtil implements Serializable {
* @return true if it is empty list or null
*/
public boolean isEmpty(List<?> list) {
- if (list == null || list.size() == 0) {
+ if (list == null || list.isEmpty()) {
return true;
}
return false;
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java
index d77e4f9..0af7a1d 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchMigration_J10002.java
@@ -148,10 +148,10 @@ public class PatchMigration_J10002 extends BaseLoader {
try {
List<XXAsset> repoList = daoMgr.getXXAsset().getAll();
- if (repoList.size() <= 0) {
+ if (repoList.isEmpty()) {
return;
}
- if (repoList.size() > 0) {
+ if (!repoList.isEmpty()) {
EmbeddedServiceDefsUtil.instance().init(svcDBStore);
}
@@ -188,7 +188,7 @@ public class PatchMigration_J10002 extends BaseLoader {
try {
List<XXResource> resList = daoMgr.getXXResource().getAll();
- if (resList.size() <= 0) {
+ if (resList.isEmpty()) {
return;
}
@@ -405,9 +405,7 @@ public class PatchMigration_J10002 extends BaseLoader {
ret.put(resourceType, resource);
}
- for(String res : resourceString.split(",")) {
- resource.getValues().add(res);
- }
+ Collections.addAll(resource.getValues(), resourceString.split(","));
}
return ret;
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java b/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java
index a48f486..89bfd9f 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/PatchPersmissionModel_J10003.java
@@ -173,7 +173,7 @@ public class PatchPersmissionModel_J10003 extends BaseLoader {
Path path = Paths.get(aFileName);
if (Files.exists(path) && Files.isRegularFile(path)) {
List<String> fileContents=Files.readAllLines(path, ENCODING);
- if(fileContents!=null && fileContents.size()>0){
+ if(fileContents!=null && !fileContents.isEmpty()){
for(String line:fileContents){
if(!StringUtils.isEmpty(line) && !userNames.contains(line)){
try{
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/patch/cliutil/MetricUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/MetricUtil.java b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/MetricUtil.java
index fb438a7..3fe34be 100644
--- a/security-admin/src/main/java/org/apache/ranger/patch/cliutil/MetricUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/patch/cliutil/MetricUtil.java
@@ -338,7 +338,7 @@ public class MetricUtil extends BaseLoader {
RangerServiceDef rangerServiceDefObj = (RangerServiceDef) repoType;
String name = rangerServiceDefObj.getName();
List<RangerContextEnricherDef> contextEnrichers = rangerServiceDefObj.getContextEnrichers();
- if (contextEnrichers != null && contextEnrichers.size() > 0) {
+ if (contextEnrichers != null && !contextEnrichers.isEmpty()) {
serviceWithContextEnrichers.setServiceName(name);
serviceWithContextEnrichers.setTotalCount(contextEnrichers.size());
}
@@ -365,7 +365,7 @@ public class MetricUtil extends BaseLoader {
PList<RangerServiceDef> paginatedSvcDefs = svcStore.getPaginatedServiceDefs(policyFilter1);
if (paginatedSvcDefs != null) {
List<RangerServiceDef> rangerServiceDef = paginatedSvcDefs.getList();
- if (rangerServiceDef != null && rangerServiceDef.size() > 0) {
+ if (rangerServiceDef != null && !rangerServiceDef.isEmpty()) {
for (int i = 0; i < rangerServiceDef.size(); i++) {
if (rangerServiceDef.get(i) != null) {
String serviceDef = rangerServiceDef.get(i).getName();
@@ -379,7 +379,7 @@ public class MetricUtil extends BaseLoader {
for (int j = 0; j < policies.size(); j++) {
if (policies.get(j) != null) {
List<RangerPolicyItem> policyItem = policies.get(j).getDenyPolicyItems();
- if (policyItem != null && policyItem.size() > 0) {
+ if (policyItem != null && !policyItem.isEmpty()) {
if (denyconditionsonMap.get(serviceDef) != null) {
denyCount = denyconditionsonMap.get(serviceDef) + denyCount + policyItem.size();
} else {
@@ -387,7 +387,7 @@ public class MetricUtil extends BaseLoader {
}
}
List<RangerPolicyItem> policyItemExclude = policies.get(j).getDenyExceptions();
- if (policyItemExclude != null && policyItemExclude.size() > 0) {
+ if (policyItemExclude != null && !policyItemExclude.isEmpty()) {
if (denyconditionsonMap.get(serviceDef) != null) {
denyCount = denyconditionsonMap.get(serviceDef) + denyCount + policyItemExclude.size();
} else {
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
index 9ec81b3..6176319 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java
@@ -2062,7 +2062,7 @@ public class ServiceREST {
orderedPolicies.put(policy.getId(), policy);
}
}
- if (orderedPolicies.size() > 0) {
+ if (!orderedPolicies.isEmpty()) {
policyLists.clear();
policyLists.addAll(orderedPolicies.values());
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/rest/ServiceRESTUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/rest/ServiceRESTUtil.java b/security-admin/src/main/java/org/apache/ranger/rest/ServiceRESTUtil.java
index e84a1aa..c49c426 100644
--- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceRESTUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceRESTUtil.java
@@ -754,7 +754,7 @@ public class ServiceRESTUtil {
allItems.addAll(policy.getDenyExceptions());
for (RangerPolicy.RangerPolicyItem policyItem : allItems) {
- if (policyItem.getConditions().size() > 0) {
+ if (!policyItem.getConditions().isEmpty()) {
ret = true;
break;
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/security/listener/RangerHttpSessionListener.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/listener/RangerHttpSessionListener.java b/security-admin/src/main/java/org/apache/ranger/security/listener/RangerHttpSessionListener.java
index e0069b6..04edf66 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/listener/RangerHttpSessionListener.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/listener/RangerHttpSessionListener.java
@@ -36,7 +36,7 @@ public class RangerHttpSessionListener implements HttpSessionListener {
@Override
public void sessionDestroyed(HttpSessionEvent event) {
- if (listOfSession.size() > 0) {
+ if (!listOfSession.isEmpty()) {
listOfSession.remove(event.getSession());
}
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerCSRFPreventionFilter.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerCSRFPreventionFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerCSRFPreventionFilter.java
index 6eabbb9..3736bb4 100644
--- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerCSRFPreventionFilter.java
+++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerCSRFPreventionFilter.java
@@ -20,6 +20,7 @@
package org.apache.ranger.security.web.filter;
import java.io.IOException;
+import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
import javax.servlet.Filter;
@@ -84,9 +85,7 @@ public class RangerCSRFPreventionFilter implements Filter {
void parseMethodsToIgnore(String mti) {
String[] methods = mti.split(",");
methodsToIgnore = new HashSet<String>();
- for (int i = 0; i < methods.length; i++) {
- methodsToIgnore.add(methods[i]);
- }
+ Collections.addAll(methodsToIgnore, methods);
}
void parseBrowserUserAgents(String userAgents) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java
index 8d9776a..00c08db 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerPolicyService.java
@@ -463,7 +463,7 @@ public class RangerPolicyService extends RangerPolicyServiceBase<XXPolicy, Range
return "";
}
List<RangerPolicyItem> rangerPolicyItems = (List<RangerPolicyItem>) value;
- if(rangerPolicyItems==null || rangerPolicyItems.size()==0){
+ if(rangerPolicyItems==null || rangerPolicyItems.isEmpty()){
return "";
}
String ret = jsonUtil.readListToString(rangerPolicyItems);
@@ -504,7 +504,7 @@ public class RangerPolicyService extends RangerPolicyServiceBase<XXPolicy, Range
return "";
}
List<RangerDataMaskPolicyItem> rangerPolicyItems = (List<RangerDataMaskPolicyItem>) value;
- if(rangerPolicyItems==null || rangerPolicyItems.size()==0){
+ if(rangerPolicyItems==null || rangerPolicyItems.isEmpty()){
return "";
}
String ret = jsonUtil.readListToString(rangerPolicyItems);
@@ -520,7 +520,7 @@ public class RangerPolicyService extends RangerPolicyServiceBase<XXPolicy, Range
return "";
}
List<RangerRowFilterPolicyItem> rangerPolicyItems = (List<RangerRowFilterPolicyItem>) value;
- if(rangerPolicyItems==null || rangerPolicyItems.size()==0){
+ if(rangerPolicyItems==null || rangerPolicyItems.isEmpty()){
return "";
}
String ret = jsonUtil.readListToString(rangerPolicyItems);
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java
index aacf398..ca3a7ba 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefServiceBase.java
@@ -544,7 +544,7 @@ public abstract class RangerServiceDefServiceBase<T extends XXServiceDefBase, V
permittedServiceDefs.add(xSvcDef);
}
}
- if (permittedServiceDefs.size() > 0) {
+ if (!permittedServiceDefs.isEmpty()) {
populatePageList(permittedServiceDefs, startIndex, pageSize, retList);
}
return retList;
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
index 75237de..315946e 100755
--- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceServiceBase.java
@@ -144,7 +144,7 @@ public abstract class RangerServiceServiceBase<T extends XXServiceBase, V extend
}
}
- if(permittedServices.size() > 0) {
+ if(!permittedServices.isEmpty()) {
populatePageList(permittedServices, startIndex, pageSize, retList);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/service/UserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/UserService.java b/security-admin/src/main/java/org/apache/ranger/service/UserService.java
index 164e241..91fb38b 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/UserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/UserService.java
@@ -147,7 +147,7 @@ public class UserService extends UserServiceBase<XXPortalUser, VXPortalUser> {
userProfile.setPublicScreenName(userProfile.getFirstName() + " "
+ userProfile.getLastName());
- if (messageList.size() > 0) {
+ if (!messageList.isEmpty()) {
VXResponse gjResponse = new VXResponse();
gjResponse.setStatusCode(VXResponse.STATUS_ERROR);
gjResponse.setMsgDesc("Validation failure");
@@ -233,7 +233,7 @@ public class UserService extends UserServiceBase<XXPortalUser, VXPortalUser> {
// TODO: Need to see whether user can set user as internal
- if (messageList.size() > 0) {
+ if (!messageList.isEmpty()) {
VXResponse gjResponse = new VXResponse();
gjResponse.setStatusCode(VXResponse.STATUS_ERROR);
gjResponse.setMsgDesc("Validation failure");
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java b/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
index f3f7c80..066bc6a 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XPolicyService.java
@@ -365,7 +365,7 @@ public class XPolicyService extends PublicAPIServiceBase<VXResource, VXPolicy> {
}
// Create Newly added permissions and Remove deleted permissions from DB
- if (prevPermMap.size() == 0) {
+ if (prevPermMap.isEmpty()) {
updPermMapList.addAll(permMapList);
} else {
for (Entry<String, VXPermMap> entry : newPermMap.entrySet()) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
index 817fdda..b7cbc59 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java
@@ -385,7 +385,7 @@ public class XResourceService extends
}
}
- if (adminPermResourceList.size() > 0) {
+ if (!adminPermResourceList.isEmpty()) {
populatePageList(adminPermResourceList, startIndex, pageSize,
returnList);
}
@@ -1072,7 +1072,7 @@ public class XResourceService extends
e.printStackTrace();
}
- if(trxLogList.size()==0){
+ if(trxLogList.isEmpty()){
XXTrxLog xTrxLog = new XXTrxLog();
xTrxLog.setAction(action);
xTrxLog.setObjectClassType(AppConstants.CLASS_TYPE_XA_RESOURCE);
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
index 1c43445..20db24e 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java
@@ -299,7 +299,7 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> {
countCQ.select(criteriaBuilder.count(rootEntityType)).where(predicate);
List<Long> countList = em.createQuery(countCQ).getResultList();
Long count = 0L;
- if(countList != null && countList.size() > 0) {
+ if(countList != null && !countList.isEmpty()) {
count = countList.get(0);
if(count == null) {
count = 0L;
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
index 0f8156a..e8fef7a 100644
--- a/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
+++ b/security-admin/src/main/java/org/apache/ranger/service/XUserService.java
@@ -254,7 +254,7 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> {
userRoleList.add(gjUserRole.getUserRole());
}
}
- if(userRoleList==null || userRoleList.size()==0){
+ if(userRoleList==null || userRoleList.isEmpty()){
userRoleList.add(RangerConstants.ROLE_USER);
}
vObj.setUserRoleList(userRoleList);
@@ -363,7 +363,7 @@ public class XUserService extends XUserServiceBase<XXUser, VXUser> {
trxLogList.add(xTrxLog);
}
- if (trxLogList.size() == 0) {
+ if (trxLogList.isEmpty()) {
XXTrxLog xTrxLog = new XXTrxLog();
xTrxLog.setAction(action);
xTrxLog.setObjectClassType(AppConstants.CLASS_TYPE_XA_USER);
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
index 834713a..85f420d 100644
--- a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java
@@ -195,7 +195,7 @@ public class SolrUtil {
}
public String orList(String fieldName, Collection<?> valueList) {
- if (valueList == null || valueList.size() == 0) {
+ if (valueList == null || valueList.isEmpty()) {
return null;
}
String expr = "";
@@ -210,7 +210,7 @@ public class SolrUtil {
+ ClientUtils.escapeQueryChars(value.toString()
.toLowerCase());
}
- if (valueList.size() == 0) {
+ if (valueList.isEmpty()) {
return expr;
} else {
return "(" + expr + ")";
@@ -219,7 +219,7 @@ public class SolrUtil {
}
public String andList(String fieldName, Collection<?> valueList) {
- if (valueList == null || valueList.size() == 0) {
+ if (valueList == null || valueList.isEmpty()) {
return null;
}
String expr = "";
@@ -234,7 +234,7 @@ public class SolrUtil {
+ ClientUtils.escapeQueryChars(value.toString()
.toLowerCase());
}
- if (valueList.size() == 0) {
+ if (valueList.isEmpty()) {
return expr;
} else {
return "(" + expr + ")";
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
index 6084972..b39bcf4 100644
--- a/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/util/RangerEnumUtil.java
@@ -70,14 +70,14 @@ public class RangerEnumUtil {
protected List<VEnum> enumList = new ArrayList<VEnum>();
public List<VEnum> getEnums() {
- if (enumList.size() == 0) {
+ if (enumList.isEmpty()) {
init();
}
return enumList;
}
public VEnum getEnum(String enumName) {
- if (enumList.size() == 0) {
+ if (enumList.isEmpty()) {
init();
}
return enumMap.get(enumName);
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
----------------------------------------------------------------------
diff --git a/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java b/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
index 9a2a505..fe7a53e 100644
--- a/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
+++ b/security-admin/src/main/java/org/apache/ranger/util/RangerRestUtil.java
@@ -131,7 +131,7 @@ public class RangerRestUtil {
}
}
- if (messageList.size() > 0) {
+ if (!messageList.isEmpty()) {
VXResponse gjResponse = new VXResponse();
gjResponse.setStatusCode(VXResponse.STATUS_ERROR);
gjResponse.setMsgDesc("Validation failure");
http://git-wip-us.apache.org/repos/asf/ranger/blob/59ed6628/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
----------------------------------------------------------------------
diff --git a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
index 2b773da..92b8151 100644
--- a/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
+++ b/security-admin/src/test/java/org/apache/ranger/biz/TestServiceDBStore.java
@@ -2789,8 +2789,6 @@ public class TestServiceDBStore {
resourceDef.setDescription("Key Name");
List<RangerResourceDef> resourceHierarchy = new ArrayList<RangerResourceDef>();
- resourceHierarchy.addAll(resourceHierarchy);
-
spy.createService(rangerService);
vXUser = new VXUser();
vXUser.setName(userName);