Change how annot tag applied for UA2 in addAnnotation method

DEVSIX-8807

Author: Alexandr Pliushchou

kernel/src/main/java/com/itextpdf/kernel/pdf/PdfPage.java

@@ -889,12 +889,8 @@ public PdfPage addAnnotation(int index, PdfAnnotation annotation, boolean tagAnn
                         // "Annot" tag was added starting from PDF 1.5
                         && PdfVersion.PDF_1_4.compareTo(getDocument().getPdfVersion()) < 0) {
 
-                    if (PdfVersion.PDF_2_0.compareTo(getDocument().getPdfVersion()) > 0) {
-                        if (!(annotation instanceof PdfWidgetAnnotation) && !(annotation instanceof PdfLinkAnnotation)
-                                && !(annotation instanceof PdfPrinterMarkAnnotation)) {
-                            tagPointer.addTag(StandardRoles.ANNOT);
-                        }
-                    } else if (annotation instanceof PdfMarkupAnnotation) {
+                    if (!(annotation instanceof PdfWidgetAnnotation) && !(annotation instanceof PdfLinkAnnotation)
+                            && !(annotation instanceof PdfPrinterMarkAnnotation)) {
                         tagPointer.addTag(StandardRoles.ANNOT);
                     }
                 }

kernel/src/test/java/com/itextpdf/kernel/pdf/PdfPageTest.java

@@ -25,9 +25,11 @@ This file is part of the iText (R) project.
 import com.itextpdf.io.source.ByteArrayOutputStream;
 import com.itextpdf.kernel.geom.Rectangle;
 import com.itextpdf.kernel.pdf.annot.PdfAnnotation;
+import com.itextpdf.kernel.pdf.annot.PdfPopupAnnotation;
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.test.ExtendedITextTest;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collections;
@@ -168,6 +170,31 @@ public void setTrimBoxTest() {
         Assertions.assertTrue(pageDictionary.isModified());
     }
 
+    @Test
+    public void addAnnotationAnnotTagPDF2Test() throws IOException {
+        byte[] docBytes;
+        try (ByteArrayOutputStream outputStream = new ByteArrayOutputStream()) {
+            try (PdfDocument doc = new PdfDocument(new PdfWriter(outputStream,
+                    new WriterProperties().setPdfVersion(PdfVersion.PDF_2_0)))) {
+                doc.setTagged();
+                PdfPage page = new PdfPage(doc);
+                PdfPopupAnnotation annot = new PdfPopupAnnotation(new Rectangle(100, 100, 100, 100));
+                annot.setName(new PdfString("this is a pop up"));
+                page.addAnnotation(annot);
+            }
+            docBytes = outputStream.toByteArray();
+        }
+
+        try (PdfDocument docReopen = new PdfDocument(new PdfReader(new ByteArrayInputStream(docBytes)))) {
+            PdfDictionary structTreeRoot = docReopen.getCatalog().getPdfObject().getAsDictionary(PdfName.StructTreeRoot);
+            PdfDictionary structElem = ((PdfDictionary) structTreeRoot.getAsArray(PdfName.K).get(0)).
+                    getAsDictionary(PdfName.K);
+            Assertions.assertEquals(PdfName.Annot, structElem.getAsName(PdfName.S));
+            Assertions.assertEquals(new PdfString("this is a pop up"), structElem.getAsDictionary(PdfName.K).
+                    getAsDictionary(PdfName.Obj).getAsString(PdfName.NM));
+        }
+    }
+
     /**
      * Simulates indirect state of object making sure it is not marked as modified.
      *

layout/src/test/java/com/itextpdf/layout/PdfUA2AnnotationsTest.java

@@ -61,7 +61,6 @@ This file is part of the iText (R) project.
 import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
 import com.itextpdf.kernel.pdf.filespec.PdfFileSpec;
 import com.itextpdf.kernel.pdf.tagging.StandardRoles;
-import com.itextpdf.kernel.pdf.tagutils.TagTreePointer;
 import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
 import com.itextpdf.kernel.utils.CompareTool;
 import com.itextpdf.kernel.xmp.XMPException;
@@ -217,9 +216,9 @@ public void pdfUA2RubberStampNoContentsAnnotationsTest() throws IOException, XMP
     }
 
     @Test
-    //TODO DEVSIX-8807 Kernel: addAnnotation method doesn't annotate content elements with Annot tag when PDF version is 2.0
-    public void pdfUA2ScreenAnnotationsTest() throws IOException, XMPException {
+    public void pdfUA2ScreenAnnotationsTest() throws IOException, XMPException, InterruptedException {
         String outFile = DESTINATION_FOLDER + "pdfuaScreenAnnotationTest.pdf";
+        String cmpFile = SOURCE_FOLDER + "cmp_pdfuaScreenAnnotationTest.pdf";
 
         try (PdfDocument pdfDocument = new PdfDocument(
                 new PdfWriter(outFile, new WriterProperties().setPdfVersion(PdfVersion.PDF_2_0)))) {
@@ -230,7 +229,7 @@ public void pdfUA2ScreenAnnotationsTest() throws IOException, XMPException {
             pdfPage.addAnnotation(screen);
             pdfPage.flush();
         }
-        new VeraPdfValidator().validateFailure(outFile);// Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
+        compareAndValidate(outFile, cmpFile);
     }
 
     @Test
@@ -319,9 +318,9 @@ public void pdfUA2RedactionNoContentsAnnotationsTest() throws IOException, XMPEx
     }
 
     @Test
-    //TODO DEVSIX-8807 Kernel: addAnnotation method doesn't annotate content elements with Annot tag when PDF version is 2.0
     public void pdfUA23DAnnotationsTest() throws IOException, XMPException, InterruptedException {
         String outFile = DESTINATION_FOLDER + "pdfua3DAnnotationTest.pdf";
+        String cmpFile = SOURCE_FOLDER + "cmp_pdfua3DAnnotationTest.pdf";
 
         try (PdfDocument pdfDocument = new PdfDocument(
                 new PdfWriter(outFile, new WriterProperties().setPdfVersion(PdfVersion.PDF_2_0)))) {
@@ -332,7 +331,7 @@ public void pdfUA23DAnnotationsTest() throws IOException, XMPException, Interrup
 
             pdfPage.flush();
         }
-        new VeraPdfValidator().validateFailure(outFile);// Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
+        compareAndValidate(outFile, cmpFile);
     }
 
     @Test
@@ -464,9 +463,9 @@ public void pdfUA2AltContentDiffAnnotationTest()
     }
 
     @Test
-    //TODO DEVSIX-8807 Kernel: addAnnotation method doesn't annotate content elements with Annot tag when PDF version is 2.0
     public void pdfUA2TabAnnotationsTest() throws IOException, XMPException, InterruptedException {
         String outFile = DESTINATION_FOLDER + "pdfuaMultipleAnnotsTabAnnotationTest.pdf";
+        String cmpFile = SOURCE_FOLDER + "cmp_pdfuaMultipleAnnotsTabAnnotationTest.pdf";
 
         try (PdfDocument pdfDocument = new PdfDocument(
                 new PdfWriter(outFile, new WriterProperties().setPdfVersion(PdfVersion.PDF_2_0)))) {
@@ -484,7 +483,7 @@ public void pdfUA2TabAnnotationsTest() throws IOException, XMPException, Interru
                 Assertions.assertEquals(PdfName.S, pageT);
             }
         }
-        new VeraPdfValidator().validateFailure(outFile);// Android-Conversion-Skip-Line (TODO DEVSIX-7377 introduce pdf\a validation on Android)
+        compareAndValidate(outFile, cmpFile);
     }
 
     @Test