Updated issue instance id calculation to handle duplicate files

fortify · Oct 2, 2020 · 17d044c · 17d044c
1 parent 2be900c
commit 17d044c
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/sampleData/.gitignore b/sampleData/.gitignore
@@ -0,0 +1 @@
+*.gitignore.*
diff --git a/src/main/java/com/fortify/ssc/parser/owasp/dependencycheck/domain/Dependency.java b/src/main/java/com/fortify/ssc/parser/owasp/dependencycheck/domain/Dependency.java
@@ -44,8 +44,7 @@ public final String getFilePathOrName() {
 	}
 
 	public final String getDependencyIdentifier() {
-		return StringUtils.defaultIfBlank(sha256, 
-			StringUtils.defaultIfBlank(sha1, 
-				StringUtils.defaultIfBlank(md5, getFilePathOrName())));
+		return getFilePathOrName() + "-" + StringUtils.defaultIfBlank(sha256, 
+			StringUtils.defaultIfBlank(sha1, md5));
 	}
 }
diff --git a/...va/com/fortify/ssc/parser/owasp/dependencycheck/OWASPDependencyCheckParserPluginTest.java b/...va/com/fortify/ssc/parser/owasp/dependencycheck/OWASPDependencyCheckParserPluginTest.java
@@ -44,9 +44,10 @@
 
 class OWASPDependencyCheckParserPluginTest {
 	private static final String[] SAMPLE_FILES = {
-			//"dependency-check-report-java.json", 
-			//"dependency-check-report-php.json",
+			"dependency-check-report-java.json", 
+			"dependency-check-report-php.json",
 			"dependency-check-report-with-npm.json",
+			//"dependency-check-report.gitignore.json"
 	};
 
 	private final ScanData getScanData(final String fileName) {