Issue #3496: Enforce ReturnCount max=1 in com.puppycrawl.tools.checkstyle.filters

8 files changed, 42 insertions, 29 deletions

diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java
index 79aba1a7b..404239c96 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/checks/annotation/SuppressWarningsCheck.java
@@ -249,7 +249,6 @@ public class SuppressWarningsCheck extends AbstractCheck {
      * @return a Token representing the expr.
      */
     private static DetailAST findWarningsHolder(final DetailAST annotation) {
-        DetailAST warningsHolder = annotation;
         final DetailAST annValuePair =
             annotation.findFirstToken(TokenTypes.ANNOTATION_MEMBER_VALUE_PAIR);
         final DetailAST annArrayInit;
@@ -263,6 +262,7 @@ public class SuppressWarningsCheck extends AbstractCheck {
                     annValuePair.findFirstToken(TokenTypes.ANNOTATION_ARRAY_INIT);
         }
 
+        DetailAST warningsHolder = annotation;
         if (annArrayInit != null) {
             warningsHolder = annArrayInit;
         }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilter.java
index c85eb53a0..29bcc585f 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/CsvFilter.java
@@ -88,12 +88,14 @@ class CsvFilter implements IntFilter {
      */
     @Override
     public boolean accept(int intValue) {
+        boolean result = false;
         for (IntFilter filter : getFilters()) {
             if (filter.accept(intValue)) {
-                return true;
+                result = true;
+                break;
             }
         }
-        return false;
+        return result;
     }
 
     @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
index 3833a3920..db2aa9216 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SeverityMatchFilter.java
@@ -60,10 +60,7 @@ public class SeverityMatchFilter
 
     @Override
     public boolean accept(AuditEvent event) {
-        final boolean result = severity == event.getSeverityLevel();
-        if (acceptOnMatch) {
-            return result;
-        }
-        return !result;
+        final boolean severityMatches = severity == event.getSeverityLevel();
+        return acceptOnMatch == severityMatches;
     }
 }
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java
index 2dbfc7dd8..104ac3564 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressElement.java
@@ -128,15 +128,8 @@ public class SuppressElement
 
     @Override
     public boolean accept(AuditEvent event) {
-        // reject if file or check module mismatch?
-        if (isFileNameAndModuleNotMatching(event)) {
-            return true;
-        }
-
-        // reject if no line/column matching
-        return (lineFilter != null || columnFilter != null)
-                && (lineFilter == null || !lineFilter.accept(event.getLine()))
-                && (columnFilter == null || !columnFilter.accept(event.getColumn()));
+        return isFileNameAndModuleNotMatching(event)
+                || isLineAndColumnMatch(event);
     }
 
     /**
@@ -152,6 +145,17 @@ public class SuppressElement
                 || checkRegexp != null && !checkRegexp.matcher(event.getSourceName()).find();
     }
 
+    /**
+     * Whether line and column match.
+     * @param event event to process.
+     * @return true if line and column match.
+     */
+    private boolean isLineAndColumnMatch(AuditEvent event) {
+        return (lineFilter != null || columnFilter != null)
+                && (lineFilter == null || !lineFilter.accept(event.getLine()))
+                && (columnFilter == null || !columnFilter.accept(event.getColumn()));
+    }
+
     @Override
     public int hashCode() {
         return Objects.hash(filePattern, checkPattern, moduleId, linesCsv, columnsCsv);
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
index 68523ac1a..e3c6af713 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressWithNearbyCommentFilter.java
@@ -208,12 +208,14 @@ public class SuppressWithNearbyCommentFilter
      * @return true if event matches any tag from {@link #tags}, false otherwise.
      */
     private boolean matchesTag(AuditEvent event) {
+        boolean result = false;
         for (final Tag tag : tags) {
             if (tag.isMatch(event)) {
-                return true;
+                result = true;
+                break;
             }
         }
-        return false;
+        return result;
     }
 
     /**
@@ -355,11 +357,14 @@ public class SuppressWithNearbyCommentFilter
          */
         @Override
         public int compareTo(Tag other) {
+            final int result;
             if (firstLine == other.firstLine) {
-                return Integer.compare(lastLine, other.lastLine);
+                result = Integer.compare(lastLine, other.lastLine);
             }
-
-            return Integer.compare(firstLine, other.firstLine);
+            else {
+                result = Integer.compare(firstLine, other.firstLine);
+            }
+            return result;
         }
 
         @Override
diff --git a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
index 028b63ab8..f703ac1ad 100644
--- a/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
+++ b/src/main/java/com/puppycrawl/tools/checkstyle/filters/SuppressionCommentFilter.java
@@ -390,11 +390,14 @@ public class SuppressionCommentFilter
          */
         @Override
         public int compareTo(Tag object) {
+            final int result;
             if (line == object.line) {
-                return Integer.compare(column, object.column);
+                result = Integer.compare(column, object.column);
             }
-
-            return Integer.compare(line, object.line);
+            else {
+                result = Integer.compare(line, object.line);
+            }
+            return result;
         }
 
         @Override
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java
index 8a091ae9b..fab9e0c52 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionFilterTest.java
@@ -303,15 +303,16 @@ public class SuppressionFilterTest extends BaseCheckTestSupport {
     }
 
     private static boolean isUrlReachable(String url) {
+        boolean result = true;
         try {
             final URL verifiableUrl = new URL(url);
             final HttpURLConnection urlConnect = (HttpURLConnection) verifiableUrl.openConnection();
             urlConnect.getContent();
         }
         catch (IOException ex) {
-            return false;
+            result = false;
         }
-        return true;
+        return result;
     }
 
     private static SuppressionFilter createSuppressionFilter(String fileName, boolean optional)
diff --git a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
index 52a724db2..a880c016b 100644
--- a/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
+++ b/src/test/java/com/puppycrawl/tools/checkstyle/filters/SuppressionsLoaderTest.java
@@ -204,15 +204,16 @@ public class SuppressionsLoaderTest extends BaseCheckTestSupport {
     }
 
     private static boolean isUrlReachable(String url) {
+        boolean result = true;
         try {
             final URL verifiableUrl = new URL(url);
             final HttpURLConnection urlConnect = (HttpURLConnection) verifiableUrl.openConnection();
             urlConnect.getContent();
         }
         catch (IOException ex) {
-            return false;
+            result = false;
         }
-        return true;
+        return result;
     }
 
     @Test