Removed deprecated methods from version 0.3.0

Author: MBenincasa

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

@@ -2,19 +2,7 @@
 
 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.ExcelWorkbook;
 import org.apache.commons.io.FilenameUtils;
-import org.apache.poi.ss.usermodel.Cell;
-import org.apache.poi.ss.usermodel.Row;
-import org.apache.poi.ss.usermodel.Sheet;
-import org.apache.poi.ss.usermodel.Workbook;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
 
 /**
  * {@code ExcelUtility} is the static class with the implementations of some utilities on Excel files
@@ -23,101 +11,6 @@
  */
 public class ExcelUtility {
 
-    /**
-     * Counts all rows in all sheets<p>
-     * If not specified, empty lines will also be included
-     * @deprecated since version 0.3.0
-     * @param file an Excel file
-     * @return A list with the number of rows present for each sheet
-     * @throws ExtensionNotValidException If the input file extension does not belong to an Excel file
-     * @throws IOException If an I/O error occurs
-     * @throws OpenWorkbookException If an error occurred while opening the workbook
-     */
-    @Deprecated
-    public static List<Integer> countAllRowsOfAllSheets(File file) throws ExtensionNotValidException, IOException, OpenWorkbookException {
-        return countAllRowsOfAllSheets(file, true);
-    }
-
-    /**
-     * * Counts all rows in all sheets
-     * @deprecated since version 0.3.0
-     * @param file an Excel file
-     * @param alsoEmptyRows if {@code true} then it will also count rows with all empty cells
-     * @return A list with the number of rows present for each sheet
-     * @throws ExtensionNotValidException If the input file extension does not belong to an Excel file
-     * @throws IOException If an I/O error occurs
-     * @throws OpenWorkbookException If an error occurred while opening the workbook
-     */
-    @Deprecated
-    public static List<Integer> countAllRowsOfAllSheets(File file, Boolean alsoEmptyRows) throws ExtensionNotValidException, IOException, OpenWorkbookException {
-        /* Open file excel */
-        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(file);
-        Workbook workbook = excelWorkbook.getWorkbook();
-
-        List<Integer> values = new LinkedList<>();
-        for (Sheet sheet : workbook) {
-            if (alsoEmptyRows) {
-                values.add(sheet.getLastRowNum() + 1);
-                continue;
-            }
-
-            values.add(countOnlyRowsNotEmpty(sheet));
-        }
-
-        /* Close file */
-        excelWorkbook.close();
-
-        return values;
-    }
-
-    /**
-     * Counts all rows in a sheet<p>
-     * If not specified, empty lines will also be included
-     * @deprecated since version 0.3.0
-     * @param file An Excel file
-     * @param sheetName The name of the sheet to open
-     * @return A number that corresponds to all rows in the sheet
-     * @throws OpenWorkbookException If an error occurred while opening the workbook
-     * @throws SheetNotFoundException If the sheet to open is not found
-     * @throws ExtensionNotValidException If the input file extension does not belong to an Excel file
-     * @throws IOException If an I/O error occurs
-     */
-    @Deprecated
-    public static Integer countAllRows(File file, String sheetName) throws OpenWorkbookException, SheetNotFoundException, ExtensionNotValidException, IOException {
-        return countAllRows(file, sheetName, true);
-    }
-
-    /**
-     * Counts all rows in a sheet
-     * @deprecated since version 0.3.0
-     * @param file An Excel file
-     * @param sheetName The name of the sheet to open
-     * @param alsoEmptyRows if {@code true} then it will also count rows with all empty cells
-     * @return A number that corresponds to all rows in the sheet
-     * @throws OpenWorkbookException If an error occurred while opening the workbook
-     * @throws SheetNotFoundException If the sheet to open is not found
-     * @throws ExtensionNotValidException If the input file extension does not belong to an Excel file
-     * @throws IOException If an I/O error occurs
-     */
-    @Deprecated
-    public static Integer countAllRows(File file, String sheetName, Boolean alsoEmptyRows) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
-        /* Open file excel */
-        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(file);
-        Sheet sheet = (sheetName == null || sheetName.isEmpty())
-                ? excelWorkbook.getSheet(0).getSheet()
-                : excelWorkbook.getSheet(sheetName).getSheet();
-
-        /* Count all rows */
-        int numRows = alsoEmptyRows
-                ? sheet.getLastRowNum() + 1
-                : countOnlyRowsNotEmpty(sheet);
-
-        /* Close file */
-        excelWorkbook.close();
-
-        return numRows;
-    }
-
     /**
      * Check if the extension is that of an Excel file
      * @param filename The name of the file with extension
@@ -140,148 +33,4 @@ public static String checkExcelExtension(String filename) throws ExtensionNotVal
     public static Boolean isValidExcelExtension(String extension) {
         return extension.equalsIgnoreCase(Extension.XLS.getExt()) || extension.equalsIgnoreCase(Extension.XLSX.getExt());
     }
-
-    /**
-     * This method is used to recover the position of the last row of the Sheet. Note the count starts at 1<p>
-     * By default, the first Sheet is chosen
-     * @deprecated since version 0.3.0
-     * @param file file An Excel file
-     * @return The position of the last row of the Sheet
-     * @throws OpenWorkbookException If an error occurred while opening the workbook
-     * @throws SheetNotFoundException If the sheet to open is not found
-     * @throws ExtensionNotValidException If the filename extension does not belong to an Excel file
-     * @throws IOException If an I/O error occurs
-     */
-    @Deprecated
-    public static Integer getIndexLastRow(File file) throws OpenWorkbookException, SheetNotFoundException, ExtensionNotValidException, IOException {
-        return getIndexLastRow(file, null);
-    }
-
-    /**
-     * This method is used to recover the position of the last row of the Sheet. Note the count starts at 1
-     * @deprecated since version 0.3.0
-     * @param file file An Excel file
-     * @param sheetName The name of the sheet to open
-     * @return The position of the last row of the Sheet
-     * @throws OpenWorkbookException If an error occurred while opening the workbook
-     * @throws SheetNotFoundException If the sheet to open is not found
-     * @throws ExtensionNotValidException If the filename extension does not belong to an Excel file
-     * @throws IOException If an I/O error occurs
-     */
-    @Deprecated
-    public static Integer getIndexLastRow(File file, String sheetName) throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetNotFoundException {
-        /* Open file excel */
-        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(file);
-        Sheet sheet = (sheetName == null || sheetName.isEmpty())
-                ? excelWorkbook.getSheet(0).getSheet()
-                : excelWorkbook.getSheet(sheetName).getSheet();
-        return sheet.getLastRowNum() + 1;
-    }
-
-    /**
-     * This method is used to recover the position of the last column of the chosen row. Note that the count starts at 1<p>
-     * By default, the first sheet and the first row are chosen
-     * @deprecated since version 0.3.0
-     * @param file file An Excel file
-     * @return The position of the last column of the chosen row
-     * @throws OpenWorkbookException If an error occurred while opening the workbook
-     * @throws SheetNotFoundException If the sheet to open is not found
-     * @throws ExtensionNotValidException If the filename extension does not belong to an Excel file
-     * @throws IOException If an I/O error occurs
-     */
-    @Deprecated
-    public static Integer getIndexLastColumn(File file) throws OpenWorkbookException, SheetNotFoundException, ExtensionNotValidException, IOException {
-        return getIndexLastColumn(file, null, 0);
-    }
-
-    /**
-     * This method is used to recover the position of the last column of the chosen row. Note that the count starts at 1<p>
-     * By default, the first row is chosen
-     * @deprecated since version 0.3.0
-     * @param file file An Excel file
-     * @param sheetName The name of the sheet to open
-     * @return The position of the last column of the chosen row
-     * @throws OpenWorkbookException If an error occurred while opening the workbook
-     * @throws SheetNotFoundException If the sheet to open is not found
-     * @throws ExtensionNotValidException If the filename extension does not belong to an Excel file
-     * @throws IOException If an I/O error occurs
-     */
-    @Deprecated
-    public static Integer getIndexLastColumn(File file, String sheetName) throws OpenWorkbookException, SheetNotFoundException, ExtensionNotValidException, IOException {
-        return getIndexLastColumn(file, sheetName, 0);
-    }
-
-    /**
-     * This method is used to recover the position of the last column of the chosen row. Note that the count starts at 1<p>
-     * By default, the first sheet is chosen
-     * @deprecated since version 0.3.0
-     * @param file file An Excel file
-     * @param indexRow the row index
-     * @return The position of the last column of the chosen row
-     * @throws OpenWorkbookException If an error occurred while opening the workbook
-     * @throws SheetNotFoundException If the sheet to open is not found
-     * @throws ExtensionNotValidException If the filename extension does not belong to an Excel file
-     * @throws IOException If an I/O error occurs
-     */
-    @Deprecated
-    public static Integer getIndexLastColumn(File file, Integer indexRow) throws OpenWorkbookException, SheetNotFoundException, ExtensionNotValidException, IOException {
-        return getIndexLastColumn(file, null, indexRow);
-    }
-
-    /**
-     * This method is used to recover the position of the last column of the chosen row. Note that the count starts at 1
-     * @deprecated since version 0.3.0
-     * @param file file An Excel file
-     * @param sheetName The name of the sheet to open
-     * @param indexRow the row index
-     * @return The position of the last column of the chosen row
-     * @throws OpenWorkbookException If an error occurred while opening the workbook
-     * @throws SheetNotFoundException If the sheet to open is not found
-     * @throws ExtensionNotValidException If the filename extension does not belong to an Excel file
-     * @throws IOException If an I/O error occurs
-     */
-    @Deprecated
-    public static Integer getIndexLastColumn(File file, String sheetName, Integer indexRow) throws OpenWorkbookException, SheetNotFoundException, ExtensionNotValidException, IOException {
-        /* Open file excel */
-        ExcelWorkbook excelWorkbook = ExcelWorkbook.open(file);
-        Sheet sheet = (sheetName == null || sheetName.isEmpty())
-                ? excelWorkbook.getSheet(0).getSheet()
-                : excelWorkbook.getSheet(sheetName).getSheet();
-        return (int) sheet.getRow(indexRow).getLastCellNum();
-    }
-
-    private static int countOnlyRowsNotEmpty(Sheet sheet) {
-        int numRows = sheet.getLastRowNum() + 1;
-        for (int i = 0; i < sheet.getLastRowNum(); i++) {
-            Row row = sheet.getRow(i);
-            boolean isEmptyRow = true;
-
-            if (row == null) {
-                numRows--;
-                continue;
-            }
-
-            for (int j = 0; j < row.getLastCellNum(); j++) {
-                Cell cell = row.getCell(j);
-                if (cell != null) {
-                    Object val;
-                    switch (cell.getCellType()) {
-                        case NUMERIC -> val = cell.getNumericCellValue();
-                        case BOOLEAN -> val = cell.getBooleanCellValue();
-                        default -> val = cell.getStringCellValue();
-                    }
-                    if (val != null) {
-                        isEmptyRow = false;
-                        break;
-                    }
-                }
-            }
-
-            if (isEmptyRow) {
-                numRows--;
-            }
-        }
-
-        return numRows;
-    }
 }