Repetitive checks and repetitive code have been removed

MBenincasa · MBenincasa · commit 3fd86f9bb847 · 2023-01-26T20:08:45.000+01:00
diff --git a/src/main/java/tools/Converter.java b/src/main/java/tools/Converter.java
@@ -319,15 +319,11 @@ public static List<?> excelToObjects(File file, Class<?> clazz) throws Extension
      * @throws HeaderNotPresentException If the first row is empty and does not contain the header
      */
     public static List<?> excelToObjects(File file, Class<?> clazz, String sheetName) throws ExtensionNotValidException, IOException, OpenWorkbookException, InvocationTargetException, IllegalAccessException, NoSuchMethodException, InstantiationException, SheetNotFoundException, HeaderNotPresentException {
-        /* Check extension */
-        String extension = ExcelUtility.checkExcelExtension(file.getName());
-
         /* Open file excel */
-        FileInputStream fileInputStream = new FileInputStream(file);
-        Workbook workbook = WorkbookUtility.open(fileInputStream, extension);
+        Workbook workbook = WorkbookUtility.open(file);
         Sheet sheet = (sheetName == null || sheetName.isEmpty())
-                ? SheetUtility.open(workbook)
-                : SheetUtility.open(workbook, sheetName);
+                ? SheetUtility.get(workbook)
+                : SheetUtility.get(workbook, sheetName);
 
         /* Retrieving header names */
         Field[] fields = clazz.getDeclaredFields();
@@ -346,7 +342,7 @@ public static List<?> excelToObjects(File file, Class<?> clazz, String sheetName
         }
 
         /* Close file */
-        WorkbookUtility.close(workbook, fileInputStream);
+        WorkbookUtility.close(workbook);
 
         return resultList;
     }
@@ -413,15 +409,11 @@ public static File excelToCsv(File fileInput, String path, String filename) thro
      * @throws IOException If an I/O error has occurred
      */
     public static File excelToCsv(File fileInput, String path, String filename, String sheetName) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException, FileAlreadyExistsException {
-        /* Check extension */
-        String extension = ExcelUtility.checkExcelExtension(fileInput.getName());
-
         /* Open file excel */
-        FileInputStream fileInputStream = new FileInputStream(fileInput);
-        Workbook workbook = WorkbookUtility.open(fileInputStream, extension);
+        Workbook workbook = WorkbookUtility.open(fileInput);
         Sheet sheet = (sheetName == null || sheetName.isEmpty())
-                ? SheetUtility.open(workbook)
-                : SheetUtility.open(workbook, sheetName);
+                ? SheetUtility.get(workbook)
+                : SheetUtility.get(workbook, sheetName);
 
         /* Create output file */
         String pathname = getPathname(path, filename, Extension.CSV.getExt());
@@ -445,7 +437,7 @@ public static File excelToCsv(File fileInput, String path, String filename, Stri
         }
 
         /* Close file */
-        WorkbookUtility.close(workbook, fileInputStream, csvWriter);
+        WorkbookUtility.close(workbook, csvWriter);
 
         return csvFile;
     }
diff --git a/src/main/java/tools/ExcelUtility.java b/src/main/java/tools/ExcelUtility.java
@@ -46,12 +46,8 @@ public static List<Integer> countAllRowsOfAllSheets(File file) throws ExtensionN
      * @throws OpenWorkbookException If an error occurred while opening the workbook
      */
     public static List<Integer> countAllRowsOfAllSheets(File file, Boolean alsoEmptyRows) throws ExtensionNotValidException, IOException, OpenWorkbookException {
-        /* Check extension */
-        String extension = checkExcelExtension(file.getName());
-
         /* Open file excel */
-        FileInputStream fileInputStream = new FileInputStream(file);
-        Workbook workbook = WorkbookUtility.open(fileInputStream, extension);
+        Workbook workbook = WorkbookUtility.open(file);
 
         List<Integer> values = new LinkedList<>();
         for (Sheet sheet : workbook) {
@@ -64,7 +60,7 @@ public static List<Integer> countAllRowsOfAllSheets(File file, Boolean alsoEmpty
         }
 
         /* Close file */
-        WorkbookUtility.close(workbook, fileInputStream);
+        WorkbookUtility.close(workbook);
 
         return values;
     }
@@ -96,23 +92,19 @@ public static Integer countAllRows(File file, String sheetName) throws OpenWorkb
      * @throws IOException If an I/O error occurs
      */
     public static Integer countAllRows(File file, String sheetName, Boolean alsoEmptyRows) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
-        /* Check extension */
-        String extension = checkExcelExtension(file.getName());
-
         /* Open file excel */
-        FileInputStream fileInputStream = new FileInputStream(file);
-        Workbook workbook = WorkbookUtility.open(fileInputStream, extension);
+        Workbook workbook = WorkbookUtility.open(file);
         Sheet sheet = (sheetName == null || sheetName.isEmpty())
-                ? SheetUtility.open(workbook)
-                : SheetUtility.open(workbook, sheetName);
+                ? SheetUtility.get(workbook)
+                : SheetUtility.get(workbook, sheetName);
 
         /* Count all rows */
         int numRows = alsoEmptyRows
                 ? sheet.getLastRowNum() + 1
                 : countOnlyRowsNotEmpty(sheet);
 
         /* Close file */
-        WorkbookUtility.close(workbook, fileInputStream);
+        WorkbookUtility.close(workbook);
 
         return numRows;
     }
