Move all logic from PdfA/UaDocuments to pluggalbe mechanisms into PdfDocument

DEVSIX-8623

Autoported commit.
Original commit hash: [2564cb2e1]

Author: introfog

itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterPdfA4Test.cs

@@ -28,6 +28,7 @@ You should have received a copy of the GNU Affero General Public License
 using iText.Pdfa;
 using iText.Pdfa.Checker;
 using iText.Pdfa.Exceptions;
+using iText.Pdfa.Logs;
 using iText.Test;
 using iText.Test.Attributes;
 
@@ -85,24 +86,24 @@ public virtual void ConvertToPdfA4ColorsTest() {
         }
 
         [NUnit.Framework.Test]
+        [LogMessage(PdfALogMessageConstant.WRITER_PROPERTIES_PDF_VERSION_WAS_OVERRIDDEN, LogLevel = LogLevelConstants
+            .WARN)]
         public virtual void ConvertToPdfA4MetaDataInvalidTest() {
             String sourceHtml = SOURCE_FOLDER + "simple.html";
             String destinationPdf = DESTINATION_FOLDER + "pdfA4InvalidMetadataTest.pdf";
+            String cmpPdf = SOURCE_FOLDER + "cmp_pdfA4InvalidMetadataTest.pdf";
             ConverterProperties converterProperties = new ConverterProperties();
             converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_4);
             converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
                 , new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
             converterProperties.SetBaseUri("no_link");
             using (FileStream fOutput = new FileStream(sourceHtml, FileMode.Open, FileAccess.Read)) {
-                using (PdfWriter pdfWriter = new PdfWriter(destinationPdf)) {
-                    Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => {
-                        HtmlConverter.ConvertToPdf(fOutput, pdfWriter, converterProperties);
-                    }
-                    );
-                    NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.THE_FILE_HEADER_SHALL_CONTAIN_RIGHT_PDF_VERSION
-                        , "2"), e.Message);
+                using (PdfWriter pdfWriter = new PdfWriter(destinationPdf, new WriterProperties().SetPdfVersion(PdfVersion
+                    .PDF_1_7))) {
+                    HtmlConverter.ConvertToPdf(fOutput, pdfWriter, converterProperties);
                 }
             }
+            HtmlConverterTest.CompareAndCheckCompliance(destinationPdf, cmpPdf);
         }
 
         [NUnit.Framework.Test]

itext.tests/itext.html2pdf.tests/itext/html2pdf/HtmlConverterTest.cs

@@ -22,13 +22,10 @@ You should have received a copy of the GNU Affero General Public License
 */
 using System;
 using System.IO;
-using iText.Commons.Utils;
 using iText.Html2pdf.Exceptions;
 using iText.Kernel.Pdf;
 using iText.Kernel.Utils;
 using iText.Layout;
-using iText.Pdfa;
-using iText.Pdfa.Exceptions;
 using iText.Test;
 using iText.Test.Pdfa;
 
@@ -88,44 +85,6 @@ public virtual void CannotConvertHtmlToDocumentInReadingModeTest() {
                 );
         }
 
