Intermediate checkin - serializable interface changes

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

Author: goneall

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

@@ -42,10 +42,13 @@
 import org.apache.jena.util.iterator.ExtendedIterator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.spdx.core.CoreModelObject;
 import org.spdx.core.DuplicateSpdxIdException;
 import org.spdx.core.InvalidSPDXAnalysisException;
 import org.spdx.core.TypedValue;
+import org.spdx.library.SpdxModelFactory;
 import org.spdx.library.model.v2.SpdxConstantsCompatV2;
+import org.spdx.library.model.v2.SpdxDocument;
 import org.spdx.storage.CompatibleModelStoreWrapper;
 import org.spdx.storage.IModelStore;
 import org.spdx.storage.ISerializableModelStore;
@@ -500,8 +503,8 @@ public String loadModelFromFile(String fileNameOrUrl, boolean overwrite) throws
 		    throw new FileNotFoundException(fileNameOrUrl + " not found.");
 		}
 		try {
-			deSerialize(spdxRdfInput, overwrite);
-			return this.documentUri;
+			SpdxDocument doc = deSerialize(spdxRdfInput, overwrite);
+			return doc.getDocumentUri();
 		} finally {
 			try {
 				spdxRdfInput.close();
@@ -569,9 +572,25 @@ public void serialize(OutputStream stream) throws InvalidSPDXAnalysisException,
 		checkClosed();
 		modelManager.serialize(stream, outputFormat);
 	}
+	
+	@Override
+	public void serialize(OutputStream stream, @Nullable CoreModelObject spdxDocument) throws InvalidSPDXAnalysisException, IOException {
+		checkClosed();
+		if (Objects.nonNull(spdxDocument)) {
+			if (!(spdxDocument instanceof SpdxDocument)) {
+				logger.error("Attempting to serialize "+spdxDocument.getClass().getName()+" which is not an SpdxDocument");
+				throw new InvalidSPDXAnalysisException("Attempting to serialize "+spdxDocument.getClass().getName()+" which is not an SpdxDocument");
+			}
+			if (!this.documentUri.equals(((SpdxDocument)spdxDocument).getDocumentUri())) {
+				logger.error(((SpdxDocument)spdxDocument).getDocumentUri() + " not found in model store");
+				throw new InvalidSPDXAnalysisException(((SpdxDocument)spdxDocument).getDocumentUri() + " not found in model store");
+			}
+		}
+		modelManager.serialize(stream, outputFormat);
+	}
 
 	@Override
-	public void deSerialize(InputStream stream, boolean overwrite) throws InvalidSPDXAnalysisException, IOException {
+	public SpdxDocument deSerialize(InputStream stream, boolean overwrite) throws InvalidSPDXAnalysisException, IOException {
 		Model model = ModelFactory.createDefaultModel();
 		model.read(stream, null, this.outputFormat.getType());
 		List<String> documentNamespaces = getDocumentNamespaces(model);
@@ -592,6 +611,16 @@ public void deSerialize(InputStream stream, boolean overwrite) throws InvalidSPD
 		}
 		this.modelManager = new RdfSpdxModelManager(documentNamespace, model);
 		this.documentUri = documentNamespace;
+		
+		@SuppressWarnings("unchecked")
+		Stream<SpdxDocument> documentStream = (Stream<SpdxDocument>)SpdxModelFactory.getSpdxObjects(this, null, SpdxConstantsCompatV2.CLASS_SPDX_DOCUMENT, 
+				documentNamespace + "#" + SpdxConstantsCompatV2.SPDX_DOCUMENT_ID, documentNamespace);
+		List<SpdxDocument> documents = documentStream.collect(Collectors.toList());
+		if (documents.isEmpty()) {
+			logger.error("No SPDX document found in file");;
+			throw new InvalidSPDXAnalysisException("No SPDX document was found in file");
+		}
+		return documents.get(0);
 	}
 
 

src/test/java/org/spdx/spdxRdfStore/RdfStoreTest.java

@@ -3,8 +3,10 @@
  */
 package org.spdx.spdxRdfStore;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.IOException;
+import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -16,6 +18,7 @@
 import org.apache.jena.query.QueryExecutionFactory;
 import org.apache.jena.query.ResultSet;
 import org.apache.jena.rdf.model.Model;
+import org.apache.jena.riot.RDFDataMgr;
 import org.spdx.core.InvalidSPDXAnalysisException;
 import org.spdx.core.ModelRegistry;
 import org.spdx.core.TypedValue;
@@ -227,5 +230,25 @@ public void testDuplicateHasFiles() throws InvalidSPDXAnalysisException, IOExcep
 		}
 		assertTrue(found);
 	}
-
+	
+	public void testSerializeDeserialize() throws Exception {
+		try (RdfStore rdfStore = new RdfStore()) {
+			SpdxDocument result = null;
+			try (InputStream spdxRdfInput = RDFDataMgr.open(TEST_FILE_NAME)) {
+				result = rdfStore.deSerialize(spdxRdfInput, false);
+				assertEquals("http://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301", result.getDocumentUri());
+				assertEquals("http://spdx.org/spdxdocs/spdx-example-444504E0-4F89-41D3-9A0C-0305E82C3301", rdfStore.getDocumentUri());
+				List<String> verify = result.verify();
+				assertTrue(verify.isEmpty());
+			}
+			try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+				rdfStore.serialize(output);
+				assertTrue(output.size() > 0);
+			}
+			try (ByteArrayOutputStream output = new ByteArrayOutputStream()) {
+				rdfStore.serialize(output, result);
+				assertTrue(output.size() > 0);
+			}
+		}
+	}
 }