@@ -165,7 +157,7 @@ public static Integer getIndexLastRow(File file) throws OpenWorkbookException, S
      * @throws IOException If an I/O error occurs
      */
     public static Integer getIndexLastRow(File file, String sheetName) throws OpenWorkbookException, ExtensionNotValidException, IOException, SheetNotFoundException {
-        Sheet sheet = (sheetName == null || sheetName.isEmpty()) ? SheetUtility.open(file) : SheetUtility.open(file, sheetName);
+        Sheet sheet = (sheetName == null || sheetName.isEmpty()) ? SheetUtility.get(file) : SheetUtility.get(file, sheetName);
         return sheet.getLastRowNum() + 1;
     }
 
@@ -225,7 +217,7 @@ public static Integer getIndexLastColumn(File file, Integer indexRow) throws Ope
      * @throws IOException If an I/O error occurs
      */
     public static Integer getIndexLastColumn(File file, String sheetName, Integer indexRow) throws OpenWorkbookException, SheetNotFoundException, ExtensionNotValidException, IOException {
-        Sheet sheet = (sheetName == null || sheetName.isEmpty()) ? SheetUtility.open(file) : SheetUtility.open(file, sheetName);
+        Sheet sheet = (sheetName == null || sheetName.isEmpty()) ? SheetUtility.get(file) : SheetUtility.get(file, sheetName);
         return (int) sheet.getRow(indexRow).getLastCellNum();
     }
 
diff --git a/src/main/java/tools/SheetUtility.java b/src/main/java/tools/SheetUtility.java
@@ -29,17 +29,13 @@ public class SheetUtility {
      * @throws OpenWorkbookException If an error occurred while opening the workbook
      */
     public static Integer length(File file) throws ExtensionNotValidException, IOException, OpenWorkbookException {
-        /* Check extension */
-        String extension = ExcelUtility.checkExcelExtension(file.getName());
-
         /* Open file excel */
-        FileInputStream fileInputStream = new FileInputStream(file);
-        Workbook workbook = WorkbookUtility.open(fileInputStream, extension);
+        Workbook workbook = WorkbookUtility.open(file);
 
         Integer totalSheets = workbook.getNumberOfSheets();
 
         /* Close file */
-        WorkbookUtility.close(workbook, fileInputStream);
+        WorkbookUtility.close(workbook);
 
         return totalSheets;
     }
@@ -53,12 +49,8 @@ public static Integer length(File file) throws ExtensionNotValidException, IOExc
      * @throws OpenWorkbookException If an error occurred while opening the workbook
      */
     public static List<String> getNames(File file) throws ExtensionNotValidException, IOException, OpenWorkbookException {
-        /* Check extension */
-        String extension = ExcelUtility.checkExcelExtension(file.getName());
-
         /* Open file excel */
-        FileInputStream fileInputStream = new FileInputStream(file);
-        Workbook workbook = WorkbookUtility.open(fileInputStream, extension);
+        Workbook workbook = WorkbookUtility.open(file);
 
         /* Iterate all the sheets */
         Iterator<Sheet> sheetIterator = workbook.iterator();
@@ -69,7 +61,7 @@ public static List<String> getNames(File file) throws ExtensionNotValidException
         }
 
         /* Close file */
-        WorkbookUtility.close(workbook, fileInputStream);
+        WorkbookUtility.close(workbook);
 
         return sheetNames;
     }
