From fb88aeaeb9693913e4d9b3ffdccb3a9dc8f88804 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Tue, 22 Apr 2014 08:10:54 -0400 Subject: [PATCH] checkstyle corrections Former-commit-id: c64cd0ab69715dce4d0cb4671ff58844367e11a2 --- .../dependencycheck/analyzer/AbstractSuppressionAnalyzer.java | 4 ++-- .../dependencycheck/analyzer/DependencyBundlingAnalyzer.java | 3 ++- .../owasp/dependencycheck/data/nvdcve/DatabaseProperties.java | 3 +-- .../org/owasp/dependencycheck/data/nvdcve/DriverLoader.java | 3 ++- .../org/owasp/dependencycheck/data/nvdcve/DriverShim.java | 2 +- .../org/owasp/dependencycheck/data/update/NvdCveUpdater.java | 3 ++- .../org/owasp/dependencycheck/data/update/StandardUpdate.java | 4 ++++ .../data/update/task/CallableDownloadTask.java | 3 ++- .../owasp/dependencycheck/data/update/task/ProcessTask.java | 3 +-- .../dependencycheck/data/update/xml/NvdCve20Handler.java | 2 +- .../java/org/owasp/dependencycheck/dependency/Dependency.java | 2 +- .../owasp/dependencycheck/dependency/EvidenceCollection.java | 2 +- .../owasp/dependencycheck/dependency/VulnerableSoftware.java | 2 +- .../java/org/owasp/dependencycheck/reporting/EscapeTool.java | 3 ++- .../org/owasp/dependencycheck/reporting/ReportGenerator.java | 3 ++- .../dependencycheck/reporting/VelocityLoggerRedirect.java | 4 ++-- .../dependencycheck/suppression/SuppressionErrorHandler.java | 3 ++- .../owasp/dependencycheck/suppression/SuppressionParser.java | 2 +- .../main/java/org/owasp/dependencycheck/utils/DBUtils.java | 4 ++-- .../main/java/org/owasp/dependencycheck/utils/Downloader.java | 3 ++- .../main/java/org/owasp/dependencycheck/utils/FileUtils.java | 2 +- .../main/java/org/owasp/dependencycheck/utils/LogUtils.java | 3 ++- 22 files changed, 37 insertions(+), 26 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java index d97f5b8bc..78c5e6ab0 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/AbstractSuppressionAnalyzer.java +++ b/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 */ public abstract class AbstractSuppressionAnalyzer extends AbstractAnalyzer { - + /** * The Logger for use throughout the class */ private static final Logger LOGGER = Logger.getLogger(AbstractSuppressionAnalyzer.class.getName()); - + // /** * Returns a list of file EXTENSIONS supported by this analyzer. 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 34ad1884e..3c8a67471 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 @@ -45,11 +45,12 @@ import org.owasp.dependencycheck.utils.LogUtils; * @author Jeremy Long */ public class DependencyBundlingAnalyzer extends AbstractAnalyzer implements Analyzer { + /** * The Logger. */ private static final Logger LOGGER = Logger.getLogger(DependencyBundlingAnalyzer.class.getName()); - + // /** * A pattern for obtaining the first part of a filename. diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java index 33d1ba854..cadcb2ae6 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DatabaseProperties.java +++ b/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 */ public class DatabaseProperties { - + /** * The Logger. */ diff --git 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 index d1c402749..fbce2e8a8 100644 --- 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 @@ -36,11 +36,12 @@ import java.util.logging.Logger; * @author Jeremy Long */ public final class DriverLoader { - + /** * The logger. */ private static final Logger LOGGER = Logger.getLogger(DriverLoader.class.getName()); + /** * Private constructor for a utility class. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java index 8fa3a92af..65ef41d9e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nvdcve/DriverShim.java +++ b/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. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java index d15f71ba5..85914b307 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/NvdCveUpdater.java +++ b/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 */ public class NvdCveUpdater implements CachedWebDataSource { - + /** * The logger */ private static final Logger LOGGER = Logger.getLogger(NvdCveUpdater.class.getName()); + /** *

* Downloads the latest NVD CVE XML file from the web and imports it into the current CVE Database.

diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java index 3fb7aad68..06e4dae57 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/StandardUpdate.java +++ b/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 */ 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. diff --git 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 index 517ffafc2..1435ea734 100644 --- 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 @@ -38,11 +38,12 @@ import org.owasp.dependencycheck.utils.Settings; * @author Jeremy Long */ public class CallableDownloadTask implements Callable> { - + /** * The Logger. */ private static final Logger LOGGER = Logger.getLogger(CallableDownloadTask.class.getName()); + /** * Simple constructor for the callable download task. * diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/ProcessTask.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/ProcessTask.java index 100235035..eefaf2965 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/task/ProcessTask.java +++ b/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 */ public class ProcessTask implements Callable { - + /** * The logger. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.java index 3dcaee74f..8ee523b49 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/xml/NvdCve20Handler.java +++ b/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 */ public class NvdCve20Handler extends DefaultHandler { - + /** * The logger. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java index c0bcbab6b..48ddf25fe 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/Dependency.java +++ b/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 */ public class Dependency implements Comparable { - + /** * The logger. */ diff --git 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 index 4d2d431a4..3908665e5 100644 --- 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 @@ -37,7 +37,7 @@ import org.owasp.dependencycheck.utils.UrlStringUtils; * @author Jeremy Long */ public class EvidenceCollection implements Iterable { - + /** * The logger. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java index f822026a3..05605a6af 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/dependency/VulnerableSoftware.java +++ b/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 */ public class VulnerableSoftware extends IndexEntry implements Serializable, Comparable { - + /** * The logger. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/EscapeTool.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/EscapeTool.java index ed1f9ec1b..2214d0a4f 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/EscapeTool.java +++ b/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 */ public class EscapeTool { - + /** * The logger. */ private static final Logger LOGGER = Logger.getLogger(EscapeTool.class.getName()); + /** * URL Encodes the provided text. * diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java index 147b5be1a..caa89d27d 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/ReportGenerator.java +++ b/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 */ public class ReportGenerator { - + /** * The logger. */ private static final Logger LOGGER = Logger.getLogger(ReportGenerator.class.getName()); + /** * An enumeration of the report formats. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java index 134c22ce2..b9f5cb074 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/reporting/VelocityLoggerRedirect.java +++ b/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 */ 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. * diff --git 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 index c19c6876b..720c837b2 100644 --- 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 @@ -29,11 +29,12 @@ import org.xml.sax.SAXParseException; * @author Jeremy Long */ public class SuppressionErrorHandler implements ErrorHandler { - + /** * The logger. */ private static final Logger LOGGER = Logger.getLogger(SuppressionErrorHandler.class.getName()); + /** * Builds a prettier exception message. * diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java index 5e3ae8873..c47398cde 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionParser.java @@ -40,7 +40,7 @@ import org.xml.sax.XMLReader; * @author Jeremy Long */ public class SuppressionParser { - + /** * The logger. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java index c9187e0c9..819e7a798 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DBUtils.java +++ b/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 */ public final class DBUtils { - + /** * The logger. */ private static final Logger LOGGER = Logger.getLogger(DBUtils.class.getName()); + /** * Private constructor for a utility class. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Downloader.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Downloader.java index 78a1eab78..831530772 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Downloader.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/Downloader.java @@ -36,11 +36,12 @@ import java.util.zip.InflaterInputStream; * @author Jeremy Long */ public final class Downloader { - + /** * The logger. */ private static final Logger LOGGER = Logger.getLogger(Downloader.class.getName()); + /** * Private constructor for utility class. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java index 164a3aef7..45531981d 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/FileUtils.java @@ -39,7 +39,7 @@ import org.owasp.dependencycheck.Engine; * @author Jeremy Long */ public final class FileUtils { - + /** * The logger. */ diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java index e7bfc0968..1841be1d7 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/LogUtils.java @@ -31,11 +31,12 @@ import java.util.logging.SimpleFormatter; * @author Jeremy Long */ public final class LogUtils { - + /** * The logger. */ private static final Logger LOGGER = Logger.getLogger(LogUtils.class.getName()); + /** * Private constructor for a utility class. */