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

Author: tiegz

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

@@ -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 as per Javadoc
+			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),

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

@@ -1951,5 +1951,33 @@ public void testConvertToLicenseExpression() throws InvalidSPDXAnalysisException
 		assertTrue(expected.isEmpty());
 		assertEquals(ands.toString(), result.getLicenseExpression());
 	}
+	
+	@Test
+	public void testPackageSupplierNoAssertionAndNone() throws InvalidSPDXAnalysisException {
+		// Test that when stringToAgent is called with "NOASSERTION" or "NONE", it should return null
+		// rather than creating an Agent with name="NOASSERTION" or "NONE"
+		
+		// Create a CreationInfo with proper idPrefix for testing
+		CreationInfo testCreationInfo = Spdx2to3Converter.convertCreationInfo(
+				new SpdxCreatorInformation(fromModelStore, DOCUMENT_URI, 
+						fromModelStore.getNextId(IdType.Anonymous), copyManager, true)
+					.setCreated("2010-01-29T18:30:22Z"),
+				toModelStore, DEFAULT_PREFIX);
+		
+		// Test with "NOASSERTION"
+		Agent resultNoAssertion = Spdx2to3Converter.stringToAgent("NOASSERTION", testCreationInfo);
+		assertNull("stringToAgent should return null for NOASSERTION value", resultNoAssertion);
+		
+		// Test with "NONE"
+		Agent resultNone = Spdx2to3Converter.stringToAgent("NONE", testCreationInfo);
+		assertNull("stringToAgent should return null for NONE value", resultNone);
+		
+		// Test with a valid Person format - should not return null
+		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());
+	}
 
 }