From fc192fe84eb9a77331c7064317c6d877ec3fc62c Mon Sep 17 00:00:00 2001 From: "tiago.costa" Date: Mon, 18 Dec 2023 18:40:21 -0300 Subject: [PATCH 1/5] fix: removing unused method wish was causing compilation error because of @Override annotation --- .../excel/conversion/cell/CachedValueFormulaEvaluator.java | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java b/src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java index 0404827..e3f3d7d 100644 --- a/src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java +++ b/src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java @@ -45,11 +45,6 @@ public CellType evaluateFormulaCell(Cell cell) { return cell.getCachedFormulaResultType(); } - @Override - public CellType evaluateFormulaCellEnum(Cell cell) { - return cell.getCachedFormulaResultType(); - } - @Override public Cell evaluateInCell(Cell cell) { return null; From 941f7b1fd285758d681c078bc7b79f13cb7c5bb5 Mon Sep 17 00:00:00 2001 From: "tiago.costa" Date: Mon, 18 Dec 2023 18:43:15 -0300 Subject: [PATCH 2/5] feat: upgrading poi libs version to 5.2.3 --- build.gradle | 11 +++++++++-- .../conversion/cellcontent/DefaultStyleConverter.java | 2 +- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 09f46df..deb012a 100644 --- a/build.gradle +++ b/build.gradle @@ -4,13 +4,19 @@ apply plugin: 'eclipse' description = 'An extension to Concordion to use Excel spreadsheets rather than HTML as specifications' ext { - poiVersion = '4.1.0' + poiVersion = '5.2.3' developers = { developer { id 'robmoffat' name 'Rob Moffat' roles { role 'Extension Contributor' } url 'http://kite9.com' + }, + developer { + id 'tiagotcsilva' + name 'Tiago da Costa Silva' + roles { role 'Extension Contributor' } + url 'http://kite9.com' } } inceptionYear = '2014' @@ -19,9 +25,10 @@ ext { dependencies { implementation "org.apache.poi:poi:$poiVersion" implementation "org.apache.poi:poi-ooxml:$poiVersion" - implementation "org.apache.poi:poi-ooxml-schemas:$poiVersion" + implementation "org.apache.poi:poi-ooxml-lite:$poiVersion" implementation 'org.apache.commons:commons-lang3:3.3.2' testImplementation 'org.xmlunit:xmlunit-core:2.1.0' + testImplementation "org.junit.vintage:junit-vintage-engine:5.9.3" } test { diff --git a/src/main/java/org/concordion/ext/excel/conversion/cellcontent/DefaultStyleConverter.java b/src/main/java/org/concordion/ext/excel/conversion/cellcontent/DefaultStyleConverter.java index 910aa44..20d953c 100644 --- a/src/main/java/org/concordion/ext/excel/conversion/cellcontent/DefaultStyleConverter.java +++ b/src/main/java/org/concordion/ext/excel/conversion/cellcontent/DefaultStyleConverter.java @@ -133,7 +133,7 @@ protected void extractFontStyle(Cell c, StringBuilder out) { protected Font getFont(Cell c) { CellStyle style = c.getCellStyle(); - short fontIndex = style.getFontIndex(); + int fontIndex = style.getFontIndex(); Sheet s = c.getSheet(); Font f = s.getWorkbook().getFontAt(fontIndex); return f; From 6bbce016d71c34b289aaf1ed2f5926650a073879 Mon Sep 17 00:00:00 2001 From: "tiago.costa" Date: Tue, 19 Dec 2023 15:47:12 -0300 Subject: [PATCH 3/5] fix: fixing default Row.getCell MissingCellPolicy to avoid NullPointerException --- .../excel/conversion/cell/CachedValueFormulaEvaluator.java | 4 ++++ .../ext/excel/conversion/row/BasicTableStrategy.java | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java b/src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java index e3f3d7d..2729abc 100644 --- a/src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java +++ b/src/main/java/org/concordion/ext/excel/conversion/cell/CachedValueFormulaEvaluator.java @@ -45,6 +45,10 @@ public CellType evaluateFormulaCell(Cell cell) { return cell.getCachedFormulaResultType(); } + public CellType evaluateFormulaCellEnum(Cell cell) { + return cell.getCachedFormulaResultType(); + } + @Override public Cell evaluateInCell(Cell cell) { return null; diff --git a/src/main/java/org/concordion/ext/excel/conversion/row/BasicTableStrategy.java b/src/main/java/org/concordion/ext/excel/conversion/row/BasicTableStrategy.java index 8fa9b2d..954c253 100644 --- a/src/main/java/org/concordion/ext/excel/conversion/row/BasicTableStrategy.java +++ b/src/main/java/org/concordion/ext/excel/conversion/row/BasicTableStrategy.java @@ -2,6 +2,7 @@ import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; +import org.apache.poi.ss.usermodel.Row.MissingCellPolicy; import org.apache.poi.xssf.usermodel.XSSFSheet; import org.apache.poi.xssf.usermodel.XSSFTable; import org.concordion.ext.excel.ExcelCellConversionException; @@ -46,9 +47,9 @@ public void process(XSSFTable table, HTMLBuilder result) { result.startTag("tr"); for (int i = columnFrom; i <= columnTo; i++) { if (header) { - headerCell.process(r.getCell(i), result); + headerCell.process(r.getCell(i, MissingCellPolicy.CREATE_NULL_AS_BLANK), result); } else { - bodyCell.process(r.getCell(i), result); + bodyCell.process(r.getCell(i, MissingCellPolicy.CREATE_NULL_AS_BLANK), result); } } From 81deb5d369fd68bac3c9413976494ef6ddc662a4 Mon Sep 17 00:00:00 2001 From: "tiago.costa" Date: Wed, 20 Dec 2023 15:24:14 -0300 Subject: [PATCH 4/5] fix: removing jdk8 adding jd17 test execution --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97742ae..31deb3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - java: [ '8', '11', '15' ] + java: [ '11', '15', '17' ] name: Java ${{ matrix.Java }} steps: From 942f4b419cd9855a4889f09c16666a31e1a29ad4 Mon Sep 17 00:00:00 2001 From: "tiago.costa" Date: Wed, 20 Dec 2023 15:36:12 -0300 Subject: [PATCH 5/5] feat: upgrading gradle version to 8.5 --- gradle/wrapper/gradle-wrapper.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 69a9715..a595206 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists