if temp file has been created during creation of connection, it will be

deleted on connection close

Author: mareks

build.gradle

@@ -51,7 +51,7 @@ publishing {
         maven(MavenPublication) {
             groupId = 'de.inetsoftware'
             artifactId = 'exceljconnect'
-            version = '1.5'
+            version = '1.6'
             from components.java
             pom {
                 name = 'Excel driver for Java'

src/com/inet/excel/ExcelConnection.java

@@ -42,16 +42,19 @@ public class ExcelConnection implements Connection {
 
     private final ExcelParser parser;
     private boolean closed;
+    private Runnable onConnectionClose;
 
     /** Constructor of the class.
      * @param parser component responsible for reading data from Excel document.
+     * @param onConnectionClose optional runnable to be executed on connection close.
      * @throws IllegalArgumentException if given parser is null.
      */
-    public ExcelConnection( ExcelParser parser ) {
+    public ExcelConnection( ExcelParser parser, Runnable onConnectionClose ) {
         if( parser == null ) {
             throw new IllegalArgumentException( "parser must not be null" );
         }
         this.parser = parser;
+        this.onConnectionClose = onConnectionClose;
         this.closed = false;
     }
 
@@ -169,6 +172,9 @@ public void rollback() throws SQLException {
      */
     @Override
     public void close() throws SQLException {
+        if( !closed && onConnectionClose != null ) {
+            onConnectionClose.run();
+        }
         closed = true;
     }
 

src/com/inet/excel/ExcelDriver.java

@@ -40,7 +40,7 @@ public class ExcelDriver implements Driver {
     public static final String URL_PREFIX    = "jdbc:inetexcel:";
     public static final String DRIVER_NAME   = "inetexcel";
     public static final int    MAJOR_VERSION = 1;
-    public static final int    MINOR_VERSION = 5;
+    public static final int    MINOR_VERSION = 6;
 
     /** Throws exception indicating that requested operation is not supported.
      * @throws SQLException exception indicating that requested operation is not supported.
@@ -87,6 +87,8 @@ public Connection connect( String url, Properties info ) throws SQLException {
             throw new SQLException( "Excel file is not specified" );
         }
 
+        Runnable onConnectionClose = null;
+
         String lowerCasedFilePath = filePath.toLowerCase();
         String fileProtocol = "file:";
         if( lowerCasedFilePath.startsWith( fileProtocol ) ) {
@@ -109,6 +111,13 @@ public Connection connect( String url, Properties info ) throws SQLException {
                 Path tempFile = Files.createTempFile( null, null ).toAbsolutePath();
                 Files.copy( in, tempFile, StandardCopyOption.REPLACE_EXISTING );
                 filePath = tempFile.toString();
+                onConnectionClose = () -> {
+                    try {
+                        Files.deleteIfExists( tempFile );
+                    } catch( IOException e ) {
+                        // ignore
+                    }
+                };
             } catch( IOException e ) {
                 throw new SQLException( "An error occurred while accessing the file", e );
             }
@@ -120,7 +129,7 @@ public Connection connect( String url, Properties info ) throws SQLException {
         }
 
         ExcelParser parser = new ExcelParser( file, hasHeaderRow );
-        return new ExcelConnection( parser );
+        return new ExcelConnection( parser, onConnectionClose );
     }
 
     /**

test/com/inet/excel/ExcelConnectionTest.java

@@ -15,14 +15,24 @@
  */
 package com.inet.excel;
 
-import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.nio.file.Paths;
 
 import org.junit.jupiter.api.Test;
 
+import com.inet.excel.parser.ExcelParser;
+
 public class ExcelConnectionTest {
 
     @Test
     public void constructor_throws_exception_if_parser_is_null() {
-        assertThrows( IllegalArgumentException.class, () -> new ExcelConnection( null ) );
+        assertThrows( IllegalArgumentException.class, () -> new ExcelConnection( null, null ) );
+    }
+
+    @Test
+    public void constructor_accepts_null_as_runnable_to_be_executed_on_connection_close() {
+        ExcelParser parser = new ExcelParser( Paths.get( "" ), false );
+        assertDoesNotThrow( () -> new ExcelConnection( parser, null ) );
     }
 }