From 8e8b462bc86dadfc016b9a4d81965e9b98b87040 Mon Sep 17 00:00:00 2001 From: Anthony Whitford Date: Sun, 1 Nov 2015 22:39:30 -0800 Subject: [PATCH] Replaced one character String constants with char constants, when applicable. --- .../agent/DependencyCheckScanAgent.java | 3 +-- .../dependencycheck/analyzer/CPEAnalyzer.java | 6 ++--- .../analyzer/FalsePositiveAnalyzer.java | 6 ++--- .../dependencycheck/data/cpe/IndexEntry.java | 2 +- .../data/nexus/MavenArtifact.java | 8 +++---- .../dependencycheck/data/nvdcve/CveDB.java | 2 +- .../data/update/nvd/DownloadTask.java | 4 ++-- .../data/update/nvd/NvdCve12Handler.java | 4 ++-- .../suppression/SuppressionRule.java | 24 +++++++++---------- .../utils/DependencyVersion.java | 2 +- .../maven/BaseDependencyCheckMojoTest.java | 2 +- 11 files changed, 31 insertions(+), 32 deletions(-) diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java index 4f2b702ce..ef3b1506d 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/agent/DependencyCheckScanAgent.java @@ -840,8 +840,7 @@ public class DependencyCheckScanAgent { */ private Engine executeDependencyCheck() throws DatabaseException { populateSettings(); - Engine engine = null; - engine = new Engine(); + final Engine engine = new Engine(); engine.setDependencies(this.dependencies); engine.analyzeDependencies(); return engine; diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java index e58adbca9..32272f342 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/CPEAnalyzer.java @@ -335,7 +335,7 @@ public class CPEAnalyzer implements Analyzer { * @return if the append was successful. */ private boolean appendWeightedSearch(StringBuilder sb, String field, String searchText, Set weightedText) { - sb.append(" ").append(field).append(":( "); + sb.append(' ').append(field).append(":( "); final String cleanText = cleanseText(searchText); @@ -364,7 +364,7 @@ public class CPEAnalyzer implements Analyzer { break; } } - sb.append(" "); + sb.append(' '); if (temp == null) { LuceneUtils.appendEscapedLuceneQuery(sb, word); } else { @@ -522,7 +522,7 @@ public class CPEAnalyzer implements Analyzer { for (VulnerableSoftware vs : cpes) { DependencyVersion dbVer; if (vs.getUpdate() != null && !vs.getUpdate().isEmpty()) { - dbVer = DependencyVersionUtil.parseVersion(vs.getVersion() + "." + vs.getUpdate()); + dbVer = DependencyVersionUtil.parseVersion(vs.getVersion() + '.' + vs.getUpdate()); } else { dbVer = DependencyVersionUtil.parseVersion(vs.getVersion()); } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java index 2ad6d895f..ce326cf57 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/analyzer/FalsePositiveAnalyzer.java @@ -113,7 +113,7 @@ public class FalsePositiveAnalyzer extends AbstractAnalyzer { for (Identifier i : dependency.getIdentifiers()) { if ("maven".contains(i.getType())) { if (i.getValue() != null && i.getValue().startsWith("org.springframework.")) { - final int endPoint = i.getValue().indexOf(":", 19); + final int endPoint = i.getValue().indexOf(':', 19); if (endPoint >= 0) { mustContain = i.getValue().substring(19, endPoint).toLowerCase(); break; @@ -472,8 +472,8 @@ public class FalsePositiveAnalyzer extends AbstractAnalyzer { */ private String trimCpeToVendor(String value) { //cpe:/a:jruby:jruby:1.0.8 - final int pos1 = value.indexOf(":", 7); //right of vendor - final int pos2 = value.indexOf(":", pos1 + 1); //right of product + final int pos1 = value.indexOf(':', 7); //right of vendor + final int pos2 = value.indexOf(':', pos1 + 1); //right of product if (pos2 < 0) { return value; } else { diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexEntry.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexEntry.java index 7fdd34d06..39c7fc8f0 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexEntry.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/cpe/IndexEntry.java @@ -48,7 +48,7 @@ public class IndexEntry implements Serializable { */ public String getDocumentId() { if (documentId == null && vendor != null && product != null) { - documentId = vendor + ":" + product; + documentId = vendor + ':' + product; } return documentId; } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/MavenArtifact.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/MavenArtifact.java index 7ad47b928..e69ee8d76 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/MavenArtifact.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/nexus/MavenArtifact.java @@ -94,13 +94,13 @@ public class MavenArtifact { } if (jarAvailable) { //org/springframework/spring-core/3.2.0.RELEASE/spring-core-3.2.0.RELEASE.pom - this.artifactUrl = base + groupId.replace('.', '/') + "/" + artifactId + "/" - + version + "/" + artifactId + "-" + version + ".jar"; + this.artifactUrl = base + groupId.replace('.', '/') + '/' + artifactId + '/' + + version + '/' + artifactId + '-' + version + ".jar"; } if (pomAvailable) { //org/springframework/spring-core/3.2.0.RELEASE/spring-core-3.2.0.RELEASE.pom - this.pomUrl = base + groupId.replace('.', '/') + "/" + artifactId + "/" - + version + "/" + artifactId + "-" + version + ".pom"; + this.pomUrl = base + groupId.replace('.', '/') + '/' + artifactId + '/' + + version + '/' + artifactId + '-' + version + ".pom"; } } diff --git 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 index 28e835072..42bceef0d 100644 --- 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 @@ -392,7 +392,7 @@ public class CveDB { if (cwe != null) { final String name = CweDB.getCweName(cwe); if (name != null) { - cwe += " " + name; + cwe += ' ' + name; } } final int cveId = rsV.getInt(1); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/DownloadTask.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/DownloadTask.java index 4b4d04201..333f9aa4c 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/DownloadTask.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/DownloadTask.java @@ -68,8 +68,8 @@ public class DownloadTask implements Callable> { final File file2; try { - file1 = File.createTempFile("cve" + nvdCveInfo.getId() + "_", ".xml", Settings.getTempDirectory()); - file2 = File.createTempFile("cve_1_2_" + nvdCveInfo.getId() + "_", ".xml", Settings.getTempDirectory()); + file1 = File.createTempFile("cve" + nvdCveInfo.getId() + '_', ".xml", Settings.getTempDirectory()); + file2 = File.createTempFile("cve_1_2_" + nvdCveInfo.getId() + '_', ".xml", Settings.getTempDirectory()); } catch (IOException ex) { throw new UpdateException("Unable to create temporary files", ex); } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve12Handler.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve12Handler.java index 26811ae7b..ef4f83d0e 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve12Handler.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/data/update/nvd/NvdCve12Handler.java @@ -114,10 +114,10 @@ public class NvdCve12Handler extends DefaultHandler { in the nvd cve 2.0. */ String cpe = "cpe:/a:" + vendor + ":" + product; if (num != null) { - cpe += ":" + num; + cpe += ':' + num; } if (edition != null) { - cpe += ":" + edition; + cpe += ':' + edition; } final VulnerableSoftware vs = new VulnerableSoftware(); vs.setCpe(cpe); diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java index 6d91b02a1..92c779848 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/suppression/SuppressionRule.java @@ -442,43 +442,43 @@ public class SuppressionRule { final StringBuilder sb = new StringBuilder(); sb.append("SuppressionRule{"); if (filePath != null) { - sb.append("filePath=").append(filePath).append(","); + sb.append("filePath=").append(filePath).append(','); } if (sha1 != null) { - sb.append("sha1=").append(sha1).append(","); + sb.append("sha1=").append(sha1).append(','); } if (gav != null) { - sb.append("gav=").append(gav).append(","); + sb.append("gav=").append(gav).append(','); } if (cpe != null && !cpe.isEmpty()) { sb.append("cpe={"); for (PropertyType pt : cpe) { - sb.append(pt).append(","); + sb.append(pt).append(','); } - sb.append("}"); + sb.append('}'); } if (cwe != null && !cwe.isEmpty()) { sb.append("cwe={"); for (String s : cwe) { - sb.append(s).append(","); + sb.append(s).append(','); } - sb.append("}"); + sb.append('}'); } if (cve != null && !cve.isEmpty()) { sb.append("cve={"); for (String s : cve) { - sb.append(s).append(","); + sb.append(s).append(','); } - sb.append("}"); + sb.append('}'); } if (cvssBelow != null && !cvssBelow.isEmpty()) { sb.append("cvssBelow={"); for (Float s : cvssBelow) { - sb.append(s).append(","); + sb.append(s).append(','); } - sb.append("}"); + sb.append('}'); } - sb.append("}"); + sb.append('}'); return sb.toString(); } } diff --git a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java index 83df787f5..df2d9afe8 100644 --- a/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java +++ b/dependency-check-core/src/main/java/org/owasp/dependencycheck/utils/DependencyVersion.java @@ -115,7 +115,7 @@ public class DependencyVersion implements Iterable, Comparable