[poi]: (3.0.0) updated the apache POI version to 5.2.5

Author: millij

README.md

@@ -22,15 +22,15 @@ This library is available in [Maven Central](https://mvnrepository.com/artifact/
 <dependency>
     <groupId>io.github.millij</groupId>
     <artifactId>poi-object-mapper</artifactId>
-    <version>1.0.0</version>
+    <version>3.0.0</version>
 </dependency>
 ```
 
 To install manually, please check the [releases](https://github.com/millij/poi-object-mapper/releases) page for available versions and  change log.
 
 #### Dependencies
 
-The current implementation uses **POI version 4.0.1**.
+The current implementation uses **POI version 5.2.5**.
 
 
 ## Usage
@@ -48,7 +48,7 @@ Consider the below sample spreadsheet, where data of employees is present.
 
 ##### Mapping Rows to a Java Bean
 
-Create a java bean and map its properties to the columns using the `@SheetColumn` annotation. The `@SheetColumn` annotation can be declared on the `Field`, as well as its `Accessor Methods`. Pick any one of them to configure the mapped `Column` as per convenience.    
+Create a java bean and map its properties to the columns using the `@SheetColumn` annotation. The `@SheetColumn` annotation can be declared on the `Field`, as well as its `Accessor Methods`. Pick any one of them to configure the mapped `Column` as per convenience.
 
 ```java
 @Sheet
@@ -68,34 +68,38 @@ public class Employee {
 
 ##### Reading Rows as Java Objects
 
-Once a mapped Java Bean is ready, use a `Reader` to read the file rows as objects. Use `XlsReader` for `.xls` files and `XlsxReader` for `.xlsx` files.
+Once a mapped Java Bean is ready, use a `Reader` to read the file rows as objects.
+
+Use `XlsReader` for `.xls` files and `XlsxReader` for `.xlsx` files.
 
 Reading spreadsheet rows as objects ..
 
 ```java
     ...
     final File xlsxFile = new File("<path_to_file>");
     final XlsReader reader = new XlsReader();
-    List<Employee> employees = reader.read(Employee.class, xlsxFile);
+    final List<Employee> employees = reader.read(Employee.class, xlsxFile);
     ...
 ```
 
 ##### Writing a collection of objects to file
 
-*Currently writing to `.xlsx` files only is supported*
+Similar to `Reader`, the mapped Java Beans can be written to files.
+
+Use `XlsWriter` for `.xls` files and `XlsxWriter` for `.xlsx` files.
 
 ```java
     ...
     // Employees
-    List<Employee> employees = new ArrayList<Employee>();
+    final List<Employee> employees = new ArrayList<>();
     employees.add(new Employee("1", "foo", 12, "MALE", 1.68));
     employees.add(new Employee("2", "bar", null, "MALE", 1.68));
     employees.add(new Employee("3", "foo bar", null, null, null));
-    
+
     // Writer
-    SpreadsheetWriter writer = new SpreadsheetWriter("<output_file_path>");
+    final SpreadsheetWriter writer = new XlsxWriter();
     writer.addSheet(Employee.class, employees);
-    writer.write();
+    writer.write("<output_file_path>");
     ...
 ```
 
@@ -107,7 +111,7 @@ Reading spreadsheet rows as objects ..
 
 The known issues are already listed under [Issues Section](https://github.com/millij/poi-object-mapper/issues).
 
-Please add there your bugs findings, feature requests, enhancements etc. 
+Please add there your bugs findings, feature requests, enhancements etc.
 
 
 

build.gradle

@@ -27,12 +27,11 @@ dependencies {
     implementation group: 'org.slf4j', name: 'slf4j-api', version: '2.0.3'
 
     // Apache Commons
-    implementation group: 'org.apache.commons', name: 'commons-lang3', version: '3.11'
     implementation group: 'commons-beanutils', name: 'commons-beanutils', version: '1.9.4'
 
     // Apache POI
-    implementation group: 'org.apache.poi', name: 'poi', version: '4.1.2'
-    implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '4.1.2'
+    implementation group: 'org.apache.poi', name: 'poi', version: '5.2.5'
+    implementation group: 'org.apache.poi', name: 'poi-ooxml', version: '5.2.5'
 
 
     // Test compile

src/main/java/io/github/millij/poi/ss/handler/AbstractSheetContentsHandler.java

@@ -1,16 +1,16 @@
 package io.github.millij.poi.ss.handler;
 
-import io.github.millij.poi.util.Spreadsheet;
-
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 
-import org.apache.commons.lang3.StringUtils;
 import org.apache.poi.xssf.eventusermodel.XSSFSheetXMLHandler.SheetContentsHandler;
 import org.apache.poi.xssf.usermodel.XSSFComment;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import io.github.millij.poi.util.Spreadsheet;
+
 
 abstract class AbstractSheetContentsHandler implements SheetContentsHandler {
 
@@ -53,12 +53,12 @@ public void endRow(final int rowNum) {
     @Override
     public void cell(final String cellRef, final String cellVal, final XSSFComment comment) {
         // Sanity Checks
-        if (StringUtils.isEmpty(cellRef)) {
+        if (Objects.isNull(cellRef) || cellRef.isBlank()) {
             LOGGER.error("Row[#] {} : Cell reference is empty - {}", currentRow, cellRef);
             return;
         }
 
-        if (StringUtils.isEmpty(cellVal)) {
+        if (Objects.isNull(cellVal) || cellVal.isBlank()) {
             LOGGER.warn("Row[#] {} - Cell[ref] formatted value is empty : {} - {}", currentRow, cellRef, cellVal);
             return;
         }

src/main/java/io/github/millij/poi/ss/reader/XlsReader.java

@@ -203,7 +203,7 @@ private Object getCellValue(final HSSFCell cell) {
 
         // Fetch value by CellType
         final Object cellVal;
-        switch (cell.getCellTypeEnum()) {
+        switch (cell.getCellType()) {
             case STRING:
                 cellVal = cell.getStringCellValue();
                 break;

src/main/java/io/github/millij/poi/util/Spreadsheet.java

@@ -8,7 +8,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -61,10 +60,18 @@ public static String getCellColumnReference(final String cellRef) {
      */
     public static String getSheetName(final Class<?> beanType) {
         final Sheet sheet = beanType.getAnnotation(Sheet.class);
-        String sheetName = sheet != null ? sheet.value() : null;
+        final String sheetName = Objects.isNull(sheet) ? null : sheet.value();
         return sheetName;
     }
 
+    public static String getSheetColumnName(final SheetColumn sheetColumn, final String defaultName) {
+        // Name
+        final String scValue = sheetColumn.value();
+        final String colName = Objects.isNull(scValue) || scValue.isBlank() ? defaultName : scValue;
+
+        return colName;
+    }
+
     /**
      * Prepare {@link Column} def from {@link SheetColumn} annotation info.
      * 
@@ -79,9 +86,8 @@ public static Column asColumn(final SheetColumn sheetCol, final String defaultNa
             return new Column(defaultName);
         }
 
-        // Name
-        final String scVal = sheetCol.value();
-        final String colName = Objects.isNull(scVal) || scVal.isBlank() ? defaultName : scVal;
+        // Column Name
+        final String colName = Spreadsheet.getSheetColumnName(sheetCol, defaultName);
 
         // Prepare Column
         final Column column = new Column();
@@ -166,9 +172,9 @@ public static Map<String, String> asRowDataMap(final Object beanObj, final List<
             }
 
             final String fieldName = f.getName();
+            final SheetColumn sc = f.getAnnotation(SheetColumn.class);
 
-            final SheetColumn ec = f.getAnnotation(SheetColumn.class);
-            final String header = StringUtils.isEmpty(ec.value()) ? fieldName : ec.value();
+            final String header = Spreadsheet.getSheetColumnName(sc, fieldName);
             if (!colHeaders.contains(header)) {
                 continue;
             }
@@ -183,9 +189,9 @@ public static Map<String, String> asRowDataMap(final Object beanObj, final List<
             }
 
             final String fieldName = Beans.getFieldName(m);
+            final SheetColumn sc = m.getAnnotation(SheetColumn.class);
 
-            final SheetColumn ec = m.getAnnotation(SheetColumn.class);
-            final String header = StringUtils.isEmpty(ec.value()) ? fieldName : ec.value();
+            final String header = Spreadsheet.getSheetColumnName(sc, fieldName);
             if (!colHeaders.contains(header)) {
                 continue;
             }
@@ -226,7 +232,7 @@ public static <T> T rowAsBean(Class<T> beanClz, Map<String, Column> propColumnMa
                 // Get the Header Cell Ref
                 final String normalizedColName = Spreadsheet.normalize(propColName);
                 final String propCellRef = headerCellRefsMap.get(normalizedColName);
-                if (StringUtils.isEmpty(propCellRef)) {
+                if (Objects.isNull(propCellRef) || propCellRef.isBlank()) {
                     LOGGER.debug("{} :: No Cell Ref found [Prop - Col] : [{} - {}]", beanClz, propName, propColName);
                     continue;
                 }
@@ -272,7 +278,7 @@ private static boolean validateRowData(final Map<String, Object> rowDataMap,
             final String propCellRef = headerCellRefsMap.containsKey(propColName) //
                     ? headerCellRefsMap.get(propColName) //
                     : headerCellRefsMap.get(normalizedColName);
-            if (StringUtils.isEmpty(propCellRef)) {
+            if (Objects.isNull(propCellRef) || propCellRef.isBlank()) {
                 continue;
             }