exceptionfactory commented on code in PR #9379:
URL: https://github.com/apache/nifi/pull/9379#discussion_r1799986120
##########
nifi-extension-bundles/nifi-poi-bundle/nifi-poi-services/src/main/java/org/apache/nifi/excel/ExcelRecordReader.java:
##########
@@ -133,15 +134,32 @@ private Map<String, Object> getCurrentRowValues(Row
currentRow, boolean coerceTy
return currentRowValues;
}
- private static Object getCellValue(Cell cell) {
- if (cell != null) {
- return switch (cell.getCellType()) {
- case _NONE, BLANK, ERROR, FORMULA, STRING ->
cell.getStringCellValue();
+ private static Object getCellValue(final Cell cell) {
+ final Object cellValue;
+
+ if (cell == null) {
+ cellValue = null;
+ } else {
+ final CellType cellType = cell.getCellType();
+ cellValue = switch (cellType) {
+ case _NONE, BLANK, ERROR, STRING -> cell.getStringCellValue();
case NUMERIC -> DateUtil.isCellDateFormatted(cell) ?
cell.getDateCellValue() : cell.getNumericCellValue();
case BOOLEAN -> cell.getBooleanCellValue();
+ case FORMULA -> getFormulaCellValue(cell);
};
}
- return null;
+
+ return cellValue;
+ }
+
+ private static Object getFormulaCellValue(final Cell cell) {
+ final CellType formulaResultType = cell.getCachedFormulaResultType();
+ return switch (formulaResultType) {
+ case BOOLEAN -> cell.getBooleanCellValue();
+ case STRING -> cell.getStringCellValue();
+ case NUMERIC -> DateUtil.isCellDateFormatted(cell) ?
cell.getDateCellValue() : cell.getNumericCellValue();
+ default -> null;
Review Comment:
Good catch, that is worth retaining.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
