fix DefaultReportPageFactory

Author: vananiev

src/main/java/org/spacious_team/table_wrapper/autoconfigure/DefaultReportPageFactory.java

@@ -205,7 +205,7 @@ public ReportPage doCreate(InputStream is, Object sheetId) {
      */
     public static ByteArrayInputStream convertToByteArrayInputStream(InputStream inputStream) throws IOException {
         if (inputStream.getClass() == ByteArrayInputStream.class) {
-            return (ByteArrayInputStream) inputStream;  // close() do nothing
+            return (ByteArrayInputStream) inputStream;  // close() does nothing
         } else {
             byte[] bytes = inputStream.readAllBytes();
             return new ByteArrayInputStream(bytes);
@@ -214,6 +214,9 @@ public static ByteArrayInputStream convertToByteArrayInputStream(InputStream inp
 
     @SuppressWarnings("DataFlowIssue")
     private static boolean isEmptyCsvReportPage(CsvReportPage reportPage) {
+        if (reportPage.getLastRowNum() == -1) {
+            return true;
+        }
         // has only one Cell with NULL value
         return reportPage.getLastRowNum() == 0 &&
                 reportPage.getCell(TableCellAddress.of(0, 0)) != null &&

src/test/java/org/spacious_team/table_wrapper/autoconfigure/DefaultReportPageFactoryTest.java

@@ -71,14 +71,14 @@ void create_firstSheetByInputStream_ok(String fileName) throws IOException {
 
     @ParameterizedTest
     @ValueSource(strings = {"test.txt", "test.bin"})
-    void create_firstSheetByPath_exception(String fileName) {
+    void create_byPathWithUnknownFilenameExt_exception(String fileName) {
         Path path = getPath(fileName);
         assertThrows(ReportPageInstantiationException.class, () -> factory.create(path));
     }
 
     @ParameterizedTest
     @ValueSource(strings = {"test.bin"})
-    void create_firstSheetByInputStream_exception(String fileName) {
+    void create_byInputStreamOfBinaryFile_exception(String fileName) {
         InputStream is = getInputStream(fileName);
         assertThrows(ReportPageInstantiationException.class, () -> factory.create(is));
     }
@@ -129,6 +129,8 @@ void create_namedSheetForCsvByInputStream_ok(String fileName) {
         assertNotNull(factory.create(is, "SheetB"));
     }
 
+    // test InputStream closing
+
     @Test
     void create_byteArrayInputStream_closed() throws IOException {
         InputStream is = spy(new ByteArrayInputStream(new byte[0]));
@@ -137,7 +139,7 @@ void create_byteArrayInputStream_closed() throws IOException {
     }
 
     @Test
-    void create_instanceOfByteArrayInputStream_closed() throws IOException {
+    void create_instanceOfByteArrayInputStream_notClosed() throws IOException {
         InputStream is = spy(new ByteArrayInputStream(new byte[0]) {
             // own class impl extending ByteArrayInputStream
         });
@@ -156,4 +158,4 @@ public int read() {
         assertNotNull(factory.create(is));
         verify(is, never()).close();
     }
-}
+}

src/test/java/org/spacious_team/table_wrapper/autoconfigure/ReportPageFactoryTestFileCreator.java

@@ -49,8 +49,12 @@ static void creteFiles() {
         createCsvFile("test.csv");
         createCsvFile("test.txt");
         createXmlFile("test.xml");
-        createExcelFile("test.xls", new HSSFWorkbook());
-        createExcelFile("test.xlsx", new XSSFWorkbook());
+        try (HSSFWorkbook workbook = new HSSFWorkbook()) {
+            createExcelFile("test.xls", workbook);
+        }
+        try (XSSFWorkbook workbook = new XSSFWorkbook()) {
+            createExcelFile("test.xlsx", workbook);
+        }
     }
 
     @SneakyThrows
@@ -68,7 +72,7 @@ static Path getPath(String fileName) {
     }
 
     @SneakyThrows
-    static InputStream getInputStream(String fileName) {
+    static ByteArrayInputStream getInputStream(String fileName) {
         Path path = getPath(fileName);
         try (InputStream is = Files.newInputStream(path)) {
             return new ByteArrayInputStream(is.readAllBytes());  // read all bytes here for release file's InputStream
@@ -132,7 +136,6 @@ static void createExcelFile(String fileName, org.apache.poi.ss.usermodel.Workboo
             row.createCell(1).setCellValue("b5");
             row.createCell(2).setCellValue("c6");
 
-
             workbook.write(fos);
         }
     }