This is an automated email from the ASF dual-hosted git repository. pradeep pushed a commit to branch RANGER-5061_master in repository https://gitbox.apache.org/repos/asf/ranger.git
commit 04a69db2f45c8f86ede690ce6cbe2d200df93172 Author: Madhan Neethiraj <[email protected]> AuthorDate: Fri Jan 3 11:26:02 2025 -0800 RANGER-5061: checkstyle compliance updates - security-admin elasticsearch --- .../ElasticSearchAccessAuditsService.java | 46 ++++++++++------------ .../ranger/elasticsearch/ElasticSearchUtil.java | 25 ++++++------ 2 files changed, 32 insertions(+), 39 deletions(-) diff --git a/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java b/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java index 4f6c808ff..5c24db116 100644 --- a/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java +++ b/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchAccessAuditsService.java @@ -68,7 +68,7 @@ public class ElasticSearchAccessAuditsService extends org.apache.ranger.AccessAu throw restErrorUtil.createRESTException("Error connecting to search engine", MessageEnums.ERROR_SYSTEM); } - List<VXAccessAudit> xAccessAuditList = new ArrayList<VXAccessAudit>(); + List<VXAccessAudit> xAccessAuditList = new ArrayList<>(); Map<String, Object> paramList = searchCriteria.getParamList(); updateUserExclusion(paramList); @@ -93,31 +93,27 @@ public class ElasticSearchAccessAuditsService extends org.apache.ranger.AccessAu throw restErrorUtil.createRESTException("Error querying search engine", MessageEnums.ERROR_SYSTEM); } - for (int i = 0; i < docs.length; i++) { // NOPMD - This for loop can be replaced by a foreach loop - MultiGetItemResponse doc = docs[i]; - VXAccessAudit vXAccessAudit = populateViewBean(doc.getResponse()); - - if (vXAccessAudit != null) { - String serviceType = vXAccessAudit.getServiceType(); - boolean isHive = "hive".equalsIgnoreCase(serviceType); - - if (!hiveQueryVisibility && isHive) { - vXAccessAudit.setRequestData(null); - } else if (isHive) { - String accessType = vXAccessAudit.getAccessType(); - - if ("grant".equalsIgnoreCase(accessType) || "revoke".equalsIgnoreCase(accessType)) { - String requestData = vXAccessAudit.getRequestData(); - - if (requestData != null) { - try { - vXAccessAudit.setRequestData(java.net.URLDecoder.decode(requestData, "UTF-8")); - } catch (UnsupportedEncodingException e) { - LOGGER.warn("Error while encoding request data: {}", requestData, e); - } - } else { - LOGGER.warn("Error in request data of audit from elasticSearch. AuditData: {}", vXAccessAudit); + for (MultiGetItemResponse doc : docs) { + VXAccessAudit vXAccessAudit = populateViewBean(doc.getResponse()); + String serviceType = vXAccessAudit.getServiceType(); + boolean isHive = "hive".equalsIgnoreCase(serviceType); + + if (!hiveQueryVisibility && isHive) { + vXAccessAudit.setRequestData(null); + } else if (isHive) { + String accessType = vXAccessAudit.getAccessType(); + + if ("grant".equalsIgnoreCase(accessType) || "revoke".equalsIgnoreCase(accessType)) { + String requestData = vXAccessAudit.getRequestData(); + + if (requestData != null) { + try { + vXAccessAudit.setRequestData(java.net.URLDecoder.decode(requestData, "UTF-8")); + } catch (UnsupportedEncodingException e) { + LOGGER.warn("Error while encoding request data: {}", requestData, e); } + } else { + LOGGER.warn("Error in request data of audit from elasticSearch. AuditData: {}", vXAccessAudit); } } } diff --git a/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchUtil.java b/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchUtil.java index f9cbcbe43..2f177e762 100644 --- a/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/elasticsearch/ElasticSearchUtil.java @@ -50,6 +50,7 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.List; +import java.util.Objects; import java.util.TimeZone; @Component @@ -81,7 +82,7 @@ public class ElasticSearchUtil { QueryAccumulator queryAccumulator = new QueryAccumulator(searchCriteria); if (searchCriteria.getParamList() != null) { - searchFields.stream().forEach(queryAccumulator::addQuery); + searchFields.forEach(queryAccumulator::addQuery); // For now assuming there is only date field where range query will // be done. If we there are more than one, then we should create a @@ -93,7 +94,7 @@ public class ElasticSearchUtil { BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery(); - queryAccumulator.queries.stream().filter(x -> x != null).forEach(boolQueryBuilder::must); + queryAccumulator.queries.stream().filter(Objects::nonNull).forEach(boolQueryBuilder::must); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder(); @@ -161,16 +162,12 @@ public class ElasticSearchUtil { return null; } - if (valueList.isEmpty()) { - return null; - } else { - return QueryBuilders.queryStringQuery(valueList.stream() - .map(this::filterText) - .map(x -> "(" + x + ")") - .reduce((a, b) -> a + " OR " + b) - .get() - ).defaultField(fieldName); - } + return QueryBuilders.queryStringQuery(valueList.stream() + .map(this::filterText) + .map(x -> "(" + x + ")") + .reduce((a, b) -> a + " OR " + b) + .get() + ).defaultField(fieldName); } public QueryBuilder setDateRange(String fieldName, Date fromDate, Date toDate) { @@ -288,13 +285,13 @@ public class ElasticSearchUtil { return null; } else { if (searchType == SearchField.SEARCH_TYPE.PARTIAL) { - if (paramValue.toString().trim().length() == 0) { + if (paramValue.toString().trim().isEmpty()) { return null; } else { return QueryBuilders.queryStringQuery("*" + filterText(paramValue) + "*").defaultField(fieldName); } } else { - if (paramValue.toString().trim().length() > 0) { + if (!paramValue.toString().trim().isEmpty()) { return QueryBuilders.matchPhraseQuery(fieldName, filterText(paramValue)); } else { return null;
