Fix wrong loading of items in PdfNameTree

DEVSIX-1285

Author: LodrKumquat

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

@@ -98,10 +98,13 @@ public Map<String, PdfObject> getNames() {
                 Set<String> keys = new HashSet<>();
                 keys.addAll(items.keySet());
                 for (String key : keys) {
-                    PdfArray arr = getNameArray(items.get(key));
-                    if (arr != null) {
-                        items.put(key, arr);
-                    } else
+                    if (treeType.equals(PdfName.Dests)) {
+                        PdfArray arr = getDestArray(items.get(key));
+                        if (arr != null) {
+                            items.put(key, arr);
+                        } else
+                            items.remove(key);
+                    } else if (items.get(key) == null)
                         items.remove(key);
                 }
             }
@@ -112,15 +115,14 @@ public Map<String, PdfObject> getNames() {
             if (destinations != null) {
                 Set<PdfName> keys = destinations.keySet();
                 for (PdfName key : keys) {
-                    PdfArray array = getNameArray(destinations.get(key));
+                    PdfArray array = getDestArray(destinations.get(key));
                     if (array == null) {
                         continue;
                     }
                     items.put(key.getValue(), array);
                 }
             }
         }
-
         return items;
     }
 
@@ -254,7 +256,7 @@ private PdfString iterateItems(PdfDictionary dictionary, Map<String, PdfObject>
         return null;
     }
 
-    private PdfArray getNameArray(PdfObject obj) {
+    private PdfArray getDestArray(PdfObject obj) {
         if (obj == null)
             return null;
         if (obj.isArray())

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

@@ -0,0 +1,66 @@
+package com.itextpdf.kernel.pdf;
+
+import com.itextpdf.io.font.FontConstants;
+import com.itextpdf.io.util.UrlUtil;
+import com.itextpdf.kernel.colors.ColorConstants;
+import com.itextpdf.kernel.font.PdfFontFactory;
+import com.itextpdf.kernel.geom.Rectangle;
+import com.itextpdf.kernel.pdf.annot.PdfAnnotationAppearance;
+import com.itextpdf.kernel.pdf.canvas.PdfCanvas;
+import com.itextpdf.kernel.pdf.xobject.PdfFormXObject;
+import com.itextpdf.test.ExtendedITextTest;
+import com.itextpdf.test.annotations.type.IntegrationTest;
+import org.junit.Assert;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import java.io.IOException;
+import java.util.Map;
+
+@Category(IntegrationTest.class)
+public class PdfNameTreeTest extends ExtendedITextTest {
+
+    public static final String sourceFolder = "./src/test/resources/com/itextpdf/kernel/pdf/PdfNameTreeTest/";
+    public static final String destinationFolder = "./target/test/com/itextpdf/kernel/pdf/PdfNameTreeTest/";
+
+    @BeforeClass
+    public static void beforeClass() {
+        createOrClearDestinationFolder(destinationFolder);
+    }
+
+    @Test
+    public void EmbeddedFileAndJavascriptTest() throws IOException {
+        PdfDocument pdfDocument = new PdfDocument(new PdfReader(sourceFolder + "FileWithSingleAttachment.pdf"));
+        PdfNameTree embeddedFilesNameTree = pdfDocument.getCatalog().getNameTree(PdfName.EmbeddedFiles);
+        Map<String, PdfObject> objs = embeddedFilesNameTree.getNames();
+        PdfNameTree javascript = pdfDocument.getCatalog().getNameTree(PdfName.JavaScript);
+        Map<String, PdfObject> objs2 = javascript.getNames();
+        pdfDocument.close();
+        Assert.assertEquals(1, objs.size());
+        Assert.assertEquals(1, objs2.size());
+    }
+
+    @Test
+    public void AnnotationAppearanceTest() throws IOException {
+        PdfDocument pdfDocument = new PdfDocument(new PdfWriter(destinationFolder + "AnnotationAppearanceTest.pdf"));
+        PdfPage page = pdfDocument.addNewPage();
+        PdfCanvas canvas = new PdfCanvas(page);
+        canvas.setFillColor(ColorConstants.MAGENTA).beginText().setFontAndSize(PdfFontFactory.createFont(FontConstants.TIMES_ROMAN), 30)
+                .setTextMatrix(25, 500).showText("This file has AP key in Names dictionary").endText();
+        PdfArray array = new PdfArray();
+        array.add(new PdfString("normalAppearance"));
+        array.add(new PdfAnnotationAppearance().setState(PdfName.N, new PdfFormXObject(new Rectangle(50, 50 , 50, 50))).getPdfObject());
+
+        PdfDictionary dict = new PdfDictionary();
+        dict.put(PdfName.Names, array);
+        PdfDictionary dictionary = new PdfDictionary();
+        dictionary.put(PdfName.AP, dict);
+        pdfDocument.getCatalog().getPdfObject().put(PdfName.Names, dictionary);
+
+        PdfNameTree appearance = pdfDocument.getCatalog().getNameTree(PdfName.AP);
+        Map<String, PdfObject> objs = appearance.getNames();
+        pdfDocument.close();
+        Assert.assertEquals(1, objs.size());
+    }
+}