Feature-49: TmpFile Clean-up

pom.xml

@@ -145,7 +145,12 @@
         </plugin>
         <plugin>
           <artifactId>maven-surefire-plugin</artifactId>
-          <version>2.22.1</version>
+          <version>3.1.2</version>
+          <!-- Adjust forkCount to speed up tests if desired -->
+          <!-- <configuration>
+            <forkCount>1</forkCount>
+            <reuseForks>false</reuseForks>
+          </configuration> -->
         </plugin>
         <plugin>
           <artifactId>maven-install-plugin</artifactId>

src/main/java/org/dataone/hashstore/filehashstore/FileHashStore.java

@@ -1025,9 +1025,26 @@ protected ObjectInfo putObject(
         // Generate tmp file and write to it
         logFileHashStore.debug("FileHashStore.putObject - Generating tmpFile");
         File tmpFile = generateTmpFile("tmp", OBJECT_TMP_FILE_DIRECTORY);
-        Map<String, String> hexDigests = writeToTmpFileAndGenerateChecksums(
-            tmpFile, object, additionalAlgorithm, checksumAlgorithm
-        );
+        Map<String, String> hexDigests;
+        try {
+            hexDigests = writeToTmpFileAndGenerateChecksums(
+                tmpFile, object, additionalAlgorithm, checksumAlgorithm
+            );
+        } catch (Exception ge) {
+            // If the process to write to the tmpFile is interrupted for any reason,
+            // we will delete the tmpFile. 
+            boolean deleteStatus = tmpFile.delete();
+            String errMsg =
+                "FileHashStore.putObject - Unexpected Exception while storing object for: " + pid;
+            if (deleteStatus) {
+                errMsg = errMsg + ". Deleting temp file: " + tmpFile + ". Aborting request.";
+            } else {
+                errMsg = errMsg + ". Failed to delete temp file: " + tmpFile
+                    + ". Aborting request.";
+            }
+            logFileHashStore.error(errMsg);
+            throw new IOException(errMsg);
+        }
         long storedObjFileSize = Files.size(Paths.get(tmpFile.toString()));
 
         // Validate object if checksum and checksum algorithm is passed
@@ -1277,6 +1294,7 @@ protected File generateTmpFile(String prefix, Path directory) throws IOException
             logFileHashStore.trace(
                 "FileHashStore.generateTmpFile - tmpFile generated: " + newFile.getAbsolutePath()
             );
+            newFile.deleteOnExit();
             return newFile;
 
         } catch (IOException ioe) {

src/main/java/org/dataone/hashstore/filehashstore/FileHashStoreUtility.java

@@ -108,7 +108,7 @@ public static void checkForEmptyString(String string, String argument, String me
     /**
      * Checks whether a given long integer is greater than 0
      *
-     * @param object Object to check
+     * @param longInt Object to check
      * @param method Calling method
      * @throws IllegalArgumentException If longInt is less than 0
      */

src/test/java/org/dataone/hashstore/HashStoreTest.java

@@ -69,7 +69,7 @@ public void isHashStore() {
      * Check that getHashStore throws exception when classPackage is null
      */
     @Test
-    public void hashStore_classPackageNull() throws Exception {
+    public void hashStore_classPackageNull() {
         assertThrows(HashStoreFactoryException.class, () -> {
             Properties storeProperties = new Properties();
             storeProperties.setProperty("storePath", "/test");
@@ -88,7 +88,7 @@ public void hashStore_classPackageNull() throws Exception {
      * Check that getHashStore throws exception when classPackage is not found
      */
     @Test
-    public void hashStore_classPackageNotFound() throws Exception {
+    public void hashStore_classPackageNotFound() {
         assertThrows(HashStoreFactoryException.class, () -> {
             String classPackage = "org.dataone.hashstore.filehashstore.AnotherHashStore";
 
@@ -110,7 +110,7 @@ public void hashStore_classPackageNotFound() throws Exception {
      * Check that getHashStore throws exception when storeProperties is null
      */
     @Test
-    public void hashStore_nullStoreProperties() throws Exception {
+    public void hashStore_nullStoreProperties() {
         assertThrows(HashStoreFactoryException.class, () -> {
             String classPackage = "org.dataone.hashstore.filehashstore.FileHashStore";
             hashStore = HashStoreFactory.getHashStore(classPackage, null);