From 21669ad0ffe4854509474c943581f9371434c6a9 Mon Sep 17 00:00:00 2001 From: Hans Van Akelyen Date: Mon, 16 Nov 2026 15:49:36 +0100 Subject: [PATCH] Excel writer: no NullPointerException on an empty lazily converted value, fixes #9508 --- .../excelwriter/ExcelWriterTransform.java | 11 ++++--- .../excelwriter/ExcelWriterTransformTest.java | 31 +++++++++++++++++++ 2 files changed, 38 insertions(+), 4 deletions(-) diff --git a/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransform.java b/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransform.java index 7d0c120ac24..bfb28c70a79 100644 --- a/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransform.java +++ b/plugins/transforms/excel/src/main/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransform.java @@ -710,13 +710,16 @@ void writeField( } break; case IValueMeta.TYPE_BOOLEAN: - if (v != null) { - cell.setCellValue(vMeta.getBoolean(v)); + // A lazily converted empty value is not null but converts to null: no cell value + Boolean bool = v != null ? vMeta.getBoolean(v) : null; + if (bool != null) { + cell.setCellValue(bool); } break; case IValueMeta.TYPE_BIGNUMBER, IValueMeta.TYPE_NUMBER, IValueMeta.TYPE_INTEGER: - if (v != null) { - cell.setCellValue(vMeta.getNumber(v)); + Double number = v != null ? vMeta.getNumber(v) : null; + if (number != null) { + cell.setCellValue(number); } break; default: diff --git a/plugins/transforms/excel/src/test/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransformTest.java b/plugins/transforms/excel/src/test/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransformTest.java index 1439f2041d3..ef4b89e4b80 100644 --- a/plugins/transforms/excel/src/test/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransformTest.java +++ b/plugins/transforms/excel/src/test/java/org/apache/hop/pipeline/transforms/excelwriter/ExcelWriterTransformTest.java @@ -47,6 +47,7 @@ import org.apache.hop.core.row.IValueMeta; import org.apache.hop.core.row.value.ValueMetaBigNumber; import org.apache.hop.core.row.value.ValueMetaBinary; +import org.apache.hop.core.row.value.ValueMetaBoolean; import org.apache.hop.core.row.value.ValueMetaDate; import org.apache.hop.core.row.value.ValueMetaInteger; import org.apache.hop.core.row.value.ValueMetaInternetAddress; @@ -57,6 +58,8 @@ import org.apache.hop.utils.TestUtils; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.hssf.usermodel.HSSFWorkbook; +import org.apache.poi.ss.usermodel.Cell; +import org.apache.poi.ss.usermodel.CellType; import org.apache.poi.ss.usermodel.Row; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.ss.usermodel.Workbook; @@ -402,6 +405,34 @@ void testValueBoolean() throws Exception { testBaseXlsx(vmi, vObj, false, false); } + /** + * After a CSV file input with lazy conversion, an empty field is an empty byte array: not null, + * but it converts to null. The cell stays empty. + */ + @Test + void testValueNumberEmptyAndLazilyConverted() throws Exception { + testBaseXlsx(lazilyConverted(new ValueMetaNumber("value_number")), new byte[0], false, false); + assertBlankCell(); + } + + @Test + void testValueBooleanEmptyAndLazilyConverted() throws Exception { + testBaseXlsx(lazilyConverted(new ValueMetaBoolean("value_bool")), new byte[0], false, false); + assertBlankCell(); + } + + private static IValueMeta lazilyConverted(IValueMeta valueMeta) { + // As CSV file input reads it: the text of the file, converted when needed + valueMeta.setStorageType(IValueMeta.STORAGE_TYPE_BINARY_STRING); + valueMeta.setStorageMetadata(new ValueMetaString(valueMeta.getName())); + return valueMeta; + } + + private void assertBlankCell() { + Cell cell = dataMock.currentWorkbookDefinition.getSheet().getRow(1).getCell(0); + assertTrue(cell == null || cell.getCellType() == CellType.BLANK, String.valueOf(cell)); + } + @Test void testValueDate() throws Exception {