When document contains mulitple packages not indicated by describes r…

…elationsihp, these now appear in the package list.
yevster · Sep 12, 2016 · 88318a4 · 88318a4
1 parent 16e3027
commit 88318a4
Showing 1 changed file with 17 additions and 6 deletions.
diff --git a/src/main/java/spdxedit/SpdxLogic.java b/src/main/java/spdxedit/SpdxLogic.java
@@ -3,6 +3,10 @@
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Lists;
 import com.google.common.net.MediaType;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.ResIterator;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.impl.PropertyImpl;
 import org.apache.commons.codec.digest.DigestUtils;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -18,7 +22,6 @@
 import org.spdx.rdfparser.model.*;
 import org.spdx.rdfparser.model.Relationship.RelationshipType;
 import org.spdx.rdfparser.model.SpdxFile.FileType;
-import org.spdx.rdfparser.referencetype.ListedReferenceTypes;
 import org.spdx.rdfparser.referencetype.ReferenceType;
 
 import java.io.IOException;
@@ -62,11 +65,19 @@ public static void addPackageToDocument(SpdxDocument document, SpdxPackage pkg)
 	}
 
 	public static Stream<SpdxPackage> getSpdxPackagesInDocument(SpdxDocument document) {
-		return Arrays.stream(document.getRelationships())
-				.filter(relationship -> relationship.getRelationshipType() == RelationshipType.DESCRIBES)
-				// Just in case
-				.filter(relationship -> relationship.getRelatedSpdxElement() instanceof SpdxPackage)
-				.map(relationship -> (SpdxPackage) relationship.getRelatedSpdxElement());
+        final Property rdfType = new PropertyImpl("http://www.w3.org/1999/02/22-rdf-syntax-ns#", "type");
+        final String packageTypeUri = "http://spdx.org/rdf/terms#Package";
+        ResIterator resIterator = document.getDocumentContainer().getModel().listResourcesWithProperty(rdfType, document.getDocumentContainer().getModel().getResource(packageTypeUri));
+        List<SpdxPackage> result = new LinkedList<SpdxPackage>();
+        try {
+            while (resIterator.hasNext()) {
+                Resource resource = resIterator.nextResource();
+                result.add(new SpdxPackage(document.getDocumentContainer(), resource.asNode()));
+            }
+            return result.stream();
+        } catch (InvalidSPDXAnalysisException e) {
+            throw new RuntimeException(e);
+        }
 	}
 
 	public static SpdxDocument createDocumentWithPackages(Iterable<SpdxPackage> packages) {