Update API's to accept type hints for external

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

Author: goneall

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

@@ -120,12 +120,10 @@ public static void init() {
 	 * If the object does not exist AND the create parameter is true, a new object will be created and
 	 * its inflated form will be returned
 	 * @param modelStore store to use for the inflated object
-	 * @param objectUri URI of the external element
-	 * @param documentUri URI for the SPDX document to store the external element reference - used for compatibility with SPDX 2.X model stores
+	 * @param objectUri URI of the element or SPDX object
 	 * @param type Type of the object to create
 	 * @param copyManager if non-null, implicitly copy any referenced properties from other model stores
-	 * @param externalMap map of URI's to ExternalMaps for any external elements
-	 * @param specVersion version of the SPDX spec the object complies with
+	 *@param specVersion version of the SPDX spec the object complies with
 	 * @param create if true, create the model object ONLY if it does not already exist
 	 * @param idPrefix optional prefix used for any new object URI's created in support of this model object
 	 * @return model object of type type
@@ -145,10 +143,8 @@ public static CoreModelObject inflateModelObject(IModelStore modelStore, String
 	 * its inflated form will be returned
 	 * @param modelStore store to use for the inflated object
 	 * @param objectUri URI of the external element
-	 * @param documentUri URI for the SPDX document to store the external element reference - used for compatibility with SPDX 2.X model stores
 	 * @param type Type of the object to create
 	 * @param copyManager if non-null, implicitly copy any referenced properties from other model stores
-	 * @param externalMap map of URI's to ExternalMaps for any external elements
 	 * @param create if true, create the model object ONLY if it does not already exist
 	 * @param idPrefix optional prefix used for any new object URI's created in support of this model object
 	 * @return model object of type type
@@ -163,30 +159,28 @@ public static CoreModelObject inflateModelObject(IModelStore modelStore, String
 	 * @param store store to use for the inflated object
 	 * @param uri URI of the external element
 	 * @param copyManager if non-null, implicitly copy any referenced properties from other model stores
-	 * @param documentUri URI for the SPDX document to store the external element reference - used for compatibility with SPDX 2.X model stores
-	 * @param externalMap Map of URI's of elements referenced but not present in the store
+	 * @param type type hint for creating the correct external element
 	 * @param specVersion version of the SPDX spec the object complies with
 	 * @return a java object representing an SPDX element external to model store, collection or document
 	 * @throws InvalidSPDXAnalysisException 
 	 */
 	public static Object getExternalElement(IModelStore store, String uri,
-			@Nullable IModelCopyManager copyManager,
+			@Nullable IModelCopyManager copyManager, Class<?> type,
 			String specVersion) throws InvalidSPDXAnalysisException {
-		return ModelRegistry.getModelRegistry().getExternalElement(store, uri, copyManager, specVersion);
+		return ModelRegistry.getModelRegistry().getExternalElement(store, uri, copyManager, type, specVersion);
 	}
 
 	/**
 	 * @param store store to use for the inflated object
 	 * @param uri URI of the external element
 	 * @param copyManager if non-null, implicitly copy any referenced properties from other model stores
-	 * @param documentUri URI for the SPDX document to store the external element reference - used for compatibility with SPDX 2.X model stores
-	 * @param externalMap Map of URI's of elements referenced but not present in the store
+	 * @param type type hint for creating the correct external element
 	 * @return a java object representing an SPDX element external to model store, collection or document for the most recent version of the spec supported
 	 * @throws InvalidSPDXAnalysisException 
 	 */
 	public static Object getExternalElement(IModelStore store, String uri,
-			@Nullable IModelCopyManager copyManager) throws InvalidSPDXAnalysisException {
-		return getExternalElement(store, uri, copyManager, getLatestSpecVersion());
+			@Nullable IModelCopyManager copyManager, Class<?> type) throws InvalidSPDXAnalysisException {
+		return getExternalElement(store, uri, copyManager, type, getLatestSpecVersion());
 	}
 
 	/**

src/main/java/org/spdx/storage/simple/StoredTypedItem.java

@@ -412,51 +412,22 @@ public boolean isCollectionMembersAssignableTo(PropertyDescriptor propertyDescri
 		ConcurrentHashMap<String, List<Object>> idValueMap = (ConcurrentHashMap<String, List<Object>>)map;
 		for (List<Object> valueList:idValueMap.values()) {
 			for (Object value:valueList) {
-				if (!clazz.isAssignableFrom(value.getClass())) {
-					if (value instanceof IndividualUriValue) {
-						String uri = ((IndividualUriValue)value).getIndividualURI();
-						Enum<?> spdxEnum = ModelRegistry.getModelRegistry().uriToEnum(uri, getSpecVersion());
-						if (Objects.nonNull(spdxEnum)) {
-							if (!clazz.isAssignableFrom(spdxEnum.getClass())) {
-								return false;
-							}
-						} else if (Objects.isNull(ModelRegistry.getModelRegistry().uriToIndividual(uri, getSpecVersion(), clazz))) {
-							return false;
-							//TODO: Test for type of individual
-						}
-					} else if (value instanceof TypedValue) {
-						TypedValue typedValue = (TypedValue)value;
-						try {
-							if (clazz != TypedValue.class && !clazz.isAssignableFrom(ModelRegistry.getModelRegistry().typeToClass(typedValue.getType(), typedValue.getSpecVersion()))) {
-								return false;
-							}
-						} catch (InvalidSPDXAnalysisException e) {
-							logger.error("Error converting typed value to class",e);
-							return false;
-						}
-					} else {
-						return false;
-					}
+				if (!isAssignableTo(value, clazz, getSpecVersion())) {
+					return false;
 				}
 			}
 		}
 		return true;
 	}
 
 	/**
-	 * @param propertyDescriptor descriptor for the property
-	 * @param clazz class to test against
-	 * @param specVersion Version of the spec to test for
-	 * @return true if the property can be assigned to type clazz for the latest SPDX spec version
-	 * @throws ModelRegistryException 
+	 * @param value value to test
+	 * @param clazz class to see if the value can be assigned to
+	 * @param specVersion version of the spec
+	 * @return true if value can be assigned to clazz
+	 * @throws ModelRegistryException if the model registry is not property initialized
 	 */
-	public boolean isPropertyValueAssignableTo(PropertyDescriptor propertyDescriptor, Class<?> clazz, String specVersion) throws ModelRegistryException {
-		Objects.requireNonNull(propertyDescriptor, "Property descriptor can not be null");
-		Objects.requireNonNull(clazz, "Class can not be null");
-		Object value = properties.get(propertyDescriptor);
-		if (value == null) {
-			return false;
-		}
+	private boolean isAssignableTo(Object value, Class<?> clazz, String specVersion) throws ModelRegistryException {
 		if (clazz.isAssignableFrom(value.getClass())) {
 			return true;
 		}
@@ -471,18 +442,39 @@ public boolean isPropertyValueAssignableTo(PropertyDescriptor propertyDescriptor
 		}
 		if (value instanceof IndividualUriValue) {
 			String uri = ((IndividualUriValue)value).getIndividualURI();
-			if (Objects.nonNull(ModelRegistry.getModelRegistry().uriToEnum(uri, specVersion))) {
-				return true;
-			}
-			//TODO: Check for individual URI types
-			Enum<?> spdxEnum = ModelRegistry.getModelRegistry().uriToEnum(uri, specVersion);
+			
+			Enum<?> spdxEnum = ModelRegistry.getModelRegistry().uriToEnum(uri, getSpecVersion());
 			if (Objects.nonNull(spdxEnum)) {
 				return clazz.isAssignableFrom(spdxEnum.getClass());
 			} else {
-				return false;
+				Object individual = ModelRegistry.getModelRegistry().uriToIndividual(uri, getSpecVersion(), clazz);
+				if (Objects.nonNull(individual)) {
+					return clazz.isAssignableFrom(individual.getClass());
+				} else {
+					// Assume this is external
+					return ModelRegistry.getModelRegistry().canBeExternal(clazz, specVersion);
+				}
 			}
+		} else {
+			return false;
 		}
-		return false;
+	}
+	
+	/**
+	 * @param propertyDescriptor descriptor for the property
+	 * @param clazz class to test against
+	 * @param specVersion Version of the spec to test for
+	 * @return true if the property can be assigned to type clazz for the latest SPDX spec version
+	 * @throws ModelRegistryException if the registry is not property initialized
+	 */
+	public boolean isPropertyValueAssignableTo(PropertyDescriptor propertyDescriptor, Class<?> clazz, String specVersion) throws ModelRegistryException {
+		Objects.requireNonNull(propertyDescriptor, "Property descriptor can not be null");
+		Objects.requireNonNull(clazz, "Class can not be null");
+		Object value = properties.get(propertyDescriptor);
+		if (value == null) {
+			return false;
+		}
+		return isAssignableTo(value, clazz, specVersion);
 	}
 
 	/**