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 2018/03/12 13:51:49 UTC
ranger git commit: RANGER-1991: Import policy failure fix caused by
static code analysis fix
Repository: ranger
Updated Branches:
refs/heads/ranger-1.0 79d177be7 -> 3d341a4c2
RANGER-1991: Import policy failure fix caused by static code analysis fix
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/3d341a4c
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/3d341a4c
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/3d341a4c
Branch: refs/heads/ranger-1.0
Commit: 3d341a4c2429cae259b831b112c6d65eaa12a2e1
Parents: 79d177b
Author: pradeep <pr...@apache.org>
Authored: Sat Mar 10 15:28:40 2018 +0530
Committer: pradeep <pr...@apache.org>
Committed: Mon Mar 12 19:02:42 2018 +0530
----------------------------------------------------------------------
.../org/apache/ranger/common/RangerSearchUtil.java | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/3d341a4c/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 a2250ec..86b4e43 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
@@ -32,7 +32,6 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.ArrayUtils;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.lang.Validate;
import org.apache.log4j.Logger;
import org.apache.ranger.plugin.util.SearchFilter;
import org.springframework.stereotype.Component;
@@ -42,7 +41,9 @@ public class RangerSearchUtil extends SearchUtil {
final static Logger logger = Logger.getLogger(RangerSearchUtil.class);
public SearchFilter getSearchFilter(HttpServletRequest request, List<SortField> sortFields) {
- Validate.notNull(request, "request");
+ if (request == null) {
+ return null;
+ }
SearchFilter ret = new SearchFilter();
if (MapUtils.isEmpty(request.getParameterMap())) {
@@ -64,8 +65,8 @@ public class RangerSearchUtil extends SearchUtil {
ret.setParam(SearchFilter.POL_RESOURCE, request.getParameter(SearchFilter.POL_RESOURCE));
ret.setParam(SearchFilter.RESOURCE_SIGNATURE, request.getParameter(SearchFilter.RESOURCE_SIGNATURE));
ret.setParam(SearchFilter.POLICY_TYPE, request.getParameter(SearchFilter.POLICY_TYPE));
- ret.setParam(SearchFilter.POLICY_LABEL, request.getParameter(SearchFilter.POLICY_LABEL));
- ret.setParam(SearchFilter.POLICY_LABELS_PARTIAL, request.getParameter(SearchFilter.POLICY_LABELS_PARTIAL));
+ ret.setParam(SearchFilter.POLICY_LABEL, request.getParameter(SearchFilter.POLICY_LABEL));
+ ret.setParam(SearchFilter.POLICY_LABELS_PARTIAL, request.getParameter(SearchFilter.POLICY_LABELS_PARTIAL));
ret.setParam(SearchFilter.PLUGIN_HOST_NAME, request.getParameter(SearchFilter.PLUGIN_HOST_NAME));
ret.setParam(SearchFilter.PLUGIN_APP_TYPE, request.getParameter(SearchFilter.PLUGIN_APP_TYPE));
ret.setParam(SearchFilter.PLUGIN_ENTITY_TYPE, request.getParameter(SearchFilter.PLUGIN_ENTITY_TYPE));
@@ -112,7 +113,9 @@ public class RangerSearchUtil extends SearchUtil {
public SearchFilter getSearchFilterFromLegacyRequest(HttpServletRequest request, List<SortField> sortFields) {
- Validate.notNull(request, "request");
+ if (request == null) {
+ return null;
+ }
SearchFilter ret = new SearchFilter();
if (MapUtils.isEmpty(request.getParameterMap())) {