Merge pull request #72 from eric-vlaanderen/fix_file_leak

Fix potential file handle leak and minor typo in settings.gradle - #71

Author: jbytecode

RCaller/settings.gradle

@@ -1 +1 @@
-rootprojectt.name = 'RCaller'
+rootProject.name = 'RCaller'

RCaller/src/main/java/com/github/rcaller/io/CSVFileWriter.java

@@ -2,19 +2,28 @@
 
 import com.github.rcaller.datatypes.DataFrame;
 
+import java.io.File;
 import java.io.FileWriter;
 import java.io.IOException;
 
 public class CSVFileWriter extends FileWriter{
 
-    private CSVFileWriter(String filePath) throws IOException {
+    private CSVFileWriter(final String filePath) throws IOException {
         super(filePath);
     }
 
-    public static CSVFileWriter create(String filePath) throws IOException {
+    private CSVFileWriter(final File file) throws IOException {
+        super(file);
+    }
+
+    public static CSVFileWriter create(final String filePath) throws IOException {
         return new CSVFileWriter(filePath);
     }
 
+    public static CSVFileWriter create(final File file) throws IOException {
+        return new CSVFileWriter(file);
+    }
+
     public void writeDataFrameToFile(DataFrame dataFrame) throws IOException {
         appendArray(dataFrame.getNames());
         for (int i = 0; i < dataFrame.getNumberOfRows(); i++) {
@@ -35,5 +44,4 @@ private void appendArray(Object[] array) throws IOException {
         this.flush();
     }
 
-
 }

RCaller/src/main/java/com/github/rcaller/util/RCodeUtils.java

@@ -7,11 +7,7 @@
 import com.github.rcaller.scriptengine.LanguageElement;
 import org.apache.commons.lang3.ArrayUtils;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
+import java.io.*;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
@@ -211,8 +207,9 @@ public static void addRespectToType(StringBuilder rCode, String name, Object o,
     public static void addDataFrame(StringBuilder rCode, String name, DataFrame dataFrame) {
         try {
             File file = File.createTempFile("dataFrame", ".csv");
-            CSVFileWriter csvFileWriter = CSVFileWriter.create(file.getAbsolutePath());
-            csvFileWriter.writeDataFrameToFile(dataFrame);
+            try (CSVFileWriter csvFileWriter = CSVFileWriter.create(file)) {
+                csvFileWriter.writeDataFrameToFile(dataFrame);
+            }
             rCode.append(name).append(" <- read.csv(\"").append(Globals.getSystemSpecificRPathParameter(file)).append("\")\n");
 
         } catch (IOException e) {