Merge pull request #123 from spdx/improveparseerror

goneall · web-flow · commit 122d83a32950 · 2022-09-30T18:21:12.000-07:00
Improve parse exception error handling
diff --git a/src/main/java/org/spdx/library/model/license/LicenseExpressionParser.java b/src/main/java/org/spdx/library/model/license/LicenseExpressionParser.java
@@ -183,6 +183,8 @@ private static AnyLicenseInfo parseLicenseExpression(String[] tokens, IModelStor
 					}
 					if (exceptionId.isPresent()) {
 						licenseException = LicenseInfoFactory.getListedExceptionById(exceptionId.get());
+					} else if (token.startsWith(SpdxConstants.NON_STD_LICENSE_ID_PRENUM)) {
+						throw new LicenseParserException("WITH must be followed by a license exception. "+token+" is a Listed License type.");
 					} else {
 						licenseException = (LicenseException) SpdxModelFactory.createModelObject(store, 
 								documentUri, token, SpdxConstants.CLASS_SPDX_LICENSE_EXCEPTION, copyManager);

Original file line number	Diff line number	Diff line change
`@@ -183,6 +183,8 @@ private static AnyLicenseInfo parseLicenseExpression(String[] tokens, IModelStor`
`183`	`183`	`}`
`184`	`184`	`if (exceptionId.isPresent()) {`
`185`	`185`	`licenseException = LicenseInfoFactory.getListedExceptionById(exceptionId.get());`
	`186`	`+ } else if (token.startsWith(SpdxConstants.NON_STD_LICENSE_ID_PRENUM)) {`
	`187`	`+ throw new LicenseParserException("WITH must be followed by a license exception. "+token+" is a Listed License type.");`
`186`	`188`	`} else {`
`187`	`189`	`licenseException = (LicenseException) SpdxModelFactory.createModelObject(store,`
`188`	`190`	`documentUri, token, SpdxConstants.CLASS_SPDX_LICENSE_EXCEPTION, copyManager);`