Free resources in parser when complete: close workbook/mem map.

Author: Robin Duda

src/main/java/com/codingchili/Controller/CommandLine.java

@@ -45,8 +45,8 @@ private void assertCommandLineValid(String[] args) {
     private void importFile(ImportEvent event, String fileName) {
         logger.loadingFromFilesystem(fileName);
         logger.parsingStarted();
+        FileParser parser = ParserFactory.getByFilename(fileName);
         try {
-            FileParser parser = ParserFactory.getByFilename(fileName);
             parser.setFileData(fileName, 1, fileName);
 
             event.setParser(parser);
@@ -66,6 +66,8 @@ private void importFile(ImportEvent event, String fileName) {
             logger.onParseFailed(fileName, e);
         } catch (FileNotFoundException e) {
             logger.onFileLoadFailed(fileName, e);
+        } finally {
+            parser.free();
         }
     }
 

src/main/java/com/codingchili/Controller/Website.java

@@ -170,9 +170,9 @@ private Future<Integer> onComplete(RoutingContext context, String fileName) {
      */
     private void parse(String uploadedFileName, MultiMap params, String fileName, Future<Integer> future) {
         vertx.executeBlocking(blocking -> {
+            FileParser parser = ParserFactory.getByFilename(fileName);
             try {
                 ImportEvent event = ImportEvent.fromParams(params);
-                FileParser parser = ParserFactory.getByFilename(fileName);
                 parser.setFileData(uploadedFileName, event.getOffset(), fileName);
 
                 parser.initialize();
@@ -189,6 +189,8 @@ private void parse(String uploadedFileName, MultiMap params, String fileName, Fu
                         });
             } catch (FileNotFoundException | ParserException | NumberFormatException e) {
                 blocking.fail(e);
+            } finally {
+                parser.free();
             }
         }, false, future);
     }

src/main/java/com/codingchili/Model/CSVParser.java

@@ -1,5 +1,6 @@
 package com.codingchili.Model;
 
+import com.codingchili.logging.ApplicationLogger;
 import io.vertx.core.json.JsonObject;
 import org.reactivestreams.Subscriber;
 import org.reactivestreams.Subscription;
@@ -10,6 +11,7 @@
 import java.nio.channels.FileChannel;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.logging.Level;
 
 /**
  * @author Robin Duda
@@ -26,6 +28,7 @@ public class CSVParser implements FileParser {
     private static final char TOKEN_QUOTE = '\"';
     private static final char TOKEN_SEPARATOR = ',';
 
+    private ApplicationLogger logger = new ApplicationLogger(getClass());
     private ByteBuffer buffer = ByteBuffer.allocate(MAX_LINE_LENGTH);
     private JsonObject headers = new JsonObject();
     private Iterator<String> header;
@@ -181,6 +184,15 @@ public int getNumberOfElements() {
         return rows;
     }
 
+    @Override
+    public void free() {
+        try {
+            file.close();
+        } catch (IOException e) {
+            logger.onError(e);
+        }
+    }
+
     @Override
     public void subscribe(Subscriber<? super JsonObject> subscriber) {
         map.position(0);

src/main/java/com/codingchili/Model/ExcelParser.java

@@ -23,6 +23,8 @@ public class ExcelParser implements FileParser {
     private static final String XML97 = ".xls";
     private ApplicationLogger logger = new ApplicationLogger(getClass());
     private String fileName;
+    private File file;
+    private Workbook workbook;
     private Sheet sheet;
     private int columns;
     private int offset;
@@ -32,12 +34,12 @@ public class ExcelParser implements FileParser {
     public void setFileData(String localFileName, int offset, String fileName)
             throws ParserException, FileNotFoundException {
 
-        File file = new File(localFileName);
+        file = new File(localFileName);
         offset -= 1; // convert excel row number to 0-based index.
 
         if (file.exists()) {
             try {
-                Workbook workbook = getWorkbook(file, fileName);
+                this.workbook = getWorkbook(file, fileName);
                 this.sheet = workbook.getSheetAt(0);
                 this.offset = offset;
                 this.fileName = fileName;
@@ -132,6 +134,15 @@ public void parseRowRange(int begin, int count, Consumer<JsonObject> consumer) {
     }
 
 
+    @Override
+    public void free() {
+        try {
+            workbook.close();
+        } catch (IOException e) {
+            logger.onError(e);
+        }
+    }
+
     @Override
     public int getNumberOfElements() {
         return rows;

src/main/java/com/codingchili/Model/FileParser.java

@@ -39,4 +39,9 @@ public interface FileParser extends Publisher<JsonObject> {
      */
     int getNumberOfElements();
 
+
+    /**
+     * Releases any resources associated with the FileParser.
+     */
+    void free();
 }