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 29d7277c9269de5555e8e17b80a8b8942d5bd264 Author: Madhan Neethiraj <[email protected]> AuthorDate: Fri Jan 3 11:29:53 2025 -0800 RANGER-5061: checkstyle compliance updates - security-admin module for org.apache.ranger.amazon --- .../cloudwatch/CloudWatchAccessAuditsService.java | 41 ++++++++++------------ .../ranger/amazon/cloudwatch/CloudWatchUtil.java | 10 +++--- 2 files changed, 24 insertions(+), 27 deletions(-) diff --git a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchAccessAuditsService.java b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchAccessAuditsService.java index f15076427..41d7121dd 100644 --- a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchAccessAuditsService.java +++ b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchAccessAuditsService.java @@ -69,7 +69,7 @@ public class CloudWatchAccessAuditsService extends org.apache.ranger.AccessAudit throw restErrorUtil.createRESTException("Error connecting to cloudwatch", MessageEnums.ERROR_SYSTEM); } - List<VXAccessAudit> xAccessAuditList = new ArrayList<VXAccessAudit>(); + List<VXAccessAudit> xAccessAuditList = new ArrayList<>(); Map<String, Object> paramList = searchCriteria.getParamList(); updateUserExclusion(paramList); @@ -103,28 +103,25 @@ public class CloudWatchAccessAuditsService extends org.apache.ranger.AccessAudit } VXAccessAudit vXAccessAudit = populateViewBean(auditEvent); - - 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 cloudwatch. AuditData:{} ", vXAccessAudit); + 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 cloudwatch. AuditData:{} ", vXAccessAudit); } } } diff --git a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java index ffe43582f..473498dc1 100644 --- a/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/amazon/cloudwatch/CloudWatchUtil.java @@ -52,8 +52,8 @@ import static org.apache.ranger.audit.destination.AmazonCloudWatchAuditDestinati public class CloudWatchUtil { private static final Logger LOGGER = LoggerFactory.getLogger(CloudWatchUtil.class); - String dateFormateStr = "yyyy-MM-dd'T'HH:mm:ss'Z'"; - SimpleDateFormat dateFormat = new SimpleDateFormat(dateFormateStr); + final String dateFormateStr = "yyyy-MM-dd'T'HH:mm:ss'Z'"; + final SimpleDateFormat dateFormat = new SimpleDateFormat(dateFormateStr); private final String logGroupName; private final String logStreamPrefix; @@ -76,7 +76,7 @@ public class CloudWatchUtil { } public List<FilteredLogEvent> searchResources(AWSLogs client, SearchCriteria searchCriteria, List<SearchField> searchFields, List<SortField> sortFieldList) { - List<FilteredLogEvent> result = new ArrayList<FilteredLogEvent>(); + List<FilteredLogEvent> result = new ArrayList<>(); try { String nextToken = null; @@ -136,7 +136,7 @@ public class CloudWatchUtil { Date toDate = null; if (searchCriteria.getParamList() != null) { - List<String> filterExpr = new ArrayList<String>(); + List<String> filterExpr = new ArrayList<>(); for (SearchField searchField : searchFields) { Object paramValue = searchCriteria.getParamValue(searchField.getClientFieldName()); @@ -208,7 +208,7 @@ public class CloudWatchUtil { } if (StringUtils.isNotBlank(strExpr)) { - filterPattern.append("{" + strExpr + "}"); + filterPattern.append("{").append(strExpr).append("}"); } } }
