From 7da08b37757a71a6b1343b289ce15d8225b2d2eb Mon Sep 17 00:00:00 2001 From: tomas-sexenian Date: Mon, 29 May 2023 15:27:35 -0300 Subject: [PATCH 1/2] Bump iText dependency from 7 to 8 --- java/pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/java/pom.xml b/java/pom.xml index 825f555b4..b9e9ffc4a 100644 --- a/java/pom.xml +++ b/java/pom.xml @@ -103,13 +103,13 @@ com.itextpdf itext7-core - 7.2.5 + 8.0.0 pom com.itextpdf html2pdf - 4.0.5 + 5.0.0 com.lowagie From 4b19c66350aa449af30548ee7c8a1a51387877f9 Mon Sep 17 00:00:00 2001 From: tomas-sexenian Date: Wed, 31 May 2023 15:08:18 -0300 Subject: [PATCH 2/2] Update class name and actually read iText implementation from client.cfg --- java/src/main/java/com/genexus/GXWebReport.java | 4 ++-- java/src/main/java/com/genexus/reports/GXReport.java | 4 ++-- .../reports/{PDFReportItext7.java => PDFReportItext8.java} | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) rename java/src/main/java/com/genexus/reports/{PDFReportItext7.java => PDFReportItext8.java} (99%) diff --git a/java/src/main/java/com/genexus/GXWebReport.java b/java/src/main/java/com/genexus/GXWebReport.java index ee6aa69c2..98bbe1a55 100644 --- a/java/src/main/java/com/genexus/GXWebReport.java +++ b/java/src/main/java/com/genexus/GXWebReport.java @@ -38,8 +38,8 @@ protected void initState(ModelContext context, UserInformation ui) String implementation = com.genexus.Application.getClientContext().getClientPreferences().getPDF_RPT_LIBRARY(); if (implementation.equals("ITEXT")) reportHandler = new PDFReportItext2(context); - else if (implementation.equals("ITEXT7")) - reportHandler = new PDFReportItext7(context); + else if (implementation.equals("ITEXT8")) + reportHandler = new PDFReportItext8(context); else reportHandler = new PDFReportPDFBox(context); initValues(); diff --git a/java/src/main/java/com/genexus/reports/GXReport.java b/java/src/main/java/com/genexus/reports/GXReport.java index a13e28331..9ed15ec4a 100644 --- a/java/src/main/java/com/genexus/reports/GXReport.java +++ b/java/src/main/java/com/genexus/reports/GXReport.java @@ -75,8 +75,8 @@ else if (getOutputType() == OUTPUT_PDF) String implementation = com.genexus.Application.getClientContext().getClientPreferences().getPDF_RPT_LIBRARY(); if (implementation.equals("ITEXT")) reportHandler = new PDFReportItext2(context); - else if (implementation.equals("ITEXT7")) - reportHandler = new PDFReportItext7(context); + else if (implementation.equals("ITEXT8")) + reportHandler = new PDFReportItext8(context); else reportHandler = new PDFReportPDFBox(context); ((GXReportPDFCommons) reportHandler).setOutputStream(httpContext.getOutputStream()); diff --git a/java/src/main/java/com/genexus/reports/PDFReportItext7.java b/java/src/main/java/com/genexus/reports/PDFReportItext8.java similarity index 99% rename from java/src/main/java/com/genexus/reports/PDFReportItext7.java rename to java/src/main/java/com/genexus/reports/PDFReportItext8.java index 26960c750..c1baca27b 100644 --- a/java/src/main/java/com/genexus/reports/PDFReportItext7.java +++ b/java/src/main/java/com/genexus/reports/PDFReportItext8.java @@ -46,7 +46,7 @@ import java.util.concurrent.ConcurrentHashMap; import java.util.zip.Deflater; -public class PDFReportItext7 extends GXReportPDFCommons { +public class PDFReportItext8 extends GXReportPDFCommons { private PageSize pageSize; private PdfFont baseFont; private Barcode128 barcode = null; @@ -61,10 +61,10 @@ public class PDFReportItext7 extends GXReportPDFCommons { ConcurrentHashMap documentImages; static { - log = org.apache.logging.log4j.LogManager.getLogger(PDFReportItext7.class); + log = org.apache.logging.log4j.LogManager.getLogger(PDFReportItext8.class); } - public PDFReportItext7(ModelContext context) { + public PDFReportItext8(ModelContext context) { super(context); document = null; pdfDocument = null;