From 0a45048535ef9dbb3b935bd0911607db48bd5f85 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Wed, 5 Nov 2014 21:24:34 -0500 Subject: [PATCH] checkstyle corrections Former-commit-id: 8807237a0a38f390298a19507ed55d9df156663f --- .../org/owasp/dependencycheck/Engine.java | 35 ++++++++++--------- .../analyzer/DependencyBundlingAnalyzer.java | 4 +-- .../suppression/SuppressionRule.java | 4 +++ 3 files changed, 24 insertions(+), 19 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java index 160779838..e2a73d8e9 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/Engine.java @@ -62,11 +62,11 @@ public class Engine implements Serializable { /** * A Map of analyzers grouped by Analysis phase. */ - private transient final EnumMap> analyzers; + private final transient EnumMap> analyzers; /** * A Map of analyzers grouped by Analysis phase. */ - private transient final Set fileTypeAnalyzers; + private final transient Set fileTypeAnalyzers; /** * The ClassLoader to use when dynamically loading Analyzer and Update services. */ @@ -74,7 +74,7 @@ public class Engine implements Serializable { /** * The Logger for use throughout the class. */ - private transient static final Logger LOGGER = Logger.getLogger(Engine.class.getName()); + private static final transient Logger LOGGER = Logger.getLogger(Engine.class.getName()); /** * Creates a new Engine. @@ -174,10 +174,10 @@ public class Engine implements Serializable { * @since v0.3.2.5 */ public List scan(String[] paths) { - List deps = new ArrayList(); + final List deps = new ArrayList(); for (String path : paths) { final File file = new File(path); - List d = scan(file); + final List d = scan(file); if (d != null) { deps.addAll(d); } @@ -207,9 +207,9 @@ public class Engine implements Serializable { * @since v0.3.2.5 */ public List scan(File[] files) { - List deps = new ArrayList(); + final List deps = new ArrayList(); for (File file : files) { - List d = scan(file); + final List d = scan(file); if (d != null) { deps.addAll(d); } @@ -227,9 +227,9 @@ public class Engine implements Serializable { * @since v0.3.2.5 */ public List scan(Set files) { - List deps = new ArrayList(); + final List deps = new ArrayList(); for (File file : files) { - List d = scan(file); + final List d = scan(file); if (d != null) { deps.addAll(d); } @@ -247,9 +247,9 @@ public class Engine implements Serializable { * @since v0.3.2.5 */ public List scan(List files) { - List deps = new ArrayList(); + final List deps = new ArrayList(); for (File file : files) { - List d = scan(file); + final List d = scan(file); if (d != null) { deps.addAll(d); } @@ -272,9 +272,9 @@ public class Engine implements Serializable { if (file.isDirectory()) { return scanDirectory(file); } else { - Dependency d = scanFile(file); + final Dependency d = scanFile(file); if (d != null) { - List deps = new ArrayList(); + final List deps = new ArrayList(); deps.add(d); return deps; } @@ -286,20 +286,21 @@ public class Engine implements Serializable { /** * Recursively scans files and directories. Any dependencies identified are added to the dependency collection. * - * @param dir the directory to scan. + * @param dir the directory to scan + * @return the list of Dependency objects scanned */ protected List scanDirectory(File dir) { final File[] files = dir.listFiles(); - List deps = new ArrayList(); + final List deps = new ArrayList(); if (files != null) { for (File f : files) { if (f.isDirectory()) { - List d = scanDirectory(f); + final List d = scanDirectory(f); if (d != null) { deps.addAll(d); } } else { - Dependency d = scanFile(f); + final Dependency d = scanFile(f); deps.add(d); } } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java index d51c9588c..a95ac390f 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java @@ -403,8 +403,8 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Anal final String leftPath = right.replace('\\', '/'); final String rightPath = right.replace('\\', '/'); - int leftCount = countChar(leftPath, '/'); - int rightCount = countChar(rightPath, '/'); + final int leftCount = countChar(leftPath, '/'); + final int rightCount = countChar(rightPath, '/'); if (leftCount == rightCount) { return leftPath.compareTo(rightPath) <= 0; } else { diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java index 16c998a9e..90abfdec0 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java @@ -266,6 +266,10 @@ public class SuppressionRule { return gav != null; } + /** + * A flag indicating whether or not the suppression rule is a core/base rule that should not be included in the + * resulting report in the "suppressed" section. + */ private boolean base; /**