Merge branch 'v3.x.x'

Author: millij

README.md

@@ -22,7 +22,7 @@ This library is available in [Maven Central](https://mvnrepository.com/artifact/
 <dependency>
     <groupId>io.github.millij</groupId>
     <artifactId>poi-object-mapper</artifactId>
-    <version>3.2.0</version>
+    <version>3.2.1</version>
 </dependency>
 ```
 

build.gradle

@@ -15,7 +15,7 @@ sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
 group = 'io.github.millij'
-version = '3.2.0'
+version = '3.2.1'
 
 
 dependencies {

src/main/java/io/github/millij/poi/ss/writer/AbstractSpreadsheetWriter.java

@@ -1,7 +1,5 @@
 package io.github.millij.poi.ss.writer;
 
-import java.io.File;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.util.ArrayList;
@@ -172,21 +170,9 @@ public void addSheet(final List<Map<String, Object>> rowsData, final String inSh
     // Write
 
     @Override
-    public void write(final File file) throws IOException {
-        // Sanity checks
-        if (Objects.isNull(file)) {
-            throw new IllegalArgumentException("#write :: Input File object is NULL");
-        }
-
-        try (final OutputStream outputStrem = new FileOutputStream(file)) {
-            workbook.write(outputStrem);
-            workbook.close();
-
-        } catch (Exception ex) {
-            final String errMsg = String.format("Failed to write workbook data to file : %s", file.getPath());
-            LOGGER.error(errMsg);
-            throw ex;
-        }
+    public void write(final OutputStream outputStrem) throws IOException {
+        workbook.write(outputStrem);
+        workbook.close();
     }
 
 

src/main/java/io/github/millij/poi/ss/writer/SpreadsheetWriter.java

@@ -1,9 +1,12 @@
 package io.github.millij.poi.ss.writer;
 
 import java.io.File;
+import java.io.FileOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import org.apache.logging.log4j.util.Strings;
 
@@ -109,6 +112,33 @@ default void addSheet(List<Map<String, Object>> rowsData, List<String> headers)
     //
     // Write
 
+    /**
+     * Writes the current Spreadsheet workbook to an OutputStream
+     * 
+     * @param outputStream output stream
+     * 
+     * @throws IOException if the stream is not writable.
+     */
+    void write(OutputStream outputStream) throws IOException;
+
+    /**
+     * Writes the current Spreadsheet workbook to a file
+     * 
+     * @param file output file
+     * 
+     * @throws IOException if the file is not writable.
+     */
+    default void write(final File file) throws IOException {
+        // Sanity checks
+        if (Objects.isNull(file)) {
+            throw new IllegalArgumentException("#write :: Input File object is NULL");
+        }
+
+        // OutputStream
+        final OutputStream outputStream = new FileOutputStream(file);
+        this.write(outputStream);
+    }
+
     /**
      * Writes the current Spreadsheet workbook to a file in the specified path.
      * 
@@ -122,17 +152,10 @@ default void write(final String filepath) throws IOException {
             throw new IllegalArgumentException("#write :: Input File Path is BLANK");
         }
 
-        this.write(new File(filepath));
+        // OutputStream
+        final OutputStream outputStream = new FileOutputStream(filepath);
+        this.write(outputStream);
     }
 
-    /**
-     * Writes the current Spreadsheet workbook to a file
-     * 
-     * @param file output file
-     * 
-     * @throws IOException if the file is not writable.
-     */
-    void write(File file) throws IOException;
-
 
 }