@@ -85,17 +77,13 @@ public static List<String> getNames(File file) throws ExtensionNotValidException
      * @throws SheetNotFoundException If the sheet to open is not found
      */
     public static Integer getIndex(File file, String sheetName) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
-        /* Check extension */
-        String extension = ExcelUtility.checkExcelExtension(file.getName());
-
         /* Open file excel */
-        FileInputStream fileInputStream = new FileInputStream(file);
-        Workbook workbook = WorkbookUtility.open(fileInputStream, extension);
+        Workbook workbook = WorkbookUtility.open(file);
 
         int sheetIndex = workbook.getSheetIndex(sheetName);
 
         /* Close file */
-        WorkbookUtility.close(workbook, fileInputStream);
+        WorkbookUtility.close(workbook);
 
         if (sheetIndex < 0) {
             throw new SheetNotFoundException("No sheet was found");
@@ -114,12 +102,8 @@ public static Integer getIndex(File file, String sheetName) throws ExtensionNotV
      * @throws SheetNotFoundException If the sheet to open is not found
      */
     public static String getName(File file, Integer position) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
-        /* Check extension */
-        String extension = ExcelUtility.checkExcelExtension(file.getName());
-
         /* Open file excel */
-        FileInputStream fileInputStream = new FileInputStream(file);
-        Workbook workbook = WorkbookUtility.open(fileInputStream, extension);
+        Workbook workbook = WorkbookUtility.open(file);
 
         String sheetName;
         try {
@@ -129,7 +113,7 @@ public static String getName(File file, Integer position) throws ExtensionNotVal
         }
 
         /* Close file */
-        WorkbookUtility.close(workbook, fileInputStream);
+        WorkbookUtility.close(workbook);
 
         return sheetName;
     }
@@ -187,7 +171,7 @@ public static Sheet create(Workbook workbook, String sheetName) {
     }
 
     /**
-     * Opens the sheet of the Excel file<p>
+     * Gets the sheet of the Excel file<p>
      * If not specified, the first sheet will be opened
      * @param file Excel file
      * @return The sheet in the workbook
@@ -196,12 +180,12 @@ public static Sheet create(Workbook workbook, String sheetName) {
      * @throws OpenWorkbookException If an error occurred while opening the workbook
      * @throws SheetNotFoundException If the sheet to open is not found
      */
-    public static Sheet open(File file) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
-        return open(file, 0);
+    public static Sheet get(File file) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
+        return get(file, 0);
     }
 
     /**
-     * Opens the sheet of the Excel file
+     * Gets the sheet of the Excel file
      * @param file Excel file
      * @param sheetName The sheet name in the workbook
      * @return The sheet in the workbook
@@ -210,27 +194,23 @@ public static Sheet open(File file) throws ExtensionNotValidException, IOExcepti
      * @throws OpenWorkbookException If an error occurred while opening the workbook
      * @throws SheetNotFoundException If the sheet to open is not found
      */
-    public static Sheet open(File file, String sheetName) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
-        /* Check extension */
-        String extension = ExcelUtility.checkExcelExtension(file.getName());
-
+    public static Sheet get(File file, String sheetName) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
         /* Open file excel */
-        FileInputStream fileInputStream = new FileInputStream(file);
-        Workbook workbook = WorkbookUtility.open(fileInputStream, extension);
+        Workbook workbook = WorkbookUtility.open(file);
 
         /* Open sheet */
         Sheet sheet = workbook.getSheet(sheetName);
         if (sheet == null)
             throw new SheetNotFoundException();
 
         /* Close workbook */
-        WorkbookUtility.close(workbook, fileInputStream);
+        WorkbookUtility.close(workbook);
 
         return sheet;
     }
 
     /**
-     * Opens the sheet of the Excel file
+     * Gets the sheet of the Excel file
      * @param file Excel file
      * @param position The index in the workbook
      * @return The sheet in the workbook
@@ -239,44 +219,40 @@ public static Sheet open(File file, String sheetName) throws ExtensionNotValidEx
      * @throws OpenWorkbookException If an error occurred while opening the workbook
      * @throws SheetNotFoundException If the sheet to open is not found
      */
