Skip to content

Check for duplicate document URI in compare #127

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
goneall merged 1 commit into from
May 11, 2023
Merged

Check for duplicate document URI in compare #127

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions src/main/java/org/spdx/tools/CompareSpdxDocs.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,18 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
import java.util.UUID;

import org.joda.time.DateTime;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.spdx.library.InvalidSPDXAnalysisException;
import org.spdx.library.ModelCopyManager;
import org.spdx.library.model.SpdxDocument;
import org.spdx.library.model.SpdxModelFactory;
import org.spdx.spreadsheetstore.SpreadsheetException;
import org.spdx.storage.IModelStore;
import org.spdx.storage.simple.InMemSpdxStore;
import org.spdx.tools.compare.MultiDocumentSpreadsheet;
import org.spdx.utility.compare.SpdxCompareException;
import org.spdx.utility.compare.SpdxComparer;
Expand Down Expand Up @@ -137,14 +143,25 @@ private static void addDocToComparer(List<SpdxDocument> compareDocs,
}
if (spdxDocOrDir.isFile()) {
SpdxDocument doc = SpdxToolsHelper.deserializeDocument(spdxDocOrDir);
List<String> warnings = doc.verify();
boolean dupDocUri = false;
for (SpdxDocument otherDocs:compareDocs) {
if (otherDocs.getDocumentUri().equals(doc.getDocumentUri())) {
// Duplicate document URI
throw new InvalidSPDXAnalysisException("Duplicate document namespace "+doc.getDocumentUri()+". Document namespaces must be unique per specification and for a valid comparison.");
dupDocUri = true;
break;
}
}
if (dupDocUri) {
// Make a unique URI by appending a UUID
String newUri = doc.getDocumentUri() + UUID.randomUUID();
warnings.add("Duplicate Document URI: " + doc.getDocumentUri() + " changed to " + newUri);
IModelStore newStore = new InMemSpdxStore();
ModelCopyManager copyManager = new ModelCopyManager();
SpdxDocument newDoc = SpdxModelFactory.createSpdxDocument(newStore, newUri, copyManager);
newDoc.copyFrom(doc);
doc = newDoc;
}
compareDocs.add(doc);
List<String> warnings = doc.verify();
if (!warnings.isEmpty()) {
System.out.println("Verification errors were found in "+filePath.trim()+". See verification errors sheet for details.");
}
Expand Down