Merge branch 'release_branch_DEVSIX-5576' into master-rc

Author: iText-CI

pom.xml

@@ -5,12 +5,12 @@
   <parent>
     <groupId>com.itextpdf</groupId>
     <artifactId>root</artifactId>
-    <version>7.1.16</version>
+    <version>7.2.0</version>
     <relativePath />
   </parent>
 
   <artifactId>html2pdf</artifactId>
-  <version>3.0.5</version>
+  <version>4.0.0</version>
 
   <name>pdfHTML</name>
   <description>pdfHTML is an iText 7 add-on that lets you to parse (X)HTML snippets and the associated CSS and converts
@@ -102,9 +102,6 @@
         <configuration>
           <sourceFileExcludes>
             <sourceFileExclude>com/itextpdf/html2pdf/attach/impl/layout/BodyHtmlStylesContainer.java</sourceFileExclude>
-
-            <!-- ProductInfo -->
-            <sourceFileExclude>**/Html2PdfProductInfo.java</sourceFileExclude>
           </sourceFileExcludes>
           <groups>
             <group>

src/main/java/com/itextpdf/html2pdf/ConverterProperties.java

@@ -46,7 +46,7 @@ This file is part of the iText (R) project.
 import com.itextpdf.html2pdf.attach.ITagWorkerFactory;
 import com.itextpdf.html2pdf.attach.impl.OutlineHandler;
 import com.itextpdf.html2pdf.css.apply.ICssApplierFactory;
-import com.itextpdf.kernel.counter.event.IMetaInfo;
+import com.itextpdf.commons.actions.contexts.IMetaInfo;
 import com.itextpdf.layout.font.FontProvider;
 import com.itextpdf.styledxmlparser.css.media.MediaDeviceDescription;
 import com.itextpdf.styledxmlparser.resolver.resource.IResourceRetriever;
