[util]: refactored blank String checks with Strings.isBlank util

Author: millij

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

@@ -2,14 +2,14 @@
 
 import java.util.HashMap;
 import java.util.Map;
-import java.util.Objects;
 
 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;
+import io.github.millij.poi.util.Strings;
 
 
 abstract class AbstractSheetContentsHandler implements SheetContentsHandler {
@@ -30,7 +30,6 @@ abstract class AbstractSheetContentsHandler implements SheetContentsHandler {
     abstract void afterRowEnd(int rowNum, Map<String, Object> rowObj);
 
 
-
     // SheetContentsHandler Implementations
     // ------------------------------------------------------------------------
 
@@ -53,12 +52,12 @@ public void endRow(final int rowNum) {
     @Override
     public void cell(final String cellRef, final String cellVal, final XSSFComment comment) {
         // Sanity Checks
-        if (Objects.isNull(cellRef) || cellRef.isBlank()) {
+        if (Strings.isBlank(cellRef)) {
             LOGGER.error("Row[#] {} : Cell reference is empty - {}", currentRow, cellRef);
             return;
         }
 
-        if (Objects.isNull(cellVal) || cellVal.isBlank()) {
+        if (Strings.isBlank(cellVal)) {
             LOGGER.warn("Row[#] {} - Cell[ref] formatted value is empty : {} - {}", currentRow, cellRef, cellVal);
             return;
         }

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

@@ -179,7 +179,7 @@ protected void processSheet(final HSSFSheet sheet, final RowListener<Map<String,
             }
 
             final Map<String, Object> rowDataMap = this.extractRowDataAsMap(row);
-            if (rowDataMap == null || rowDataMap.isEmpty()) {
+            if (Objects.isNull(rowDataMap) || rowDataMap.isEmpty()) {
                 continue;
             }
 
@@ -209,7 +209,7 @@ protected <T> void processSheet(final Class<T> beanClz, final HSSFSheet sheet, f
             }
 
             final Map<String, Object> rowDataMap = this.extractRowDataAsMap(row);
-            if (rowDataMap == null || rowDataMap.isEmpty()) {
+            if (Objects.isNull(rowDataMap) || rowDataMap.isEmpty()) {
                 continue;
             }
 

src/main/java/io/github/millij/poi/ss/writer/AbstractSpreadsheetWriter.java

@@ -21,6 +21,7 @@
 
 import io.github.millij.poi.ss.model.Column;
 import io.github.millij.poi.util.Spreadsheet;
+import io.github.millij.poi.util.Strings;
 
 
 /**
@@ -77,7 +78,7 @@ public <T> void addSheet(final Class<T> beanType, final List<T> rowObjects, fina
             }
 
             // Create sheet
-            final Sheet sheet = Objects.isNull(sheetName) || sheetName.isBlank() //
+            final Sheet sheet = Strings.isBlank(sheetName) //
                     ? workbook.createSheet() //
                     : workbook.createSheet(sheetName);
             LOGGER.debug("Added new Sheet[name] to the workbook : {}", sheet.getSheetName());
@@ -128,7 +129,7 @@ public void addSheet(final String inSheetName, final List<String> inHeaders,
             }
 
             // Create sheet
-            final Sheet sheet = Objects.isNull(inSheetName) || inSheetName.isBlank() //
+            final Sheet sheet = Strings.isBlank(inSheetName) //
                     ? workbook.createSheet() //
                     : workbook.createSheet(inSheetName);
             LOGGER.debug("Added new Sheet[name] to the workbook : {}", sheet.getSheetName());

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

@@ -210,7 +210,7 @@ public static void setProperty(final Object target, final String propName, final
     private static void setDateTimeProperty(final Object target, final String propName, final Class<?> propType,
             final Object propValue, final String format, final DateTimeType dateTimeType) throws Exception {
         // Input value Format
-        final String dateFormatStr = Objects.isNull(format) || format.isBlank() ? "dd/MM/yyyy" : format;
+        final String dateFormatStr = Strings.isBlank(format) ? "dd/MM/yyyy" : format;
 
         // Parse
         final SimpleDateFormat dateFmt = new SimpleDateFormat(dateFormatStr);

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

@@ -67,7 +67,7 @@ public static String getSheetName(final Class<?> beanType) {
     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;
+        final String colName = Strings.isBlank(scValue) ? defaultName : scValue;
 
         return colName;
     }
@@ -216,7 +216,7 @@ public static Map<String, Object> rowAsMap(final Map<String, String> headerCellR
             for (final String propColName : headerCellRefsMap.keySet()) {
                 // Get the Header Cell Ref
                 final String propCellRef = headerCellRefsMap.get(propColName);
-                if (Objects.isNull(propCellRef) || propCellRef.isBlank()) {
+                if (Strings.isBlank(propCellRef)) {
                     continue;
                 }
 
@@ -263,7 +263,7 @@ public static <T> T rowAsBean(Class<T> beanClz, Map<String, Column> propColumnMa
                 // Get the Header Cell Ref
                 final String normalizedColName = Strings.normalize(propColName);
                 final String propCellRef = headerCellRefsMap.get(normalizedColName);
-                if (Objects.isNull(propCellRef) || propCellRef.isBlank()) {
+                if (Strings.isBlank(propCellRef)) {
                     LOGGER.debug("{} :: No Cell Ref found [Prop - Col] : [{} - {}]", beanClz, propName, propColName);
                     continue;
                 }
@@ -310,7 +310,7 @@ private static boolean validateRowData(final Map<String, Object> rowDataMap,
             final String propCellRef = headerCellRefsMap.containsKey(propColName) //
                     ? headerCellRefsMap.get(propColName) //
                     : headerCellRefsMap.get(normalizedColName);
-            if (Objects.isNull(propCellRef) || propCellRef.isBlank()) {
+            if (Strings.isBlank(propCellRef)) {
                 continue;
             }
 

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

@@ -52,4 +52,17 @@ public static String normalize(final String inStr) {
     }
 
 
+    // Checks
+
+    /**
+     * Check if a String is <code>null</code> or contains only white spaces
+     * 
+     * @param str input string
+     * 
+     * @return <code>true</code> if the input String is blank
+     */
+    public static boolean isBlank(final String str) {
+        return Objects.isNull(str) || str.trim().isEmpty();
+    }
+
 }