Merge pull request #31 from spdx/v23

Update to SPDX spec version 2.3

Author: goneall

TestFiles/SPDXRdfExample-old.rdf

@@ -4,7 +4,7 @@
 
   <groupId>org.spdx</groupId>
   <artifactId>spdx-rdf-store</artifactId>
-  <version>1.0.5-SNAPSHOT</version>
+  <version>1.1.0</version>
   <packaging>jar</packaging>
 
   <name>spdx-rdf-store</name>
@@ -91,7 +91,7 @@
     <dependency>
     	<groupId>org.spdx</groupId>
     	<artifactId>java-spdx-library</artifactId>
-    	<version>1.0.10</version>
+    	<version>1.1.0</version>
     </dependency>
     <dependency>
     	<groupId>org.apache.jena</groupId>

TestFiles/SPDXRdfExample.rdf

@@ -103,11 +103,49 @@ public static void upgrade(Model model, String documentNamespace) throws Invalid
 			upgradeArtifactOf(model, documentNamespace);
 			upgradeReviewers(model, documentNamespace);
 			upgradeExternalDocumentRefs(model, documentNamespace);
+			upgradeHasFiles(model, documentNamespace);
 		} finally {
 			model.leaveCriticalSection();
 		}
 	}
 
+	/**
+	 * Changes all hasFile properties to CONTAINS relationships
+	 * @param model
+	 * @param documentNamespace
+	 */
+	private static void upgradeHasFiles(Model model, String documentNamespace) {
+		List<Statement> statementsToRemove = new ArrayList<>();
+		Property hasFileProperty = model.createProperty("http://spdx.org/rdf/terms#hasFile");
+		Property relationshipProperty = model.createProperty(SpdxConstants.SPDX_NAMESPACE + SpdxConstants.PROP_RELATIONSHIP);
+		String query = "SELECT ?s ?o  WHERE { ?s  <http://spdx.org/rdf/terms#hasFile> ?o }";
+		try (QueryExecution qe = QueryExecutionFactory.create(query, model)) {
+		    ResultSet result = qe.execSelect();
+	        while (result.hasNext()) {
+	            QuerySolution qs = result.next();
+	            Resource pkg = qs.get("s").asResource();
+	            Resource file = qs.get("o").asResource();
+	            statementsToRemove.add(model.createStatement(pkg, hasFileProperty, file));
+	            // check for existing contains relationships - avoids duplication
+	            List<Statement> foundContainsRelationships = new ArrayList<>();
+	            pkg.listProperties(relationshipProperty).forEach((stmt) -> {
+	            	Resource existingRelationship = stmt.getObject().asResource();
+	            	Resource relatedElement = existingRelationship.getPropertyResourceValue(model.createProperty(SpdxConstants.SPDX_NAMESPACE + SpdxConstants.PROP_RELATED_SPDX_ELEMENT));
+	            	Resource relationshipType = existingRelationship.getPropertyResourceValue(model.createProperty(SpdxConstants.SPDX_NAMESPACE + SpdxConstants.PROP_RELATIONSHIP_TYPE));
+	            	if (relatedElement.getURI().equals(file.getURI()) &&
+	            			relationshipType.getURI().equals(RelationshipType.CONTAINS.getIndividualURI())) {
+	            		foundContainsRelationships.add(stmt);
+            		}
+	            });
+	            if (foundContainsRelationships.size() == 0) {
+	            	Resource relationship = createRelationship(model, file, RelationshipType.CONTAINS);
+	            	pkg.addProperty(relationshipProperty, relationship);
+	            }
+	        }
+	        model.remove(statementsToRemove);
+		}
+	}
+
 	/**
 	 * Make sure all external document Ref's have a URI with proper ID rather than using the externalDocumentId property
 	 * @param model

TestFiles/SPDXRdfExampleHttps.rdf

@@ -180,7 +180,7 @@ public void removedStatement(Statement s) {
 	private NextIdListener nextIdListener = new NextIdListener();
 
 	private String documentUri;
-	private Model model;
+	protected Model model;
 	/**
 	 * Map of a lower case ID to the case sensitive ID
 	 */

TestFiles/withHasFile.rdf

@@ -54,7 +54,7 @@ public class SpdxOwlOntology {
 
 	static SpdxOwlOntology myself = null;
 
-	static final String ONTOLOGY_PATH = "/resources/spdx-2-2-revision-14-onotology.owl.xml";
+	static final String ONTOLOGY_PATH = "/resources/spdx-2-3-revision-2-ontology.owl.xml";
 
 	private OntModel model;