checkstyle corrections

Former-commit-id: 2f6fb660cd0152de284b55de3aab9cbb1b22b0b0

dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java

@@ -40,12 +40,12 @@ import org.owasp.dependencycheck.utils.Settings;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public abstract class AbstractSuppressionAnalyzer extends AbstractAnalyzer {
-    
+
     /**
      * The Logger for use throughout the class
      */
     private static final Logger LOGGER = Logger.getLogger(AbstractSuppressionAnalyzer.class.getName());
-    
+
     //<editor-fold defaultstate="collapsed" desc="All standard implementation details of Analyzer">
     /**
      * Returns a list of file EXTENSIONS supported by this analyzer.

dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/DependencyBundlingAnalyzer.java

@@ -45,11 +45,12 @@ import org.owasp.dependencycheck.utils.LogUtils;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Analyzer {
+
     /**
      * The Logger.
      */
     private static final Logger LOGGER = Logger.getLogger(DependencyBundlingAnalyzer.class.getName());
-    
+
     //<editor-fold defaultstate="collapsed" desc="Constants and Member Variables">
     /**
      * A pattern for obtaining the first part of a filename.

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java

@@ -26,7 +26,6 @@ import java.util.Properties;
 import java.util.TreeMap;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-
 import org.owasp.dependencycheck.data.update.NvdCveInfo;
 import org.owasp.dependencycheck.data.update.exception.UpdateException;
 
@@ -36,7 +35,7 @@ import org.owasp.dependencycheck.data.update.exception.UpdateException;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class DatabaseProperties {
-    
+
     /**
      * The Logger.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverLoader.java

@@ -36,11 +36,12 @@ import java.util.logging.Logger;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public final class DriverLoader {
-    
+
     /**
      * The logger.
      */
     private static final Logger LOGGER = Logger.getLogger(DriverLoader.class.getName());
+
     /**
      * Private constructor for a utility class.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java

@@ -38,7 +38,7 @@ import java.util.logging.Logger;
  * @see java.sql.Driver
  */
 class DriverShim implements Driver {
-    
+
     /**
      * The logger.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java

@@ -29,11 +29,12 @@ import org.owasp.dependencycheck.utils.DownloadFailedException;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class NvdCveUpdater implements CachedWebDataSource {
-    
+
     /**
      * The logger
      */
     private static final Logger LOGGER = Logger.getLogger(NvdCveUpdater.class.getName());
+
     /**
      * <p>
      * Downloads the latest NVD CVE XML file from the web and imports it into the current CVE Database.</p>

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java

@@ -46,6 +46,10 @@ import org.owasp.dependencycheck.utils.Settings;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class StandardUpdate {
+
+    /**
+     * Static logger.
+     */
     private static final Logger LOGGER = Logger.getLogger(StandardUpdate.class.getName());
     /**
      * The max thread pool size to use when downloading files.

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/CallableDownloadTask.java

@@ -38,11 +38,12 @@ import org.owasp.dependencycheck.utils.Settings;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class CallableDownloadTask implements Callable<Future<ProcessTask>> {
-    
+
     /**
      * The Logger.
      */
     private static final Logger LOGGER = Logger.getLogger(CallableDownloadTask.class.getName());
+
     /**
      * Simple constructor for the callable download task.
      *

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/ProcessTask.java

@@ -32,7 +32,6 @@ import javax.xml.parsers.SAXParserFactory;
 import org.owasp.dependencycheck.data.nvdcve.CveDB;
 import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
 import org.owasp.dependencycheck.data.nvdcve.DatabaseProperties;
-import org.owasp.dependencycheck.data.update.StandardUpdate;
 import org.owasp.dependencycheck.data.update.exception.UpdateException;
 import org.owasp.dependencycheck.data.update.xml.NvdCve12Handler;
 import org.owasp.dependencycheck.data.update.xml.NvdCve20Handler;
@@ -46,7 +45,7 @@ import org.xml.sax.SAXException;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class ProcessTask implements Callable<ProcessTask> {
-    
+
     /**
      * The logger.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.java

@@ -39,7 +39,7 @@ import org.xml.sax.helpers.DefaultHandler;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class NvdCve20Handler extends DefaultHandler {
-    
+
     /**
      * The logger.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java

@@ -36,7 +36,7 @@ import org.owasp.dependencycheck.utils.FileUtils;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class Dependency implements Comparable<Dependency> {
-    
+
     /**
      * The logger.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/EvidenceCollection.java

@@ -37,7 +37,7 @@ import org.owasp.dependencycheck.utils.UrlStringUtils;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class EvidenceCollection implements Iterable<Evidence> {
-    
+
     /**
      * The logger.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java

@@ -30,7 +30,7 @@ import org.owasp.dependencycheck.data.cpe.IndexEntry;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class VulnerableSoftware extends IndexEntry implements Serializable, Comparable<VulnerableSoftware> {
-    
+
     /**
      * The logger.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/EscapeTool.java

@@ -30,11 +30,12 @@ import org.apache.commons.lang.StringEscapeUtils;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class EscapeTool {
-    
+
     /**
      * The logger.
      */
     private static final Logger LOGGER = Logger.getLogger(EscapeTool.class.getName());
+
     /**
      * URL Encodes the provided text.
      *

dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java

@@ -49,11 +49,12 @@ import org.owasp.dependencycheck.utils.Settings;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class ReportGenerator {
-    
+
     /**
      * The logger.
      */
     private static final Logger LOGGER = Logger.getLogger(ReportGenerator.class.getName());
+
     /**
      * An enumeration of the report formats.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java

@@ -19,7 +19,6 @@ package org.owasp.dependencycheck.reporting;
 
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.apache.velocity.app.Velocity;
 import org.apache.velocity.runtime.RuntimeServices;
 import org.apache.velocity.runtime.log.LogChute;
 
@@ -36,11 +35,12 @@ import org.apache.velocity.runtime.log.LogChute;
  * @author Steve Springett <steve.springett@owasp.org>
  */
 public class VelocityLoggerRedirect implements LogChute {
-    
+
     /**
      * The Logger.
      */
     private static final Logger LOGGER = Logger.getLogger(VelocityLoggerRedirect.class.getName());
+
     /**
      * This will be invoked once by the LogManager.
      *

dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionErrorHandler.java

@@ -29,11 +29,12 @@ import org.xml.sax.SAXParseException;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class SuppressionErrorHandler implements ErrorHandler {
-    
+
     /**
      * The logger.
      */
     private static final Logger LOGGER = Logger.getLogger(SuppressionErrorHandler.class.getName());
+
     /**
      * Builds a prettier exception message.
      *

dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java

@@ -40,7 +40,7 @@ import org.xml.sax.XMLReader;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public class SuppressionParser {
-    
+
     /**
      * The logger.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java

@@ -23,7 +23,6 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import org.owasp.dependencycheck.data.nvdcve.CveDB;
 import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
 
 /**
@@ -31,11 +30,12 @@ import org.owasp.dependencycheck.data.nvdcve.DatabaseException;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public final class DBUtils {
-    
+
     /**
      * The logger.
      */
     private static final Logger LOGGER = Logger.getLogger(DBUtils.class.getName());
+
     /**
      * Private constructor for a utility class.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Downloader.java

@@ -36,11 +36,12 @@ import java.util.zip.InflaterInputStream;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public final class Downloader {
-    
+
     /**
      * The logger.
      */
     private static final Logger LOGGER = Logger.getLogger(Downloader.class.getName());
+
     /**
      * Private constructor for utility class.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java

@@ -39,7 +39,7 @@ import org.owasp.dependencycheck.Engine;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public final class FileUtils {
-    
+
     /**
      * The logger.
      */

dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java

@@ -31,11 +31,12 @@ import java.util.logging.SimpleFormatter;
  * @author Jeremy Long <jeremy.long@owasp.org>
  */
 public final class LogUtils {
-    
+
     /**
      * The logger.
      */
     private static final Logger LOGGER = Logger.getLogger(LogUtils.class.getName());
+
     /**
      * Private constructor for a utility class.
      */