diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java index c1e15538c..d6d2e8fb2 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzer.java @@ -471,6 +471,8 @@ public class ArchiveAnalyzer extends AbstractFileTypeAnalyzer { boolean stillLooking = true; int chr; int nxtChr; + //CSOFF: InnerAssignment + //CSOFF: NestedIfDepth while (stillLooking && (chr = in.read()) != -1) { if (chr == '\n' || chr == '\r') { in.mark(4); @@ -488,6 +490,8 @@ public class ArchiveAnalyzer extends AbstractFileTypeAnalyzer { } } } + //CSON: InnerAssignment + //CSON: NestedIfDepth } else { in.reset(); } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyMergingAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyMergingAnalyzer.java index 49db7fd7c..62141b2c3 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyMergingAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyMergingAnalyzer.java @@ -90,6 +90,7 @@ public class DependencyMergingAnalyzer extends AbstractDependencyComparingAnalyz @Override protected boolean evaluateDependencies(final Dependency dependency, final Dependency nextDependency, final Set dependenciesToRemove) { Dependency main; + //CSOFF: InnerAssignment if ((main = getMainGemspecDependency(dependency, nextDependency)) != null) { if (main == dependency) { mergeDependencies(dependency, nextDependency, dependenciesToRemove); @@ -105,6 +106,7 @@ public class DependencyMergingAnalyzer extends AbstractDependencyComparingAnalyz return true; //since we merged into the next dependency - skip forward to the next in mainIterator } } + //CSON: InnerAssignment return false; } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java index edace0347..177b5b9f9 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/ConnectionFactory.java @@ -396,6 +396,7 @@ public final class ConnectionFactory { final int c0 = Integer.parseInt(currentDbVersion.getVersionParts().get(0)); final int e1 = Integer.parseInt(appExpectedVersion.getVersionParts().get(1)); final int c1 = Integer.parseInt(currentDbVersion.getVersionParts().get(1)); + //CSOFF: EmptyBlock if (e0 == c0 && e1 < c1) { LOGGER.warn("A new version of dependency-check is available; consider upgrading"); settings.setBoolean(Settings.KEYS.AUTO_UPDATE, false); @@ -406,6 +407,7 @@ public final class ConnectionFactory { UPGRADE_HELP_URL); throw new DatabaseException("Database schema is out of date"); } + //CSON: EmptyBlock } } diff --git a/src/main/config/checkstyle-checks.xml b/src/main/config/checkstyle-checks.xml index f237c7b39..41244e9b1 100644 --- a/src/main/config/checkstyle-checks.xml +++ b/src/main/config/checkstyle-checks.xml @@ -114,7 +114,7 @@ - +