Merge pull request #23 from spdx/addclose

Add close to model store interface

Author: goneall

pom.xml

@@ -4,7 +4,7 @@
 
   <groupId>org.spdx</groupId>
   <artifactId>java-spdx-library</artifactId>
-  <version>0.0.2-SNAPSHOT</version>
+  <version>0.0.3-SNAPSHOT</version>
   <packaging>jar</packaging>
 
   <name>java-spdx-library</name>

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

@@ -62,6 +62,13 @@ public static String getDefaultDocumentUri() {
 	public static final void reset() {
 		lock.writeLock().lock();
 		try {
+			if (Objects.nonNull(defaultModelStore)) {
+				try {
+					defaultModelStore.close();
+				} catch (Exception e) {
+					throw new RuntimeException(e);
+				}
+			}
 			defaultModelStore = new InMemSpdxStore();
 			defaultCopyManager = new ModelCopyManager();
 		} finally {

src/main/java/org/spdx/storage/IModelStore.java

@@ -42,7 +42,7 @@
  * @author Gary O'Neall
  *
  */
-public interface IModelStore {
+public interface IModelStore extends AutoCloseable {
 
 	public interface IModelStoreLock {
 		public void unlock();

src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseLocalStore.java

@@ -72,4 +72,9 @@ InputStream getExceptionTocInputStream() throws IOException {
 	InputStream getExceptionInputStream(String exceptionId) throws IOException {
 		return getLicenseInputStream(exceptionId);
 	}
+	
+	@Override
+	public void close() throws Exception {
+		// Nothing to do for the either the in-memory or the web store
+	}
 }

src/main/java/org/spdx/storage/listedlicense/SpdxListedLicenseWebStore.java

@@ -77,4 +77,9 @@ InputStream getExceptionTocInputStream() throws IOException {
 	InputStream getExceptionInputStream(String exceptionId) throws IOException {
 		return getLicenseInputStream(exceptionId);	// Same URL using exception ID rather than license ID
 	}
+	
+	@Override
+	public void close() throws Exception {
+		// Nothing to do for the either the in-memory or the web store
+	}
 }

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

@@ -266,5 +266,10 @@ protected void clear(String documentUri) throws InvalidSPDXAnalysisException {
 	public void delete(String documentUri, String elementId) throws InvalidSPDXAnalysisException {
 		baseStore.delete(documentUri, elementId);
 	}
+	
+	@Override
+	public void close() throws Exception {
+		baseStore.close();
+	}
 
 }

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

@@ -410,4 +410,9 @@ public void delete(String documentUri, String id) throws InvalidSPDXAnalysisExce
 			throw new SpdxIdNotFoundException("Error deleting - ID "+id+" does not exist.");
 		}
 	}
+
+	@Override
+	public void close() throws Exception {
+		// Nothing to do for the in-memory store
+	}
 }