-    public static Sheet open(File file, Integer position) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
-        /* Check extension */
-        String extension = ExcelUtility.checkExcelExtension(file.getName());
-
+    public static Sheet get(File file, Integer position) throws ExtensionNotValidException, IOException, OpenWorkbookException, SheetNotFoundException {
         /* Open file excel */
-        FileInputStream fileInputStream = new FileInputStream(file);
-        Workbook workbook = WorkbookUtility.open(fileInputStream, extension);
+        Workbook workbook = WorkbookUtility.open(file);
 
         /* Open sheet */
         Sheet sheet = workbook.getSheetAt(position);
         if (sheet == null)
             throw new SheetNotFoundException();
 
         /* Close workbook */
-        WorkbookUtility.close(workbook, fileInputStream);
+        WorkbookUtility.close(workbook);
 
         return sheet;
     }
 
     /**
-     * Opens the sheet in the workbook.<p>
+     * Gets the sheet in the workbook.<p>
      * If not specified, the first sheet will be opened
      * @param workbook The {@code Workbook} where there is the sheet
      * @return The sheet in the workbook in first position
      * @throws SheetNotFoundException If the sheet to open is not found
      */
-    public static Sheet open(Workbook workbook) throws SheetNotFoundException {
-        return open(workbook, 0);
+    public static Sheet get(Workbook workbook) throws SheetNotFoundException {
+        return get(workbook, 0);
     }
 
     /**
-     * Opens the sheet in the workbook.
+     * Gets the sheet in the workbook.
      * @param workbook The {@code Workbook} where there is the sheet
      * @param sheetName The sheet name in the workbook
      * @return The sheet in the workbook
      * @throws SheetNotFoundException If the sheet to open is not found
      */
-    public static Sheet open(Workbook workbook, String sheetName) throws SheetNotFoundException {
+    public static Sheet get(Workbook workbook, String sheetName) throws SheetNotFoundException {
         /* Open sheet */
         Sheet sheet = workbook.getSheet(sheetName);
         if (sheet == null)
@@ -285,13 +261,13 @@ public static Sheet open(Workbook workbook, String sheetName) throws SheetNotFou
     }
 
     /**
-     * Opens the sheet in the workbook.
+     * Gets the sheet in the workbook.
      * @param workbook The {@code Workbook} where there is the sheet
      * @param position The index in the workbook
      * @return The sheet in the workbook
      * @throws SheetNotFoundException If the sheet to open is not found
      */
-    public static Sheet open(Workbook workbook, Integer position) throws SheetNotFoundException {
+    public static Sheet get(Workbook workbook, Integer position) throws SheetNotFoundException {
         /* Open sheet */
         Sheet sheet = workbook.getSheetAt(position);
         if (sheet == null)
@@ -300,12 +276,12 @@ public static Sheet open(Workbook workbook, Integer position) throws SheetNotFou
     }
 
     /**
-     * Opens the sheet in the workbook. If it doesn't find it, it creates it.
+     * Gets the sheet in the workbook. If it doesn't find it, it creates it.
      * @param workbook The {@code Workbook} where there is the sheet
      * @param sheetName The sheet name in the workbook
      * @return The sheet in the workbook or a new one
      */
-    public static Sheet openOrCreate(Workbook workbook, String sheetName) {
+    public static Sheet getOrCreate(Workbook workbook, String sheetName) {
         /* Open sheet */
         Sheet sheet = workbook.getSheet(sheetName);
         return sheet == null ? workbook.createSheet(sheetName) : sheet;
diff --git a/src/main/java/tools/WorkbookUtility.java b/src/main/java/tools/WorkbookUtility.java
@@ -155,13 +155,11 @@ public static void close(Workbook workbook, FileOutputStream fileOutputStream, F
     /**
      * Close a workbook
      * @param workbook The {@code Workbook} to close
-     * @param fileInputStream The {@code FileInputStream} to close
      * @param writer The {@code CSVWriter} to close
      * @throws IOException If an I/O error has occurred
      */
-    public static void close(Workbook workbook, FileInputStream fileInputStream, CSVWriter writer) throws IOException {
+    public static void close(Workbook workbook, CSVWriter writer) throws IOException {
         workbook.close();
-        fileInputStream.close();
         writer.close();
     }
 
