Added new methods to convert CSV to Excel

Author: MBenincasa

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

@@ -9,14 +9,12 @@ public class Main {
 
     public static void main(String[] args) {
 
-        File csvFile = new File("./src/main/resources/employee.csv");
-        File csvFile2 = new File("./src/main/resources/employee_2.csv");
+        File csvFile = new File("./src/main/resources/Employee.csv");
 
         try {
             System.out.println("Start the conversion...");
-            File excelFile = Converter.csvToExcel(csvFile, "./src/main/resources/", "employee_2", Extension.XLSX);
-            System.out.println("First conversion completed...");
-            Converter.csvToExistingExcel(excelFile, csvFile2);
+            File excelFile = Converter.csvToExcelFile(csvFile, "Employee", "./src/main/resources/employee_2", Extension.XLSX);
+            System.out.println("... completed");
             System.out.println("The file is ready. Path: " + excelFile.getAbsolutePath());
         } catch (Exception e) {
             System.err.println("There was an error. Check the console");

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

@@ -752,6 +752,8 @@ public static Map<String, OutputStream> excelToCsvStream(InputStream excelStream
         /* Iterate all the Sheets */
         for (ExcelSheet excelSheet : excelSheets) {
             OutputStream outputStream = new ByteArrayOutputStream();
+
+            /* Open CSV Writer */
             Writer writer = new OutputStreamWriter(outputStream);
             CSVWriter csvWriter = new CSVWriter(writer);
 
@@ -776,20 +778,23 @@ public static Map<String, OutputStream> excelToCsvStream(InputStream excelStream
     /**
      * Convert a CSV file into an Excel file<p>
      * The default path is that of the temporary folder. By default, the filename will be the same as the input file if not specified and the extension is XLSX
+     * @deprecated since version 0.4.0
      * @param fileInput The input CSV file that will be converted into an Excel file
      * @return An Excel file that contains the same lines as the CSV file
      * @throws FileAlreadyExistsException If the destination file already exists
      * @throws CsvValidationException If the CSV file has invalid formatting
      * @throws ExtensionNotValidException If the input file extension does not belong to a CSV file
      * @throws IOException If an I/O error has occurred
      */
+    @Deprecated
     public static File csvToExcel(File fileInput) throws FileAlreadyExistsException, CsvValidationException, ExtensionNotValidException, IOException {
         return csvToExcel(fileInput, System.getProperty("java.io.tmpdir"), fileInput.getName().split("\\.")[0].trim(), Extension.XLSX);
     }
 
     /**
      * Convert a CSV file into an Excel file<p>
      * The default path is that of the temporary folder. By default, the extension is XLSX
+     * @deprecated since version 0.4.0
      * @param fileInput The input CSV file that will be converted into an Excel file
      * @param filename The name of the output file without the extension
      * @return An Excel file that contains the same lines as the CSV file
@@ -798,13 +803,15 @@ public static File csvToExcel(File fileInput) throws FileAlreadyExistsException,
      * @throws ExtensionNotValidException If the input file extension does not belong to a CSV file
      * @throws IOException If an I/O error has occurred
      */
+    @Deprecated
     public static File csvToExcel(File fileInput, String filename) throws FileAlreadyExistsException, CsvValidationException, ExtensionNotValidException, IOException {
         return csvToExcel(fileInput, System.getProperty("java.io.tmpdir"), filename, Extension.XLSX);
     }
 
     /**
      * Convert a CSV file into an Excel file<p>
      * By default, the extension is XLSX
+     * @deprecated since version 0.4.0
      * @param fileInput The input CSV file that will be converted into an Excel file
      * @param path The destination path of the output file
      * @param filename The name of the output file without the extension
@@ -814,12 +821,14 @@ public static File csvToExcel(File fileInput, String filename) throws FileAlread
      * @throws ExtensionNotValidException If the input file extension does not belong to a CSV file
      * @throws IOException If an I/O error has occurred
      */
+    @Deprecated
     public static File csvToExcel(File fileInput, String path, String filename) throws FileAlreadyExistsException, CsvValidationException, ExtensionNotValidException, IOException {
         return csvToExcel(fileInput, path, filename, Extension.XLSX);
     }
 
     /**
      * Convert a CSV file into an Excel file
+     * @deprecated since version 0.4.0
      * @param fileInput The input CSV file that will be converted into an Excel file
      * @param path The destination path of the output file
      * @param filename The name of the output file without the extension
@@ -830,6 +839,7 @@ public static File csvToExcel(File fileInput, String path, String filename) thro
      * @throws ExtensionNotValidException If the input file extension does not belong to a CSV file
      * @throws IOException If an I/O error has occurred
      */
+    @Deprecated
     public static File csvToExcel(File fileInput, String path, String filename, Extension extension) throws IOException, ExtensionNotValidException, CsvValidationException, FileAlreadyExistsException {
         /* Check exension */
         String csvExt = FilenameUtils.getExtension(fileInput.getName());
@@ -862,8 +872,61 @@ public static File csvToExcel(File fileInput, String path, String filename, Exte
         return outputFile;
     }
 
+    public static byte[] csvToExcelByte(byte[] bytes, String sheetName, Extension extension) throws CsvValidationException, ExtensionNotValidException, IOException {
+        InputStream inputStream = new ByteArrayInputStream(bytes);
+        ByteArrayOutputStream baos = (ByteArrayOutputStream) csvToExcelStream(inputStream, sheetName, extension);
+        return baos.toByteArray();
+    }
+
+    public static File csvToExcelFile(File fileInput, String sheetName, String pathname, Extension extension) throws IOException, CsvValidationException, ExtensionNotValidException {
+        InputStream inputStream = new FileInputStream(fileInput);
+        ByteArrayOutputStream baos = (ByteArrayOutputStream) csvToExcelStream(inputStream, sheetName, extension);
+        pathname = pathname + "." + extension.getExt();
+        FileOutputStream fileOutputStream = new FileOutputStream(pathname);
+        fileOutputStream.write(baos.toByteArray());
+        File file = new File(pathname);
+        fileOutputStream.close();
+
+        return file;
+    }
+
+    public static OutputStream csvToExcelStream(InputStream inputStream, String sheetName, Extension extension) throws ExtensionNotValidException, CsvValidationException, IOException {
+        /* Check the extension */
+        if (!ExcelUtility.isValidExcelExtension(extension.getExt())) {
+            throw new ExtensionNotValidException("Pass a file with the XLS or XLSX extension");
+        }
+
+        /* Open CSV Reader */
+        Reader reader = new InputStreamReader(inputStream);
+        CSVReader csvReader = new CSVReader(reader);
+
+        ExcelWorkbook excelWorkbook = new ExcelWorkbook(extension);
+        ExcelSheet excelSheet = excelWorkbook.createSheet(sheetName);
+
+        /* Read CSV file */
+        String[] values;
+        int cRow = 0;
+        while ((values = csvReader.readNext()) != null) {
+            ExcelRow excelRow = excelSheet.createRow(cRow);
+            for (int j = 0; j < values.length; j++) {
+                ExcelCell excelCell = excelRow.createCell(j);
+                excelCell.writeValue(values[j]);
+                excelSheet.getSheet().autoSizeColumn(j);
+            }
+            cRow++;
+        }
+
+        /* Write and close the Workbook */
+        OutputStream outputStream = new ByteArrayOutputStream();
+        excelWorkbook.writeAndClose(outputStream);
+        csvReader.close();
+
+        return outputStream;
+    }
+
     /**
      * Convert the CSV file into a new sheet of an existing File.
+     * @deprecated since version 0.4.0
      * @param fileOutput The {@code File} to update
      * @param fileInput The input CSV file that will be converted into an Excel file
      * @throws OpenWorkbookException If an error occurred while opening the workbook
@@ -872,6 +935,7 @@ public static File csvToExcel(File fileInput, String path, String filename, Exte
      * @throws CsvValidationException If the CSV file has invalid formatting
      * @since 0.2.1
      */
+    @Deprecated
     public static void csvToExistingExcel(File fileOutput, File fileInput) throws OpenWorkbookException, ExtensionNotValidException, IOException, CsvValidationException {
         /* Open workbook */
         ExcelWorkbook excelWorkbook = ExcelWorkbook.open(fileOutput);
@@ -888,6 +952,7 @@ public static void csvToExistingExcel(File fileOutput, File fileInput) throws Op
 
     /**
      * Writes the data present in the CSVReader to a new sheet of an existing File.
+     * @deprecated since version 0.4.0
      * @param fileOutput The {@code File} to update
      * @param csvReader The {@code CSVReader} of the CSV input file
      * @throws OpenWorkbookException If an error occurred while opening the workbook
@@ -896,6 +961,7 @@ public static void csvToExistingExcel(File fileOutput, File fileInput) throws Op
      * @throws CsvValidationException If the CSV file has invalid formatting
      * @since 0.2.1
      */
+    @Deprecated
     public static void csvToExistingExcel(File fileOutput, CSVReader csvReader) throws OpenWorkbookException, ExtensionNotValidException, IOException, CsvValidationException {
         /* Open workbook */
         ExcelWorkbook excelWorkbook = ExcelWorkbook.open(fileOutput);
@@ -913,12 +979,14 @@ public static void csvToExistingExcel(File fileOutput, CSVReader csvReader) thro
     /**
      * Convert the CSV file into a new sheet of an existing Workbook.<p>
      * Note: This method does not call the "write" method of the workbook.
+     * @deprecated since version 0.4.0
      * @param workbook The {@code Workbook} to update
      * @param fileInput The input CSV file that will be converted into an Excel file
      * @throws IOException If an I/O error has occurred
      * @throws CsvValidationException If the CSV file has invalid formatting
      * @throws ExtensionNotValidException If the input file extension does not belong to a CSV file
      */
+    @Deprecated
     public static void csvToExistingExcel(Workbook workbook, File fileInput) throws IOException, CsvValidationException, ExtensionNotValidException {
         /* Check exension */
         String csvExt = FilenameUtils.getExtension(fileInput.getName());
@@ -936,11 +1004,13 @@ public static void csvToExistingExcel(Workbook workbook, File fileInput) throws
     /**
      * Writes the data present in the CSVReader to a new sheet of an existing Workbook.<p>
      * Note: This method does not call the "write" method of the workbook.
+     * @deprecated since version 0.4.0
      * @param workbook The {@code Workbook} to update
      * @param csvReader The {@code CSVReader} of the CSV input file
      * @throws CsvValidationException If the CSV file has invalid formatting
      * @throws IOException If an I/O error has occurred
      */
+    @Deprecated
     public static void csvToExistingExcel(Workbook workbook, CSVReader csvReader) throws CsvValidationException, IOException {
         ExcelWorkbook excelWorkbook = new ExcelWorkbook(workbook);
         ExcelSheet excelSheet = excelWorkbook.createSheet();

src/test/java/io/github/mbenincasa/javaexcelutils/tools/ConverterTest.java

@@ -668,4 +668,65 @@ void excelToCsvStream() throws IOException, OpenWorkbookException, CsvValidation
         csvFile.delete();
         fileInputStream.close();
     }
+
+    @Test
+    void csvToExcelByte() throws IOException, CsvValidationException, ExtensionNotValidException, OpenWorkbookException, SheetNotFoundException {
+        byte[] bytes = Files.readAllBytes(csvFile.toPath());
+        byte[] bytesResult = Converter.csvToExcelByte(bytes, "Test", Extension.XLSX);
+        File excelFile = new File("./test.xlsx");
+        FileOutputStream fileOutputStream = new FileOutputStream(excelFile);
+        fileOutputStream.write(bytesResult);
+        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
+        ExcelSheet excelSheet = excelWorkbook.getSheet("Test");
+        ExcelRow excelRow = excelSheet.getRows().get(0);
+        Row row = excelRow.getRow();
+        Assertions.assertEquals("LAST NAME", row.getCell(0).getStringCellValue());
+        Assertions.assertEquals("NAME", row.getCell(1).getStringCellValue());
+        Assertions.assertEquals("AGE", row.getCell(2).getStringCellValue());
+        row = excelSheet.getRows().get(1).getRow();
+        Assertions.assertEquals("Rossi", row.getCell(0).getStringCellValue());
+        Assertions.assertEquals("Mario", row.getCell(1).getStringCellValue());
+        Assertions.assertEquals("20", row.getCell(2).getStringCellValue());
+        fileOutputStream.close();
+        excelFile.delete();
+    }
+
+    @Test
+    void csvToExcelFile() throws CsvValidationException, ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
+        File excelFile = Converter.csvToExcelFile(csvFile, "Test", "./test", Extension.XLSX);
+        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
+        ExcelSheet excelSheet = excelWorkbook.getSheet("Test");
+        ExcelRow excelRow = excelSheet.getRows().get(0);
+        Row row = excelRow.getRow();
+        Assertions.assertEquals("LAST NAME", row.getCell(0).getStringCellValue());
+        Assertions.assertEquals("NAME", row.getCell(1).getStringCellValue());
+        Assertions.assertEquals("AGE", row.getCell(2).getStringCellValue());
+        row = excelSheet.getRows().get(1).getRow();
+        Assertions.assertEquals("Rossi", row.getCell(0).getStringCellValue());
+        Assertions.assertEquals("Mario", row.getCell(1).getStringCellValue());
+        Assertions.assertEquals("20", row.getCell(2).getStringCellValue());
+        excelFile.delete();
+    }
+
+    @Test
+    void csvToExcelStream() throws IOException, CsvValidationException, ExtensionNotValidException, OpenWorkbookException, SheetNotFoundException {
+        FileInputStream fileInputStream = new FileInputStream(csvFile);
+        ByteArrayOutputStream baos = (ByteArrayOutputStream) Converter.csvToExcelStream(fileInputStream, "Test", Extension.XLSX);
+        FileOutputStream fileOutputStream = new FileOutputStream("./test.xlsx");
+        fileOutputStream.write(baos.toByteArray());
+        File excelFile = new File("./test.xlsx");
+        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(excelFile);
+        ExcelSheet excelSheet = excelWorkbook.getSheet("Test");
+        ExcelRow excelRow = excelSheet.getRows().get(0);
+        Row row = excelRow.getRow();
+        Assertions.assertEquals("LAST NAME", row.getCell(0).getStringCellValue());
+        Assertions.assertEquals("NAME", row.getCell(1).getStringCellValue());
+        Assertions.assertEquals("AGE", row.getCell(2).getStringCellValue());
+        row = excelSheet.getRows().get(1).getRow();
+        Assertions.assertEquals("Rossi", row.getCell(0).getStringCellValue());
+        Assertions.assertEquals("Mario", row.getCell(1).getStringCellValue());
+        Assertions.assertEquals("20", row.getCell(2).getStringCellValue());
+        fileOutputStream.close();
+        excelFile.delete();
+    }
 }