Merge branch 'hotfix/poi'

Author: amartinezcsuc

PRC-CSV2XML-Core/pom.xml

@@ -80,12 +80,6 @@
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-iostreams</artifactId>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/com.monitorjbl/xlsx-streamer -->
-        <dependency>
-            <groupId>com.monitorjbl</groupId>
-            <artifactId>xlsx-streamer</artifactId>
-            <version>2.1.0</version>
-        </dependency>
         <!-- https://mvnrepository.com/artifact/commons-io/commons-io -->
         <dependency>
             <groupId>commons-io</groupId>
@@ -97,18 +91,18 @@
             <artifactId>poi-ooxml</artifactId>
             <version>4.1.0</version>
         </dependency>
+        <!-- https://mvnrepository.com/artifact/org.apache.poi/poi-ooxml-schemas -->
+        <dependency>
+            <groupId>org.apache.poi</groupId>
+            <artifactId>poi-ooxml-schemas</artifactId>
+            <version>4.1.0</version>
+        </dependency>
         <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-text -->
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-text</artifactId>
             <version>1.6</version>
         </dependency>
-        <!-- https://mvnrepository.com/artifact/org.apache.xmlbeans/xmlbeans -->
-        <dependency>
-            <groupId>org.apache.xmlbeans</groupId>
-            <artifactId>xmlbeans</artifactId>
-            <version>3.1.0</version>
-        </dependency>
     </dependencies>
 
     <build>

PRC-CSV2XML-Core/src/main/java/org/csuc/poi/XLSX2CSV.java

@@ -1,15 +1,18 @@
 package org.csuc.poi;
 
-import com.monitorjbl.xlsx.StreamingReader;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.apache.poi.ss.usermodel.Sheet;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.apache.poi.ss.usermodel.WorkbookFactory;
+import org.apache.poi.xssf.usermodel.XSSFWorkbook;
 import org.csuc.utils.SHEETS;
 
 import java.io.*;
 import java.nio.file.Files;
-import java.util.*;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -21,50 +24,38 @@ public class XLSX2CSV {
 
     private static Logger logger = LogManager.getLogger(XLSX2CSV.class);
 
-    private Workbook workbook;
+    private XSSFWorkbook workbook;
 
     private char SEPARATOR;
     private String ENDOFLINESYMBOLS;
     private Pattern rxquote = Pattern.compile("\"");
 
     private Map<SHEETS, File> files = new HashMap<>();
 
-    public XLSX2CSV(String file, char delimiter, String endOfLineSymbols) throws FileNotFoundException {
-        InputStream is = new FileInputStream(file);
-        workbook = StreamingReader.builder()
-                .rowCacheSize(100)    // number of rows to keep in memory (defaults to 10)
-                .bufferSize(4096)     // buffer size to use when reading InputStream to file (defaults to 1024)
-                .open(is);            // InputStream or File for XLSX file (required)
+    public XLSX2CSV(String file, char delimiter, String endOfLineSymbols) throws IOException {
+        workbook = new XSSFWorkbook (new FileInputStream(file));
+        //workbook = WorkbookFactory.create(new File(file));
     }
 
-    public XLSX2CSV(File file, char delimiter, String endOfLineSymbols) throws FileNotFoundException {
+    public XLSX2CSV(File file, char delimiter, String endOfLineSymbols) throws IOException {
         InputStream is = new FileInputStream(file);
         SEPARATOR = delimiter;
         ENDOFLINESYMBOLS = endOfLineSymbols;
-        workbook = StreamingReader.builder()
-                .rowCacheSize(100)    // number of rows to keep in memory (defaults to 10)
-                .bufferSize(4096)     // buffer size to use when reading InputStream to file (defaults to 1024)
-                .open(is);            // InputStream or File for XLSX file (required)
+        workbook = new XSSFWorkbook (new FileInputStream(file));
     }
 
-    public XLSX2CSV(String file, int rowCacheSize, int bufferSize, char delimiter, String endOfLineSymbols) throws FileNotFoundException {
+    public XLSX2CSV(String file, int rowCacheSize, int bufferSize, char delimiter, String endOfLineSymbols) throws IOException {
         InputStream is = new FileInputStream(file);
         SEPARATOR = delimiter;
         ENDOFLINESYMBOLS = endOfLineSymbols;
-        workbook = StreamingReader.builder()
-                .rowCacheSize(rowCacheSize)    // number of rows to keep in memory (defaults to 10)
-                .bufferSize(bufferSize)        // buffer size to use when reading InputStream to file (defaults to 1024)
-                .open(is);                     // InputStream or File for XLSX file (required)
+        workbook = new XSSFWorkbook (new FileInputStream(file));
     }
 
-    public XLSX2CSV(File file, int rowCacheSize, int bufferSize, char delimiter, String endOfLineSymbols) throws FileNotFoundException {
+    public XLSX2CSV(File file, int rowCacheSize, int bufferSize, char delimiter, String endOfLineSymbols) throws IOException {
         InputStream is = new FileInputStream(file);
         SEPARATOR = delimiter;
         ENDOFLINESYMBOLS = endOfLineSymbols;
-        workbook = StreamingReader.builder()
-                .rowCacheSize(rowCacheSize)    // number of rows to keep in memory (defaults to 10)
-                .bufferSize(bufferSize)        // buffer size to use when reading InputStream to file (defaults to 1024)
-                .open(is);                     // InputStream or File for XLSX file (required)
+        workbook = new XSSFWorkbook (new FileInputStream(file));
     }
 
     /**
@@ -110,8 +101,8 @@ private String foreachCell(Sheet sheet, int max) {
             boolean firstCell = true;
             for (int rn = 0; rn < max; rn++) {
                 if ( ! firstCell ) buffer.append(SEPARATOR);
-                if (row.getCell(rn) == null || row.getCell(rn).getStringCellValue().isEmpty()) buffer.append("\"\"");
-                else    buffer.append(encodeValue(row.getCell(rn).getStringCellValue(), SEPARATOR));
+                if (row.getCell(rn) == null || row.getCell(rn).toString().isEmpty()) buffer.append("\"\"");
+                else    buffer.append(encodeValue(row.getCell(rn).toString(), SEPARATOR));
                 firstCell = false;
             }
             buffer.append(ENDOFLINESYMBOLS);