-        [NUnit.Framework.Test]
-        public virtual void ConvertHtmlToDocumentIncorrectConverterPropertiesTest() {
-            String sourceHtml = SOURCE_FOLDER + "simple.html";
-            String destinationPdf = DESTINATION_FOLDER + "simpleA4.pdf";
-            ConverterProperties converterProperties = new ConverterProperties();
-            converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_3U);
-            converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
-                , new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
-            PdfADocument pdfDocument = new PdfADocument(new PdfWriter(destinationPdf), PdfAConformance.PDF_A_4E, new PdfOutputIntent
-                ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm"
-                , FileMode.Open, FileAccess.Read)));
-            Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => {
-                HtmlConverter.ConvertToPdf(sourceHtml, pdfDocument, converterProperties);
-            }
-            );
-            NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.THE_FILE_HEADER_SHALL_CONTAIN_RIGHT_PDF_VERSION
-                , "2"), e.Message);
-        }
-
-        [NUnit.Framework.Test]
-        public virtual void ConvertHtmlToDocumentWithDifferentColorProfileTest() {
-            String sourceHtml = SOURCE_FOLDER + "simple.html";
-            String destinationPdf = DESTINATION_FOLDER + "simpleA4.pdf";
-            ConverterProperties converterProperties = new ConverterProperties();
-            converterProperties.SetPdfAConformance(PdfAConformance.PDF_A_4E);
-            converterProperties.SetDocumentOutputIntent(new PdfOutputIntent("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1"
-                , new FileStream(SOURCE_FOLDER + "sRGB Color Space Profile.icm", FileMode.Open, FileAccess.Read)));
-            PdfADocument pdfDocument = new PdfADocument(new PdfWriter(destinationPdf), PdfAConformance.PDF_A_4E, new PdfOutputIntent
-                ("Custom", "", "http://www.color.org", "sRGB IEC61966-2.1", new FileStream(SOURCE_FOLDER + "USWebUncoated.icc"
-                , FileMode.Open, FileAccess.Read)));
-            Exception e = NUnit.Framework.Assert.Catch(typeof(PdfAConformanceException), () => {
-                HtmlConverter.ConvertToPdf(sourceHtml, pdfDocument, converterProperties);
-            }
-            );
-            NUnit.Framework.Assert.AreEqual(MessageFormatUtil.Format(PdfaExceptionMessageConstant.THE_FILE_HEADER_SHALL_CONTAIN_RIGHT_PDF_VERSION
-                , "2"), e.Message);
-        }
-
         private static PdfDocument CreateTempDoc() {
             MemoryStream outputStream = new MemoryStream();
             PdfDocument pdfDocument = new PdfDocument(new PdfWriter(outputStream));

itext.tests/itext.html2pdf.tests/resources/itext/html2pdf/HtmlConverterPdfA4Test/cmp_pdfA4InvalidMetadataTest.pdf

@@ -61,9 +61,6 @@ namespace iText.Html2pdf {
     /// instance.
     /// </remarks>
     public class HtmlConverter {
-        private static readonly IList<PdfAConformance> pdf2Conformances = new List<PdfAConformance>(JavaUtil.ArraysAsList
-            (PdfAConformance.PDF_A_4, PdfAConformance.PDF_A_4E, PdfAConformance.PDF_A_4F));
-
         /// <summary>Instantiates a new HtmlConverter instance.</summary>
         private HtmlConverter() {
         }
@@ -109,11 +106,6 @@ public static void ConvertToPdf(String html, Stream pdfStream) {
         /// instance
         /// </param>
         public static void ConvertToPdf(String html, Stream pdfStream, ConverterProperties converterProperties) {
-            if (converterProperties != null && pdf2Conformances.Contains(converterProperties.GetPdfAConformance())) {
-                ConvertToPdf(html, new PdfWriter(pdfStream, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)), converterProperties
-                    );
-                return;
-            }
             ConvertToPdf(html, new PdfWriter(pdfStream), converterProperties);
         }
 
@@ -315,11 +307,6 @@ public static void ConvertToPdf(Stream htmlStream, Stream pdfStream) {
         /// </param>
         public static void ConvertToPdf(Stream htmlStream, Stream pdfStream, ConverterProperties converterProperties
             ) {
-            if (converterProperties != null && pdf2Conformances.Contains(converterProperties.GetPdfAConformance())) {
-                ConvertToPdf(htmlStream, new PdfWriter(pdfStream, new WriterProperties().SetPdfVersion(PdfVersion.PDF_2_0)
-                    ), converterProperties);
-                return;
-            }
             ConvertToPdf(htmlStream, new PdfWriter(pdfStream), converterProperties);
         }
 

itext/itext.html2pdf/itext/html2pdf/HtmlConverter.cs

@@ -1 +1 @@
-05f7aade95c3730debd74a5d6b9a470a36c6f418
+2564cb2e17ed1d5d4b91cfa0cbf2ceaa971b37e9