Removed some examples. A new method has been added in ExcelWorkbook to write and close the workbook.

Author: MBenincasa

src/main/java/io/github/mbenincasa/javaexcelutils/model/excel/ExcelWorkbook.java

@@ -343,4 +343,9 @@ public Boolean isSheetNull(Integer index) {
     public FormulaEvaluator getFormulaEvaluator() {
         return this.workbook.getCreationHelper().createFormulaEvaluator();
     }
+
+    public void writeAndClose(OutputStream outputStream) throws IOException {
+        this.workbook.write(outputStream);
+        this.close(outputStream);
+    }
 }

src/main/java/io/github/mbenincasa/javaexcelutils/samples/countAllRowsSample/Main.java

@@ -364,10 +364,9 @@ public static OutputStream objectsToExcelStream(List<ObjectToExcel<?>> objectToE
             setAutoSizeColumn(excelSheet, fields, clazz);
         }
 
+        /* Write and close */
         OutputStream outputStream = new ByteArrayOutputStream();
-        excelWorkbook.getWorkbook().write(outputStream);
-
-        excelWorkbook.close();
+        excelWorkbook.writeAndClose(outputStream);
         return outputStream;
     }
 

src/main/java/io/github/mbenincasa/javaexcelutils/samples/sheetSample/Main.java

@@ -4,6 +4,6 @@
 import org.junit.platform.suite.api.Suite;
 
 @Suite
-@SelectPackages({"io.github.mbenincasa.javaexcelutils.tools", "io.github.mbenincasa.javaexcelutils.model"})
+@SelectPackages({"io.github.mbenincasa.javaexcelutils"})
 public class TestSuite {
 }

src/main/java/io/github/mbenincasa/javaexcelutils/tools/Converter.java

@@ -1,13 +1,9 @@
-package io.github.mbenincasa.javaexcelutils.model;
+package io.github.mbenincasa.javaexcelutils.model.excel;
 
 import io.github.mbenincasa.javaexcelutils.exceptions.ExtensionNotValidException;
 import io.github.mbenincasa.javaexcelutils.exceptions.OpenWorkbookException;
 import io.github.mbenincasa.javaexcelutils.exceptions.ReadValueException;
 import io.github.mbenincasa.javaexcelutils.exceptions.SheetNotFoundException;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelCell;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelRow;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelSheet;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelWorkbook;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

src/test/java/io/github/mbenincasa/javaexcelutils/TestSuite.java

@@ -1,12 +1,8 @@
-package io.github.mbenincasa.javaexcelutils.model;
+package io.github.mbenincasa.javaexcelutils.model.excel;
 
 import io.github.mbenincasa.javaexcelutils.exceptions.ExtensionNotValidException;
 import io.github.mbenincasa.javaexcelutils.exceptions.OpenWorkbookException;
 import io.github.mbenincasa.javaexcelutils.exceptions.SheetNotFoundException;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelCell;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelRow;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelSheet;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelWorkbook;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

src/test/java/io/github/mbenincasa/javaexcelutils/model/ExcelCellTest.java renamed to src/test/java/io/github/mbenincasa/javaexcelutils/model/excel/ExcelCellTest.java

@@ -1,11 +1,8 @@
-package io.github.mbenincasa.javaexcelutils.model;
+package io.github.mbenincasa.javaexcelutils.model.excel;
 
 import io.github.mbenincasa.javaexcelutils.exceptions.ExtensionNotValidException;
 import io.github.mbenincasa.javaexcelutils.exceptions.OpenWorkbookException;
 import io.github.mbenincasa.javaexcelutils.exceptions.SheetNotFoundException;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelRow;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelSheet;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelWorkbook;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 

src/test/java/io/github/mbenincasa/javaexcelutils/model/ExcelRowTest.java renamed to src/test/java/io/github/mbenincasa/javaexcelutils/model/excel/ExcelRowTest.java

@@ -1,25 +1,39 @@
-package io.github.mbenincasa.javaexcelutils.model;
+package io.github.mbenincasa.javaexcelutils.model.excel;
 
 import com.opencsv.CSVReader;
 import com.opencsv.CSVWriter;
 import io.github.mbenincasa.javaexcelutils.enums.Extension;
 import io.github.mbenincasa.javaexcelutils.exceptions.ExtensionNotValidException;
 import io.github.mbenincasa.javaexcelutils.exceptions.OpenWorkbookException;
 import io.github.mbenincasa.javaexcelutils.exceptions.SheetNotFoundException;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelSheet;
-import io.github.mbenincasa.javaexcelutils.model.excel.ExcelWorkbook;
+import io.github.mbenincasa.javaexcelutils.model.converter.ObjectToExcel;
+import io.github.mbenincasa.javaexcelutils.tools.Converter;
+import io.github.mbenincasa.javaexcelutils.tools.utils.Address;
+import io.github.mbenincasa.javaexcelutils.tools.utils.Person;
 import org.apache.commons.io.FilenameUtils;
 import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 
 import java.io.*;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Stream;
 
 public class ExcelWorkbookTest {
 
     private final File excelFile = new File("./src/test/resources/employee.xlsx");
     private final File csvFile = new File("./src/test/resources/employee.csv");
 
+    private static final List<Person> persons = new ArrayList<>();
+    private static final List<Address> addresses = new ArrayList<>();
+
+    @BeforeAll
+    static void beforeAll() {
+        persons.add(new Person("Rossi", "Mario", 20));
+        addresses.add(new Address("Milano", "Corso Como, 4"));
+    }
+
     @Test
     void open() throws OpenWorkbookException, ExtensionNotValidException, IOException {
         ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
@@ -185,4 +199,16 @@ void getFormulaEvaluator() throws OpenWorkbookException, ExtensionNotValidExcept
         ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
         Assertions.assertNotNull(excelWorkbook.getFormulaEvaluator());
     }
+
+    @Test
+    void writeAndClose() throws ExtensionNotValidException, IOException {
+        Stream<Person> personStream = persons.stream();
+        Stream<Address> addressStream = addresses.stream();
+        List<ObjectToExcel<?>> list = new ArrayList<>();
+        list.add(new ObjectToExcel<>("Person", Person.class, personStream));
+        list.add(new ObjectToExcel<>("Address", Address.class, addressStream));
+        ByteArrayOutputStream outputStream = (ByteArrayOutputStream) Converter.objectsToExcelStream(list, Extension.XLSX, true);
+        ExcelWorkbook excelWorkbook = new ExcelWorkbook(Extension.XLSX);
+        Assertions.assertDoesNotThrow(() -> excelWorkbook.writeAndClose(outputStream));
+    }
 }