@@ -440,25 +440,23 @@ public ConverterProperties setImmediateFlush(boolean immediateFlush) {
     /**
      * Gets html meta info.
      * <p>
-     * This meta info will be passed with to {@link com.itextpdf.kernel.counter.EventCounter}
-     * with {@link com.itextpdf.html2pdf.events.PdfHtmlEvent} and can be used to determine event origin.
+     * This meta info will be used to determine event origin.
      *
      * @return converter's {@link IMetaInfo}
      */
-    public IMetaInfo getEventCountingMetaInfo() {
-        return metaInfo;
+    IMetaInfo getEventMetaInfo() {
+        return metaInfo == null ? HtmlConverter.createPdf2HtmlMetaInfo() : metaInfo;
     }
 
     /**
      * Sets html meta info.
      * <p>
-     * This meta info will be passed with to {@link com.itextpdf.kernel.counter.EventCounter}
-     * with {@link com.itextpdf.html2pdf.events.PdfHtmlEvent} and can be used to determine event origin.
+     * This meta info will be used to determine event origin.
      *
      * @param metaInfo meta info to set
      * @return the {@link ConverterProperties} instance
      */
-    public ConverterProperties setEventCountingMetaInfo(IMetaInfo metaInfo) {
+    public ConverterProperties setEventMetaInfo(IMetaInfo metaInfo) {
         this.metaInfo = metaInfo;
         return this;
     }

src/main/java/com/itextpdf/html2pdf/Html2PdfProductInfo.java

@@ -44,15 +44,16 @@ This file is part of the iText (R) project.
 package com.itextpdf.html2pdf;
 
 import com.itextpdf.html2pdf.attach.Attacher;
-import com.itextpdf.html2pdf.exception.Html2PdfException;
-import com.itextpdf.html2pdf.util.ReflectionUtils;
-import com.itextpdf.io.util.FileUtil;
-import com.itextpdf.kernel.counter.event.IMetaInfo;
+import com.itextpdf.html2pdf.exceptions.Html2PdfException;
+import com.itextpdf.commons.utils.FileUtil;
+import com.itextpdf.commons.actions.contexts.IMetaInfo;
 import com.itextpdf.kernel.pdf.DocumentProperties;
 import com.itextpdf.kernel.pdf.PdfDocument;
 import com.itextpdf.kernel.pdf.PdfWriter;
 import com.itextpdf.layout.Document;
 import com.itextpdf.layout.element.IElement;
+import com.itextpdf.layout.properties.Property;
+import com.itextpdf.layout.renderer.MetaInfoContainer;
 import com.itextpdf.styledxmlparser.IXmlParser;
 import com.itextpdf.styledxmlparser.node.IDocumentNode;
 import com.itextpdf.styledxmlparser.node.impl.jsoup.JsoupHtmlParser;
@@ -124,7 +125,8 @@ public static void convertToPdf(String html, PdfWriter pdfWriter) {
      * @param converterProperties a {@link ConverterProperties} instance
      */
     public static void convertToPdf(String html, PdfWriter pdfWriter, ConverterProperties converterProperties) {
-        convertToPdf(html, new PdfDocument(pdfWriter, new DocumentProperties().setEventCountingMetaInfo(new HtmlMetaInfo())), converterProperties);
+        convertToPdf(html, new PdfDocument(pdfWriter, new DocumentProperties()
+                .setEventCountingMetaInfo(resolveMetaInfo(converterProperties))), converterProperties);
     }
 
     /**
@@ -137,6 +139,7 @@ public static void convertToPdf(String html, PdfWriter pdfWriter, ConverterPrope
      */
     public static void convertToPdf(String html, PdfDocument pdfDocument, ConverterProperties converterProperties) {
         final Document document = convertToDocument(html, pdfDocument, converterProperties);
+        document.setProperty(Property.META_INFO, new MetaInfoContainer(resolveMetaInfo(converterProperties)));
         document.close();
     }
 
@@ -162,10 +165,10 @@ public static void convertToPdf(File htmlFile, File pdfFile) throws IOException
      */
     public static void convertToPdf(File htmlFile, File pdfFile, ConverterProperties converterProperties) throws IOException {
         if (converterProperties == null) {
-            String baseUri = FileUtil.getParentDirectory(htmlFile);
+            String baseUri = FileUtil.getParentDirectoryUri(htmlFile);
             converterProperties = new ConverterProperties().setBaseUri(baseUri);
         } else if (converterProperties.getBaseUri() == null) {
-            String baseUri = FileUtil.getParentDirectory(htmlFile);
+            String baseUri = FileUtil.getParentDirectoryUri(htmlFile);
             converterProperties = new ConverterProperties(converterProperties).setBaseUri(baseUri);
         }
         try (FileInputStream fileInputStream = new FileInputStream(htmlFile.getAbsolutePath());
@@ -220,7 +223,8 @@ public static void convertToPdf(InputStream htmlStream, PdfDocument pdfDocument)
      * @throws IOException Signals that an I/O exception has occurred.
      */
     public static void convertToPdf(InputStream htmlStream, PdfWriter pdfWriter) throws IOException {
-        convertToPdf(htmlStream, new PdfDocument(pdfWriter, new DocumentProperties().setEventCountingMetaInfo(new HtmlMetaInfo())));
+        convertToPdf(htmlStream, new PdfDocument(pdfWriter, new DocumentProperties().setEventCountingMetaInfo(
+                createPdf2HtmlMetaInfo())));
     }
 
     /**
@@ -234,7 +238,8 @@ public static void convertToPdf(InputStream htmlStream, PdfWriter pdfWriter) thr
      * @throws IOException Signals that an I/O exception has occurred.
      */
     public static void convertToPdf(InputStream htmlStream, PdfWriter pdfWriter, ConverterProperties converterProperties) throws IOException {
-        convertToPdf(htmlStream, new PdfDocument(pdfWriter, new DocumentProperties().setEventCountingMetaInfo(new HtmlMetaInfo())), converterProperties);
+        convertToPdf(htmlStream, new PdfDocument(pdfWriter, new DocumentProperties().setEventCountingMetaInfo(
+                resolveMetaInfo(converterProperties))), converterProperties);
     }
 
     /**
@@ -248,6 +253,8 @@ public static void convertToPdf(InputStream htmlStream, PdfWriter pdfWriter, Con
      */
     public static void convertToPdf(InputStream htmlStream, PdfDocument pdfDocument, ConverterProperties converterProperties) throws IOException {
         final Document document = convertToDocument(htmlStream, pdfDocument, converterProperties);
+        IMetaInfo metaInfo = resolveMetaInfo(converterProperties);
+        document.setProperty(Property.META_INFO, new MetaInfoContainer(metaInfo));
         document.close();
     }
 
@@ -316,9 +323,8 @@ public static Document convertToDocument(InputStream htmlStream, PdfWriter pdfWr
      * @return a {@link Document} instance
      */
     public static Document convertToDocument(String html, PdfDocument pdfDocument, ConverterProperties converterProperties) {
-        ReflectionUtils.scheduledLicenseCheck();
         if (pdfDocument.getReader() != null) {
-            throw new Html2PdfException(Html2PdfException.PdfDocumentShouldBeInWritingMode);
+            throw new Html2PdfException(Html2PdfException.PDF_DOCUMENT_SHOULD_BE_IN_WRITING_MODE);
         }
         IXmlParser parser = new JsoupHtmlParser();
         IDocumentNode doc = parser.parse(html);
@@ -337,9 +343,8 @@ public static Document convertToDocument(String html, PdfDocument pdfDocument, C
      * @throws IOException Signals that an I/O exception has occurred.
      */
     public static Document convertToDocument(InputStream htmlStream, PdfDocument pdfDocument, ConverterProperties converterProperties) throws IOException {
-        ReflectionUtils.scheduledLicenseCheck();
         if (pdfDocument.getReader() != null) {
-            throw new Html2PdfException(Html2PdfException.PdfDocumentShouldBeInWritingMode);
+            throw new Html2PdfException(Html2PdfException.PDF_DOCUMENT_SHOULD_BE_IN_WRITING_MODE);
         }
         IXmlParser parser = new JsoupHtmlParser();
         IDocumentNode doc = parser.parse(htmlStream, converterProperties != null ? converterProperties.getCharset() : null);
@@ -379,7 +384,6 @@ public static List<IElement> convertToElements(InputStream htmlStream) throws IO
      * @return a list of iText building blocks
      */
     public static List<IElement> convertToElements(String html, ConverterProperties converterProperties) {
-        ReflectionUtils.scheduledLicenseCheck();
         IXmlParser parser = new JsoupHtmlParser();
         IDocumentNode doc = parser.parse(html);
         return Attacher.attach(doc, converterProperties);
@@ -396,14 +400,21 @@ public static List<IElement> convertToElements(String html, ConverterProperties
      * @throws IOException Signals that an I/O exception has occurred.
      */
     public static List<IElement> convertToElements(InputStream htmlStream, ConverterProperties converterProperties) throws IOException {
-        ReflectionUtils.scheduledLicenseCheck();
         IXmlParser parser = new JsoupHtmlParser();
         IDocumentNode doc = parser.parse(htmlStream, converterProperties != null ? converterProperties.getCharset() : null);
         return Attacher.attach(doc, converterProperties);
     }
 
-    private static class HtmlMetaInfo implements IMetaInfo {
+    static IMetaInfo createPdf2HtmlMetaInfo() {
+        return new HtmlMetaInfo();
+    }
 
-        private static final long serialVersionUID = -295587336698550627L;
+    private static IMetaInfo resolveMetaInfo(ConverterProperties converterProperties) {
+        return converterProperties == null
+                ? createPdf2HtmlMetaInfo()
+                : converterProperties.getEventMetaInfo();
+    }
+
+    private static class HtmlMetaInfo implements IMetaInfo {
     }
 }

src/main/java/com/itextpdf/html2pdf/HtmlConverter.java

@@ -0,0 +1,51 @@
+/*
+    This file is part of the iText (R) project.
+    Copyright (c) 1998-2021 iText Group NV
+    Authors: iText Software.
+
+    This program is offered under a commercial and under the AGPL license.
+    For commercial licensing, contact us at https://itextpdf.com/sales.  For AGPL licensing, see below.
+
+    AGPL licensing:
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.itextpdf.html2pdf;
+
+import com.itextpdf.html2pdf.attach.ProcessorContext;
+
+/**
+ * Class that creates ProcessorContext with IMetaInfo.
+ */
+public final class ProcessorContextCreator {
+
+    private ProcessorContextCreator() {
+        // Should not be used
+    }
+
+    /**
+     * Crates ProcessorContext instances with IMetaInfo.
+     *
+     * @param converterProperties the {@link ConverterProperties} instance with IMetaInfo.
+     *
+     * @return a new {@link ProcessorContext} instance with IMetaInfo.
+     */
+    public static ProcessorContext createProcessorContext(ConverterProperties converterProperties) {
+        if (converterProperties == null) {
+            converterProperties = new ConverterProperties();
+        }
+        ProcessorContext procContext = new ProcessorContext(converterProperties);
+        procContext.setMetaInfo(converterProperties.getEventMetaInfo());
+        return procContext;
+    }
+}

src/main/java/com/itextpdf/html2pdf/ProcessorContextCreator.java

@@ -0,0 +1,52 @@
+/*
+    This file is part of the iText (R) project.
+    Copyright (c) 1998-2021 iText Group NV
+    Authors: iText Software.
+
+    This program is offered under a commercial and under the AGPL license.
+    For commercial licensing, contact us at https://itextpdf.com/sales.  For AGPL licensing, see below.
+
+    AGPL licensing:
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+package com.itextpdf.html2pdf.actions.data;
+
+import com.itextpdf.commons.actions.data.ProductData;
+import com.itextpdf.commons.actions.ProductNameConstant;
+
+/**
+ * Stores an instance of {@link ProductData} related to iText pdfHTML module.
+ */
+public final class PdfHtmlProductData {
+    private static final String PDF_HTML_PUBLIC_PRODUCT_NAME = "pdfHTML";
+    private static final String PDF_HTML_VERSION = "4.0.0";
+    private static final int PDF_HTML_COPYRIGHT_SINCE = 2000;
+    private static final int PDF_HTML_COPYRIGHT_TO = 2021;
+
+    private static final ProductData PDF_HTML_PRODUCT_DATA = new ProductData(PDF_HTML_PUBLIC_PRODUCT_NAME,
+            ProductNameConstant.PDF_HTML, PDF_HTML_VERSION, PDF_HTML_COPYRIGHT_SINCE, PDF_HTML_COPYRIGHT_TO);
+
+    private PdfHtmlProductData() {
+        // Empty constructor.
+    }
+
+    /**
+     * Getter for an instance of {@link ProductData} related to iText pdfHTML module.
+     *
+     * @return iText pdfHTML product description
+     */
+    public static ProductData getInstance() {
+        return PDF_HTML_PRODUCT_DATA;
+    }
+}