Skip to content

fix: add creator comment field in Spdx2to3converter #388

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

Open
aniruth37 wants to merge 1 commit into
base: master
Choose a base branch
from
+4 −0
Open

fix: add creator comment field in Spdx2to3converter #388

Show file tree
Hide file tree
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
1 change: 1 addition & 0 deletions src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -315,6 +315,7 @@ public static CreationInfo convertCreationInfo(
CreationInfo retval = new CreationInfo.CreationInfoBuilder(modelStore, modelStore.getNextId(IdType.Anonymous), null)
.setCreated(creationInfoV2.getCreated())
.setSpecVersion(SpdxConstantsV3.MODEL_SPEC_VERSION)
.setComment(creationInfoV2.getComment().orElse(null))
.build();
retval.setIdPrefix(uriPrefix);
for (String docCreator:creationInfoV2.getCreators()) {
Expand Down
3 changes: 3 additions & 0 deletions src/test/java/org/spdx/library/conversion/Spdx2to3ConverterTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,14 @@ public void testConvertCreationInfo() throws InvalidSPDXAnalysisException {
String organizationCreatorName = "Source Auditor Inc.";
String organizationCreator = SpdxConstantsCompatV2.CREATOR_PREFIX_ORGANIZATION + organizationCreatorName;
String created = "2010-01-29T18:30:22Z";
String comment = "Test creation info comment";
String licenseListVersion = "3.21";
SpdxCreatorInformation creatorInfo = new SpdxCreatorInformation(fromModelStore, DOCUMENT_URI, creatorId, copyManager, true);
creatorInfo.getCreators().add(personCreator);
creatorInfo.getCreators().add(toolCreator);
creatorInfo.getCreators().add(organizationCreator);
creatorInfo.setCreated(created);
creatorInfo.setComment(comment);
creatorInfo.setLicenseListVersion(licenseListVersion);
List<String> verify = creatorInfo.verify();
assertTrue(verify.isEmpty());
Expand Down Expand Up @@ -173,6 +175,7 @@ public void testConvertCreationInfo() throws InvalidSPDXAnalysisException {
assertEquals(1, tools.length);
assertEquals(toolCreatorName, tools[0].getName().get());
assertEquals(created, result.getCreated());
assertEquals(comment, result.getComment().orElse(null));
assertEquals(IdType.Anonymous, toModelStore.getIdType(result.getObjectUri()));
verify = result.verify();
assertTrue(verify.isEmpty());
Expand Down