Fix missing cleanup of temp files

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>cambio.simulator</groupId>
     <artifactId>misim</artifactId>
-    <version>4.1.0</version>
+    <version>4.1.1</version>
     <packaging>jar</packaging>
 
     <name>MiSim Simulator</name>

restAPI/pom.xml

@@ -10,7 +10,7 @@
     </parent>
     <groupId>restAPI</groupId>
     <artifactId>restAPI</artifactId>
-    <version>0.0.2-SNAPSHOT</version>
+    <version>0.0.3-SNAPSHOT</version>
     <name>restAPI</name>
     <properties>
         <java.version>17</java.version>
@@ -26,7 +26,7 @@
         <dependency>
             <groupId>cambio.simulator</groupId>
             <artifactId>misim</artifactId>
-            <version>4.1.0</version>
+            <version>4.1.1</version>
         </dependency>
 
         <dependency>

restAPI/src/main/java/restAPI/simulation_running/SimulationRunningController.java

@@ -50,13 +50,14 @@ private ResponseEntity<String> runSimulation(MultipartFile[] architectures, Mult
                                                  MultipartFile[] experiments, MultipartFile[] loads,
                                                  MultipartFile[] mtls,
                                                  String id) throws IOException {
+        Path tmpFolder = null;
         try {
             if (TempFileUtils.existsSimulationId(id)) {
                 return new ResponseEntity<>(String.format("Simulation ID <%s> is already in use. " +
                     "Please provide a unique new id.", id),
                     HttpStatus.BAD_REQUEST);
             }
-            Path tmpFolder = TempFileUtils.createDefaultTempDir("misim-");
+            tmpFolder = TempFileUtils.createDefaultTempDir("misim-");
             Path outputFolder = TempFileUtils.createOutputDir(TempFileUtils.RAW_OUTPUT_DIR, id);
 
             Multimap<String, String> savedFiles = ArrayListMultimap.create();
@@ -77,14 +78,18 @@ private ResponseEntity<String> runSimulation(MultipartFile[] architectures, Mult
             String rawResultsDirPath = outputFolder.toString() + TempFileUtils.SEPARATOR + "raw";
             //Block2
             ReportDataPointsManipulator.adjustSimulationResults(rawResultsDirPath, id);
-            // Do the clean-up
-            FileUtils.deleteDirectory(tmpFolder.toFile());
             return new ResponseEntity<>("Files have been successfully uploaded, and the simulation is running.",
                 HttpStatus.OK);
         } catch (Exception e) {
             String errorMessage = e.getMessage();
             logger.error(errorMessage);
             return new ResponseEntity<>(errorMessage, HttpStatus.INTERNAL_SERVER_ERROR);
+        } finally {
+            // Do the clean-up
+            if (tmpFolder != null) {
+                FileUtils.deleteDirectory(tmpFolder.toFile());
+            }
+            TempFileUtils.cleanOutputDir(id);
         }
     }
 }

restAPI/src/main/java/restAPI/util/TempFileUtils.java

@@ -1,10 +1,12 @@
 package restAPI.util;
 
 import com.google.common.collect.Multimap;
+import org.apache.commons.io.FileUtils;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MaxUploadSizeExceededException;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.io.File;
 import java.io.IOException;
 import java.nio.file.FileSystems;
 import java.nio.file.Files;
@@ -95,4 +97,13 @@ public static boolean existsSimulationId(String simulationId) {
         String simulationOutputDirPath = RAW_OUTPUT_DIR + SEPARATOR + simulationId;
         return Files.exists(Path.of(simulationOutputDirPath));
     }
+
+    public static void cleanOutputDir(String simulationId){
+        String simulationOutputDirPath = RAW_OUTPUT_DIR + SEPARATOR + simulationId;
+        try {
+            FileUtils.deleteDirectory(new File(simulationOutputDirPath));
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }