Merge pull request #34 from spdx/issue32-2

Fetch listed license/exceptions from listedLiceses

Author: goneall

src/main/java/org/spdx/spdxRdfStore/RdfSpdxDocumentModelManager.java

@@ -665,7 +665,14 @@ public Optional<Object> getPropertyValue(String id, String propertyName) throws
 			Property property = model.createProperty(SpdxResourceFactory.propertyNameToUri(propertyName));
 			NodeIterator iter = model.listObjectsOfProperty(idResource, property);
 			if (!iter.hasNext()) {
-				return Optional.empty();
+				if (isListedLicenseOrException(idResource) && !this.exists(id)) {
+					// If there is no locally stored property for a listed license or exception
+					// fetch it from listed licenses store
+					return ListedLicenses.getListedLicenses().getLicenseModelStore()
+							.getValue(HTTPS_LISTED_LICENSE_NAMESPACE_PREFIX, id, propertyName);
+				} else {
+					return Optional.empty();
+				}
 			}
 			Optional<Object> result = valueNodeToObject(iter.next(), property);
 			if (iter.hasNext()) {
@@ -678,6 +685,24 @@ public Optional<Object> getPropertyValue(String id, String propertyName) throws
 		}
 	}
 
+	/**
+	 * @param idResource Resource for the ID
+	 * @return true if the type of the ID is a ListedLicenseException or a Listed License
+	 */
+	private boolean isListedLicenseOrException(Resource idResource) {
+		Resource valueType = idResource.getPropertyResourceValue(RDF.type);
+		if (Objects.isNull(valueType)) {
+			return false;
+		}
+		Optional<String> sValueType = SpdxResourceFactory.resourceToSpdxType(valueType);
+		if (sValueType.isEmpty()) {
+			return false;
+		}
+		String sValueTypeStr = sValueType.get();
+		return SpdxConstants.CLASS_SPDX_LISTED_LICENSE.equals(sValueTypeStr) || 
+				SpdxConstants.CLASS_SPDX_LISTED_LICENSE_EXCEPTION.equals(sValueTypeStr);
+	}
+
 	/**
 	 * Convert a node in the RDF graph to a Java object
 	 * @param propertyValue node containing the value

src/main/java/org/spdx/spdxRdfStore/SpdxOwlOntology.java

@@ -219,13 +219,13 @@ public List<String> getClassUriRestrictions(String classUri, String propertyUri)
 			if (classUri.endsWith("GenericSpdxElement")) {
 				ontClass = model.getOntClass(SpdxConstants.SPDX_NAMESPACE + SpdxConstants.CLASS_SPDX_ELEMENT);
 			} else {
-				logger.error(classUri + " is not an SPDX class");
+				logger.warn(classUri + " is not an SPDX class");
 				throw new SpdxRdfException(classUri + " is not an SPDX class");
 			}
 		}
 		OntProperty property = model.getOntProperty(checkGetOwlUriFromRenamed(propertyUri));
 		if (Objects.isNull(property)) {
-			logger.error(propertyUri + " is not an SPDX property");
+			logger.warn(propertyUri + " is not an SPDX property");
 			throw new MissingDataTypeAndClassRestriction(propertyUri + " is not an SPDX property");
 		}
 		List<Statement> propertyRestrictions = new ArrayList<Statement>();
@@ -253,13 +253,13 @@ public List<String> getDataUriRestrictions(String classUri, String propertyUri)
 			if (classUri.endsWith("GenericSpdxElement")) {
 				ontClass = model.getOntClass(SpdxConstants.SPDX_NAMESPACE + SpdxConstants.CLASS_SPDX_ELEMENT);
 			} else {
-				logger.error(classUri + " is not an SPDX class");
+				logger.warn(classUri + " is not an SPDX class");
 				throw new SpdxRdfException(classUri + " is not an SPDX class");
 			}
 		}
 		OntProperty property = model.getOntProperty(checkGetOwlUriFromRenamed(propertyUri));
 		if (Objects.isNull(property)) {
-			logger.error(propertyUri + " is not an SPDX property");
+			logger.warn(propertyUri + " is not an SPDX property");
 			throw new SpdxRdfException(propertyUri + " is not an SPDX property");
 		}
 		List<Statement> propertyRestrictions = new ArrayList<Statement>();
@@ -287,13 +287,13 @@ public boolean isList(String classUri, String propertyUri) throws SpdxRdfExcepti
 			if (classUri.endsWith("GenericSpdxElement")) {
 				ontClass = model.getOntClass(SpdxConstants.SPDX_NAMESPACE + SpdxConstants.CLASS_SPDX_ELEMENT);
 			} else {
-				logger.error(classUri + " is not an SPDX class");
+				logger.warn(classUri + " is not an SPDX class");
 				throw new SpdxRdfException(classUri + " is not an SPDX class");
 			}
 		}
 		OntProperty property = model.getOntProperty(checkGetOwlUriFromRenamed(propertyUri));
 		if (Objects.isNull(property)) {
-			logger.error(propertyUri + " is not an SPDX property");
+			logger.warn(propertyUri + " is not an SPDX property");
 			throw new SpdxRdfException(propertyUri + " is not an SPDX property");
 		}
 		List<Statement> propertyRestrictions = new ArrayList<Statement>();

src/test/java/org/spdx/library/model/license/SpdxListedLicenseTest.java

@@ -20,7 +20,6 @@
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
-import java.io.StringWriter;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Arrays;