From 40f329512be8e744da8f2908278ec0a0098fa351 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sun, 23 Feb 2014 07:42:56 -0500 Subject: [PATCH] checkstyle corrections Former-commit-id: 8c116dc61d7bd5e5f18ee106fe82c663570eecf9 --- .../dependencycheck/analyzer/ArchiveAnalyzer.java | 4 ++-- .../owasp/dependencycheck/analyzer/JarAnalyzer.java | 2 +- .../analyzer/exception/package-info.java | 12 ++++++++++++ .../data/nvdcve/ConnectionFactory.java | 3 ++- 4 files changed, 17 insertions(+), 4 deletions(-) create mode 100644 dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/exception/package-info.java 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 6b9d7659e..c9e906f23 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 @@ -95,9 +95,9 @@ public class ArchiveAnalyzer extends AbstractAnalyzer implements Analyzer { private static final Set EXTENSIONS = newHashSet("tar", "gz", "tgz"); static { - String additionalZipExt = Settings.getString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS); + final String additionalZipExt = Settings.getString(Settings.KEYS.ADDITIONAL_ZIP_EXTENSIONS); if (additionalZipExt != null) { - HashSet ext = new HashSet(Arrays.asList(additionalZipExt)); + final HashSet ext = new HashSet(Arrays.asList(additionalZipExt)); ZIPPABLES.addAll(ext); } EXTENSIONS.addAll(ZIPPABLES); diff --git 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 index b2ce8affe..31e4c0988 100644 --- 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 @@ -768,7 +768,7 @@ public class JarAnalyzer extends AbstractAnalyzer implements Analyzer { } else { versionEvidence.addEvidence(source, key, value, Confidence.MEDIUM); } - } else if (key.equals("build-id")) { + } else if ("build-id".equals(key)) { int pos = value.indexOf('('); if (pos >= 0) { value = value.substring(0, pos - 1); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/exception/package-info.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/exception/package-info.java new file mode 100644 index 000000000..397aafb53 --- /dev/null +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/exception/package-info.java @@ -0,0 +1,12 @@ +/** + * + * + * org.owasp.dependencycheck.analyzer.exception + * + * + *

+ * A collection of exception classes used within the analyzers.

+ * + * + */ +package org.owasp.dependencycheck.analyzer.exception; 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 c54a2deec..b94d9cb2a 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 @@ -136,7 +136,8 @@ public final class ConnectionFactory { try { conn = DriverManager.getConnection(connectionString, userName, password); Settings.setString(Settings.KEYS.DB_CONNECTION_STRING, connectionString); - Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, "Unable to start the database in server mode; reverting to single user mode"); + Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, + "Unable to start the database in server mode; reverting to single user mode"); } catch (SQLException sqlex) { Logger.getLogger(ConnectionFactory.class.getName()).log(Level.FINE, "Unable to connect to the database", ex); throw new DatabaseException("Unable to connect to the database");