Merge pull request #276 from ruromero/ignore-dups

ruromero · web-flow · commit b932a80218b8 · 2024-02-07T16:32:14.000+01:00
feat: ignore duplicated CycloneDX purls
diff --git a/src/main/java/com/redhat/exhort/integration/backend/sbom/cyclonedx/CycloneDxParser.java b/src/main/java/com/redhat/exhort/integration/backend/sbom/cyclonedx/CycloneDxParser.java
@@ -143,7 +143,7 @@ private Map<PackageRef, DirectDependency> buildUnknownDependencies(
         .forEach(
             v -> {
               if (deps.containsKey(v)) {
-                throw new IllegalStateException("Duplicate component: " + v.purl());
+                LOGGER.debug("Ignore duplicate key {}", v);
               }
               deps.put(v, DirectDependency.builder().ref(v).build());
             });

Original file line number	Diff line number	Diff line change
`@@ -143,7 +143,7 @@ private Map<PackageRef, DirectDependency> buildUnknownDependencies(`
`143`	`143`	`.forEach(`
`144`	`144`	`v -> {`
`145`	`145`	`if (deps.containsKey(v)) {`
`146`		`- throw new IllegalStateException("Duplicate component: " + v.purl());`
	`146`	`+ LOGGER.debug("Ignore duplicate key {}", v);`
`147`	`147`	`}`
`148`	`148`	`deps.put(v, DirectDependency.builder().ref(v).build());`
`149`	`149`	`});`