Merge pull request #23 from blackducksoftware/improvement/romeara/22-automatic-temporary-file-cleanup

Resolves GH-22: Add automatic cleanup of temporary files

Author: Ryan O'Meara

CHANGE_LOG.md

@@ -5,5 +5,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+### Changed
+- (GH-22) Added automatic cleanup of temporary files
+
+## [0.1.0]
 ### Added
 - Ability to analyze built source for external method calls, outputting to a formatted report

method-analyzer-core/src/main/java/com/synopsys/method/analyzer/core/report/ReportGenerator.java

@@ -23,24 +23,30 @@
 package com.synopsys.method.analyzer.core.report;
 
 import java.io.BufferedWriter;
+import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;
 import java.util.Collection;
+import java.util.Comparator;
 import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
+import java.util.stream.Stream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import javax.annotation.Nullable;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.google.common.collect.Lists;
 import com.google.common.collect.Multimap;
 import com.google.gson.Gson;
@@ -69,6 +75,9 @@ public class ReportGenerator {
 
     private static final Gson GSON = new Gson();
 
+    /** Logger reference to output information to the application log files */
+    private final Logger logger = LoggerFactory.getLogger(getClass());
+
     private final MetaDataReportJson metaDataReport;
 
     /**
@@ -178,6 +187,17 @@ private Path writeReport(Path destinationFile, List<MethodIdJson> uniqueMethodKe
 
         writeZipFile(destinationFile, outputFileMapping);
 
+        // GH-22: Explicitly clean up temporary files once use of them is complete
+        try {
+            try (Stream<Path> walk = Files.walk(workingDirectory)) {
+                walk.sorted(Comparator.reverseOrder())
+                        .map(Path::toFile)
+                        .forEach(File::delete);
+            }
+        } catch (IOException e) {
+            logger.warn("Error cleaning up temporary report files", e);
+        }
+
         return destinationFile;
     }