Repository: ranger Updated Branches: refs/heads/master ab2a7df91 -> 83e19b8d3
RANGER-2031: 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/83e19b8d Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/83e19b8d Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/83e19b8d Branch: refs/heads/master Commit: 83e19b8d38364282826c824f0f683350479e3189 Parents: ab2a7df Author: Abhay Kulkarni <akulka...@hortonworks.com> Authored: Tue Mar 20 08:03:39 2018 -0700 Committer: Abhay Kulkarni <akulka...@hortonworks.com> Committed: Tue Mar 20 08:03:39 2018 -0700 ---------------------------------------------------------------------- .../ranger/plugin/contextenricher/RangerTagForEval.java | 2 +- .../apache/ranger/plugin/model/RangerValidityRecurrence.java | 3 ++- .../apache/ranger/plugin/model/RangerValiditySchedule.java | 5 ++--- .../model/validation/RangerValidityScheduleValidator.java | 2 +- .../policyevaluator/RangerValidityScheduleEvaluator.java | 3 ++- .../main/java/org/apache/ranger/common/RangerSearchUtil.java | 7 +++---- 6 files changed, 11 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/83e19b8d/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagForEval.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagForEval.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagForEval.java index 524605d..3f0db31 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagForEval.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagForEval.java @@ -62,7 +62,7 @@ public class RangerTagForEval implements Serializable { @JsonIgnore private List<RangerValiditySchedule> validityPeriods; @JsonIgnore - private List<RangerValidityScheduleEvaluator> validityPeriodEvaluators; + private transient List<RangerValidityScheduleEvaluator> validityPeriodEvaluators; private RangerTagForEval() {} http://git-wip-us.apache.org/repos/asf/ranger/blob/83e19b8d/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValidityRecurrence.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValidityRecurrence.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValidityRecurrence.java index 4bff3ea..23b4a8c 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValidityRecurrence.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValidityRecurrence.java @@ -26,6 +26,7 @@ import org.codehaus.jackson.map.annotate.JsonSerialize; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlRootElement; +import java.io.Serializable; @JsonAutoDetect(fieldVisibility= JsonAutoDetect.Visibility.ANY) @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @@ -33,7 +34,7 @@ import javax.xml.bind.annotation.XmlRootElement; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) -public class RangerValidityRecurrence { +public class RangerValidityRecurrence implements Serializable { @JsonAutoDetect(fieldVisibility= JsonAutoDetect.Visibility.ANY) @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) http://git-wip-us.apache.org/repos/asf/ranger/blob/83e19b8d/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValiditySchedule.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValiditySchedule.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValiditySchedule.java index 8fe3231..55f787d 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValiditySchedule.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerValiditySchedule.java @@ -31,11 +31,10 @@ import org.codehaus.jackson.annotate.JsonIgnoreProperties; import org.codehaus.jackson.annotate.JsonAutoDetect.Visibility; import org.codehaus.jackson.map.annotate.JsonSerialize; +import java.io.Serializable; import java.util.ArrayList; import java.util.Arrays; -import java.util.Date; import java.util.List; -import java.util.TimeZone; @JsonAutoDetect(fieldVisibility=Visibility.ANY) @JsonSerialize(include=JsonSerialize.Inclusion.NON_NULL) @@ -43,7 +42,7 @@ import java.util.TimeZone; @XmlRootElement @XmlAccessorType(XmlAccessType.FIELD) -public class RangerValiditySchedule { +public class RangerValiditySchedule implements Serializable { private static final Log LOG = LogFactory.getLog(RangerValiditySchedule.class); http://git-wip-us.apache.org/repos/asf/ranger/blob/83e19b8d/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidityScheduleValidator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidityScheduleValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidityScheduleValidator.java index 4557b9f..30c4d41 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidityScheduleValidator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidityScheduleValidator.java @@ -316,7 +316,7 @@ public class RangerValidityScheduleValidator { this.upper = upper; } } - class RangeComparator implements Comparator<Range>, Serializable { + class RangeComparator implements Comparator<Range> { @Override public int compare(Range me, Range other) { int result; http://git-wip-us.apache.org/repos/asf/ranger/blob/83e19b8d/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerValidityScheduleEvaluator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerValidityScheduleEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerValidityScheduleEvaluator.java index 8f996d1..f097f22 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerValidityScheduleEvaluator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerValidityScheduleEvaluator.java @@ -32,6 +32,7 @@ import org.apache.ranger.plugin.resourcematcher.ScheduledTimeRangeMatcher; import org.apache.ranger.plugin.util.RangerPerfTracer; import javax.annotation.Nonnull; +import java.io.Serializable; import java.text.DateFormat; import java.text.ParseException; import java.text.SimpleDateFormat; @@ -298,7 +299,7 @@ public class RangerValidityScheduleEvaluator { - For dayOfMonth calculation, consider that months have different number of days */ - private class ValueWithBorrow { + private static class ValueWithBorrow { int value; boolean borrow; http://git-wip-us.apache.org/repos/asf/ranger/blob/83e19b8d/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 86b4e43..c2783dc 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 @@ -25,6 +25,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; +import javax.annotation.Nonnull; import javax.persistence.EntityManager; import javax.persistence.Query; import javax.servlet.http.HttpServletRequest; @@ -40,10 +41,8 @@ import org.springframework.stereotype.Component; public class RangerSearchUtil extends SearchUtil { final static Logger logger = Logger.getLogger(RangerSearchUtil.class); - public SearchFilter getSearchFilter(HttpServletRequest request, List<SortField> sortFields) { - if (request == null) { - return null; - } + public SearchFilter getSearchFilter(@Nonnull HttpServletRequest request, List<SortField> sortFields) { + SearchFilter ret = new SearchFilter(); if (MapUtils.isEmpty(request.getParameterMap())) {
