Change treatment of external licenses in license expression parser

Required an update of the SPDX model 3 which renamed a few
fields.

There are 2 to the treatment of the external licenses:
- Uses a ID map rather than the SPDX document as a parameter
- Passes in the appropriate types

Signed-off-by: Gary O'Neall <gary@sourceauditor.com>

Author: goneall

src/main/java/org/spdx/library/LicenseInfoFactory.java

@@ -32,10 +32,10 @@
 import org.spdx.library.model.v2.license.InvalidLicenseStringException;
 import org.spdx.library.model.v2.license.LicenseParserException;
 import org.spdx.library.model.v2.license.SpdxListedLicense;
-import org.spdx.library.model.v3.core.SpdxDocument;
-import org.spdx.library.model.v3.expandedlicensing.ListedLicense;
-import org.spdx.library.model.v3.expandedlicensing.ListedLicenseException;
-import org.spdx.library.model.v3.simplelicensing.AnyLicenseInfo;
+import org.spdx.library.model.v3_0_0.core.DictionaryEntry;
+import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicense;
+import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicenseException;
+import org.spdx.library.model.v3_0_0.simplelicensing.AnyLicenseInfo;
 import org.spdx.storage.IModelStore;
 import org.spdx.utility.license.LicenseExpressionParser;
 
@@ -129,14 +129,14 @@ public static org.spdx.library.model.v2.license.AnyLicenseInfo parseSPDXLicenseS
 	 * @param customLicensePrefix Prefix to use for any custom licenses or addition IDs found in the string.  If the resultant object URI does not exist
 	 * for an ID, they will be added.  If null, the default model document URI + "#" will be used.
 	 * @param copyManager if non-null, allows for copying of any properties set which use other model stores or document URI's
-	 * @param spdxDocument Document containing the namespace map for any prefixes used in external addition or licenses
+	 * @param customIdToUri Mapping of the id prefixes used in the license expression to the namespace preceding the external ID
 	 * @return an SPDXLicenseInfo created from the string
 	 * @throws InvalidLicenseStringException 
 	 * @throws DefaultStoreNotInitialized 
 	 */
 	public static AnyLicenseInfo parseSPDXLicenseString(String licenseString, @Nullable IModelStore store, 
 			@Nullable String customLicensePrefix, @Nullable IModelCopyManager copyManager, 
-			@Nullable SpdxDocument spdxDocument) throws InvalidLicenseStringException, DefaultStoreNotInitialized {
+			@Nullable List<DictionaryEntry> customIdToUri) throws InvalidLicenseStringException, DefaultStoreNotInitialized {
 		if (Objects.isNull(store)) {
 			store = DefaultModelStore.getDefaultModelStore();
 		}
@@ -148,7 +148,7 @@ public static AnyLicenseInfo parseSPDXLicenseString(String licenseString, @Nulla
 		}
 		try {
 			return LicenseExpressionParser.parseLicenseExpression(licenseString, store, customLicensePrefix, 
-					copyManager, spdxDocument);
+					copyManager, customIdToUri);
 		} catch (LicenseParserException e) {
 			throw new InvalidLicenseStringException(e.getMessage(),e);
 		} catch (InvalidSPDXAnalysisException e) {

src/main/java/org/spdx/library/ListedLicenses.java

@@ -33,8 +33,8 @@
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
 import org.spdx.library.model.v2.SpdxModelFactoryCompatV2;
 import org.spdx.library.model.v2.license.SpdxListedLicense;
-import org.spdx.library.model.v3.expandedlicensing.ListedLicense;
-import org.spdx.library.model.v3.expandedlicensing.ListedLicenseException;
+import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicense;
+import org.spdx.library.model.v3_0_0.expandedlicensing.ListedLicenseException;
 import org.spdx.storage.IModelStore;
 import org.spdx.storage.listedlicense.IListedLicenseStore;
 import org.spdx.storage.listedlicense.SpdxListedLicenseLocalStore;

src/main/java/org/spdx/library/ModelCopyManager.java

@@ -35,7 +35,7 @@
 import org.spdx.library.conversion.ISpdxConverter;
 import org.spdx.library.conversion.Spdx2to3Converter;
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
-import org.spdx.library.model.v3.SpdxConstantsV3;
+import org.spdx.library.model.v3_0_0.SpdxConstantsV3;
 import org.spdx.storage.IModelStore;
 import org.spdx.storage.IModelStore.IModelStoreLock;
 import org.spdx.storage.IModelStore.IdType;

src/main/java/org/spdx/library/SpdxModelFactory.java

@@ -31,7 +31,7 @@
 import org.spdx.core.ModelRegistry;
 import org.spdx.core.ModelRegistryException;
 import org.spdx.library.model.v2.SpdxModelInfoV2_X;
-import org.spdx.library.model.v3.SpdxModelInfoV3_0;
+import org.spdx.library.model.v3_0_0.SpdxModelInfoV3_0;
 import org.spdx.storage.IModelStore;
 
 /**

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

@@ -25,10 +25,10 @@
 import java.util.Optional;
 
 import org.spdx.core.InvalidSPDXAnalysisException;
-import org.spdx.library.model.v3.SpdxConstantsV3;
-import org.spdx.library.model.v3.SpdxModelClassFactory;
-import org.spdx.library.model.v3.core.ExternalMap;
-import org.spdx.library.model.v3.core.Hash;
+import org.spdx.library.model.v3_0_0.SpdxConstantsV3;
+import org.spdx.library.model.v3_0_0.SpdxModelClassFactoryV3;
+import org.spdx.library.model.v3_0_0.core.ExternalMap;
+import org.spdx.library.model.v3_0_0.core.Hash;
 import org.spdx.storage.IModelStore;
 import org.spdx.storage.IModelStore.IdType;
 
@@ -72,7 +72,7 @@ public ExternalMap addExternalMap(String externalUri, IModelStore modelStore) th
 		synchronized(existingExternalMap) {
 			ExternalMap retval = existingExternalMap.get(externalUri);
 			if (Objects.isNull(retval)) {
-				retval = (ExternalMap)SpdxModelClassFactory.getModelObject(modelStore, 
+				retval = (ExternalMap)SpdxModelClassFactoryV3.getModelObject(modelStore, 
 						modelStore.getNextId(IdType.Anonymous), SpdxConstantsV3.CORE_EXTERNAL_MAP, null, true, null);
 				retval.setExternalSpdxId(externalUri);
 				retval.setLocationHint(this.externalDocumentUri);