various IntelliJ analysis recommendations

Former-commit-id: 7b5f0b5c5e0fc37b58e7cecbcf190c0df56ffe0f
2026-01-13 23:33:37 +01:00 · 2014-01-11 16:04:43 -05:00
parent 525933be99
commit fe072cd2e3
19 changed files with 12 additions and 42 deletions
--- 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
@@ -74,7 +74,7 @@ public class ArchiveAnalyzer extends AbstractAnalyzer implements Analyzer {
     * Tracks the current scan/extraction depth for nested archives.
     */
    private int scanDepth = 0;
-    //<editor-fold defaultstate="collapsed" desc="All standard implmentation details of Analyzer">
+    //<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer">
    /**
     * The name of the analyzer.
     */
--- 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
@@ -286,10 +286,7 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Anal
        final File rFile = new File(dependency2.getFilePath());
        String right = rFile.getParent();
        if (left == null) {
-            if (right == null) {
-                return true;
-            }
-            return false;
+            return right == null;
        }
        if (left.equalsIgnoreCase(right)) {
            return true;
@@ -322,17 +319,13 @@ public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Anal
            /*
             * considered splitting the names up and comparing the components,
             * but decided that the file name length should be sufficient as the
-             * "core" component, if this follows a normal namming protocol should
+             * "core" component, if this follows a normal naming protocol should
             * be shorter:
             * axis2-saaj-1.4.1.jar
             * axis2-1.4.1.jar       <-----
             * axis2-kernal-1.4.1.jar
             */
-            if (leftName.length() > rightName.length()) {
-                returnVal = false;
-            } else {
-                returnVal = true;
-            }
+            returnVal = leftName.length() <= rightName.length();
        }
        if (LogUtils.isVerboseLoggingEnabled()) {
            final String msg = String.format("IsCore=%s (%s, %s)", returnVal, left.getFileName(), right.getFileName());
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/JarAnalyzer.java
@@ -342,7 +342,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer {
     * @return returns a
     * @throws AnalysisException is thrown if there is an exception extracting
     * or parsing the POM
-     * {@link org.owasp.dependencycheck.analyzer.pom.generated.Model} object
+     * {@link org.owasp.dependencycheck.jaxb.pom.generated.Model} object
     */
    private Model retrievePom(String path, JarFile jar) throws AnalysisException {
        final ZipEntry entry = jar.getEntry(path);
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/CveDB.java
@@ -726,7 +726,7 @@ public class CveDB {
        boolean affected = false;
        final boolean isStruts = "apache".equals(vendor) && "struts".equals(product);
        final DependencyVersion v = parseDependencyVersion(cpeId);
-        final boolean prevAffected = previous == null ? false : !previous.isEmpty();
+        final boolean prevAffected = previous != null && !previous.isEmpty();
        if (identifiedVersion == null || "-".equals(identifiedVersion.toString())) {
            if (v == null || "-".equals(v.toString())) {
                affected = true;
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java
@@ -103,7 +103,7 @@ public final class DriverLoader {
        final URLClassLoader loader = AccessController.doPrivileged(new PrivilegedAction<URLClassLoader>() {
            @Override
            public URLClassLoader run() {
-                return new URLClassLoader(urls.toArray(new URL[0]), parent);
+                return new URLClassLoader(urls.toArray(new URL[urls.size()]), parent);
            }
        });

--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/CallableDownloadTask.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/CallableDownloadTask.java
@@ -18,7 +18,6 @@
 */
 package org.owasp.dependencycheck.data.update.task;

-import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
 import java.io.File;
 import java.io.IOException;
 import java.net.URL;
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java
@@ -89,7 +89,7 @@ public class EvidenceCollection implements Iterable<Evidence> {
     *
     * @param confidence the confidence level for the evidence to be iterated
     * over.
-     * @return Iterable<Evidence> an iterable collectoin of evidence
+     * @return Iterable<Evidence> an iterable collection of evidence
     */
    public final Iterable<Evidence> iterator(Evidence.Confidence confidence) {
        if (confidence == Evidence.Confidence.HIGHEST) {
--- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionErrorHandler.java
+++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionErrorHandler.java
@@ -39,7 +39,7 @@ public class SuppressionErrorHandler implements ErrorHandler {
     */
    private String getPrettyParseExceptionInfo(SAXParseException ex) {

-        final StringBuffer sb = new StringBuffer();
+        final StringBuilder sb = new StringBuilder();

        if (ex.getSystemId() != null) {
            sb.append("systemId=").append(ex.getSystemId()).append(", ");
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/analyzer/ArchiveAnalyzerTest.java
@@ -26,7 +26,6 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;
 import org.owasp.dependencycheck.Engine;
 import org.owasp.dependencycheck.data.cpe.BaseIndexTestCase;
 import org.owasp.dependencycheck.dependency.Dependency;
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/concurrency/SpinLockTask.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/concurrency/SpinLockTask.java
@@ -20,8 +20,6 @@ package org.owasp.dependencycheck.concurrency;

 import java.io.File;
 import java.io.IOException;
-import java.util.logging.Level;
-import java.util.logging.Logger;

 /**
 * A simple task that obtains a lock on a directory. This is used in testing of
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/FieldAnalyzerTest.java
@@ -39,7 +39,6 @@ import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
 import org.apache.lucene.store.RAMDirectory;
 import org.apache.lucene.store.Directory;
-import org.apache.lucene.util.Version;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/lucene/TokenPairConcatenatingFilterTest.java
@@ -5,24 +5,17 @@
 package org.owasp.dependencycheck.data.lucene;

 import java.io.IOException;
-import java.io.Reader;
 import java.io.StringReader;
-import org.apache.lucene.analysis.Analyzer;
 import org.apache.lucene.analysis.BaseTokenStreamTestCase;
-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
-import static org.apache.lucene.analysis.BaseTokenStreamTestCase.checkOneTerm;
-import org.apache.lucene.analysis.MockTokenizer;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.Tokenizer;
 import org.apache.lucene.analysis.core.WhitespaceTokenizer;
-import org.apache.lucene.analysis.tokenattributes.TypeAttributeImpl;
-import org.apache.lucene.util.Version;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
+import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
 import static org.junit.Assert.*;

 /**
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/BaseDBTestCase.java
@@ -18,13 +18,11 @@
 */
 package org.owasp.dependencycheck.data.nvdcve;

-import org.owasp.dependencycheck.data.cpe.*;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
-import java.io.IOException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import java.util.zip.ZipEntry;
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/CveDBTest.java
@@ -18,19 +18,14 @@
 */
 package org.owasp.dependencycheck.data.nvdcve;

-import java.io.File;
-import java.io.IOException;
-import java.sql.SQLException;
 import java.util.List;
 import java.util.Set;
-import java.util.logging.Level;
-import java.util.logging.Logger;
+
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.owasp.dependencycheck.dependency.Vulnerability;
 import org.owasp.dependencycheck.dependency.VulnerableSoftware;

 /**
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/nvdcve/DatabasePropertiesTest.java
@@ -19,7 +19,6 @@
 package org.owasp.dependencycheck.data.nvdcve;

 import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
-import java.io.File;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/NvdCveUpdaterIntegrationTest.java
@@ -23,7 +23,6 @@ import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
-import static org.junit.Assert.*;

 /**
 *
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateIntegrationTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/data/update/StandardUpdateIntegrationTest.java
@@ -19,7 +19,7 @@
 package org.owasp.dependencycheck.data.update;

 import org.owasp.dependencycheck.data.update.exception.UpdateException;
-import java.io.IOException;
+
 import java.net.MalformedURLException;
 import java.util.Calendar;
 import org.junit.After;
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/reporting/ReportGeneratorTest.java
@@ -19,7 +19,6 @@
 package org.owasp.dependencycheck.reporting;

 import org.owasp.dependencycheck.Engine;
-import org.owasp.dependencycheck.data.cpe.BaseIndexTestCase;
 import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
--- a/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java
+++ b/dependency-check-core/src/test/java/org/owasp/dependencycheck/utils/DependencyVersionTest.java
@@ -4,7 +4,6 @@
 */
 package org.owasp.dependencycheck.utils;

-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import org.junit.After;