Skip to content

Commit 25dbbdc

Browse files
aniruth37goneall
authored andcommitted
fix: add creator comment field in Spdx2to3converter
1 parent ad0c83f commit 25dbbdc

2 files changed

Lines changed: 4 additions & 0 deletions

File tree

src/main/java/org/spdx/library/conversion/Spdx2to3Converter.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -315,6 +315,7 @@ public static CreationInfo convertCreationInfo(
315315
CreationInfo retval = new CreationInfo.CreationInfoBuilder(modelStore, modelStore.getNextId(IdType.Anonymous), null)
316316
.setCreated(creationInfoV2.getCreated())
317317
.setSpecVersion(SpdxConstantsV3.MODEL_SPEC_VERSION)
318+
.setComment(creationInfoV2.getComment().orElse(null))
318319
.build();
319320
retval.setIdPrefix(uriPrefix);
320321
for (String docCreator:creationInfoV2.getCreators()) {

src/test/java/org/spdx/library/conversion/Spdx2to3ConverterTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,12 +137,14 @@ public void testConvertCreationInfo() throws InvalidSPDXAnalysisException {
137137
String organizationCreatorName = "Source Auditor Inc.";
138138
String organizationCreator = SpdxConstantsCompatV2.CREATOR_PREFIX_ORGANIZATION + organizationCreatorName;
139139
String created = "2010-01-29T18:30:22Z";
140+
String comment = "Test creation info comment";
140141
String licenseListVersion = "3.21";
141142
SpdxCreatorInformation creatorInfo = new SpdxCreatorInformation(fromModelStore, DOCUMENT_URI, creatorId, copyManager, true);
142143
creatorInfo.getCreators().add(personCreator);
143144
creatorInfo.getCreators().add(toolCreator);
144145
creatorInfo.getCreators().add(organizationCreator);
145146
creatorInfo.setCreated(created);
147+
creatorInfo.setComment(comment);
146148
creatorInfo.setLicenseListVersion(licenseListVersion);
147149
List<String> verify = creatorInfo.verify();
148150
assertTrue(verify.isEmpty());
@@ -173,6 +175,7 @@ public void testConvertCreationInfo() throws InvalidSPDXAnalysisException {
173175
assertEquals(1, tools.length);
174176
assertEquals(toolCreatorName, tools[0].getName().get());
175177
assertEquals(created, result.getCreated());
178+
assertEquals(comment, result.getComment().orElse(null));
176179
assertEquals(IdType.Anonymous, toModelStore.getIdType(result.getObjectUri()));
177180
verify = result.verify();
178181
assertTrue(verify.isEmpty());

0 commit comments

Comments
 (0)