From 9df8bdff5fcbdec649724969b95d7795ade1c082 Mon Sep 17 00:00:00 2001 From: Jeremy Long Date: Sat, 25 Oct 2014 08:06:56 -0400 Subject: [PATCH] cleaned up code to use isEmpty instead of "".equals(string) Former-commit-id: 8469f91a948ab2ab5b0ce61865a0b11cd6d11717 --- .../dependencycheck/dependency/Dependency.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) 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 58566f227..ef1117148 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 @@ -26,7 +26,6 @@ import java.util.SortedSet; import java.util.TreeSet; import java.util.logging.Level; import java.util.logging.Logger; - import org.owasp.dependencycheck.data.nexus.MavenArtifact; import org.owasp.dependencycheck.utils.Checksum; import org.owasp.dependencycheck.utils.FileUtils; @@ -320,21 +319,22 @@ public class Dependency implements Serializable, Comparable { /** * Adds the maven artifact as evidence. - * @param source The source of the evidence. - * @param mavenArtifact The maven artifact. - * @param confidence The confidence level of this evidence. + * + * @param source The source of the evidence + * @param mavenArtifact The maven artifact + * @param confidence The confidence level of this evidence */ public void addAsEvidence(String source, MavenArtifact mavenArtifact, Confidence confidence) { - if (mavenArtifact.getGroupId() != null && !"".equals(mavenArtifact.getGroupId())) { + if (mavenArtifact.getGroupId() != null && !mavenArtifact.getGroupId().isEmpty()) { this.getVendorEvidence().addEvidence(source, "groupid", mavenArtifact.getGroupId(), confidence); } - if (mavenArtifact.getArtifactId() != null && !"".equals(mavenArtifact.getArtifactId())) { + if (mavenArtifact.getArtifactId() != null && !mavenArtifact.getArtifactId().isEmpty()) { this.getProductEvidence().addEvidence(source, "artifactid", mavenArtifact.getArtifactId(), confidence); } - if (mavenArtifact.getVersion() != null && !"".equals(mavenArtifact.getVersion())) { + if (mavenArtifact.getVersion() != null && !mavenArtifact.getVersion().isEmpty()) { this.getVersionEvidence().addEvidence(source, "version", mavenArtifact.getVersion(), confidence); } - if (mavenArtifact.getArtifactUrl() != null && !"".equals(mavenArtifact.getArtifactUrl())) { + if (mavenArtifact.getArtifactUrl() != null && !mavenArtifact.getArtifactUrl().isEmpty()) { boolean found = false; for (Identifier i : this.getIdentifiers()) { if ("maven".equals(i.getType()) && i.getValue().equals(mavenArtifact.toString())) {