Skip to content

Spdx2to3Converter: return null for "NONE" or "NOASSERTION" Agents #380

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
Dec 27, 2025
Merged

Spdx2to3Converter: return null for "NONE" or "NOASSERTION" Agents #380

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
4 changes: 4 additions & 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 @@ -346,6 +346,10 @@ public static Agent stringToAgent(String spdx2personOrgString, CreationInfo crea
Objects.requireNonNull(idPrefix, "Creation info must have an idPrefix to accurately generate SPDX IDs");
Matcher matcher = SPDX_2_CREATOR_PATTERN.matcher(spdx2personOrgString);
if (!matcher.matches()) {
// return null for NOASSERTION and NONE
if ("NOASSERTION".equals(spdx2personOrgString) || "NONE".equals(spdx2personOrgString)) {
return null;
}
// return a generic Agent
Agent agent = (Agent)SpdxModelClassFactoryV3.getModelObject(creationInfo.getModelStore(),
creationInfo.getIdPrefix() + creationInfo.getModelStore().getNextId(IdType.SpdxId),
Expand Down
24 changes: 24 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 @@ -1951,5 +1951,29 @@ public void testConvertToLicenseExpression() throws InvalidSPDXAnalysisException
assertTrue(expected.isEmpty());
assertEquals(ands.toString(), result.getLicenseExpression());
}

@Test
public void testPackageSupplierNoAssertionAndNone() throws InvalidSPDXAnalysisException {
CreationInfo testCreationInfo = Spdx2to3Converter.convertCreationInfo(
new SpdxCreatorInformation(fromModelStore, DOCUMENT_URI,
fromModelStore.getNextId(IdType.Anonymous), copyManager, true)
.setCreated("2010-01-29T18:30:22Z"),
toModelStore, DEFAULT_PREFIX);

// "NOASSERTION" agent string
Agent resultNoAssertion = Spdx2to3Converter.stringToAgent("NOASSERTION", testCreationInfo);
assertNull("stringToAgent should return null for NOASSERTION value", resultNoAssertion);

// "NONE" agent string
Agent resultNone = Spdx2to3Converter.stringToAgent("NONE", testCreationInfo);
assertNull("stringToAgent should return null for NONE value", resultNone);

// Valid Person agent string
String personCreator = SpdxConstantsCompatV2.CREATOR_PREFIX_PERSON + "John Doe ([email protected])";
Agent resultPerson = Spdx2to3Converter.stringToAgent(personCreator, testCreationInfo);
assertNotNull("stringToAgent should return an Agent for valid Person format", resultPerson);
assertTrue("Result should be a Person", resultPerson instanceof Person);
assertEquals("John Doe", resultPerson.getName().get());
}

}