Forms. Fix issue with inherited default appearance

DA shall be taken from AcroForm, if there is no parent.

DEVSIX-1677

Author: pavel-alay

forms/src/main/java/com/itextpdf/forms/fields/PdfFormField.java

@@ -1497,6 +1497,10 @@ public PdfString getDefaultAppearance() {
                 }
             }
         }
+        //DA is an inherited key, therefore AcroForm shall be checked if there is no parent or no DA in parent.
+        if (defaultAppearance == null) {
+            defaultAppearance = (PdfString) getAcroFormKey(PdfName.DA, PdfObject.STRING);
+        }
         return defaultAppearance;
     }
 
@@ -1885,9 +1889,7 @@ public boolean regenerateField() {
                 if (appearance == null) {
                     appearance = new PdfFormXObject(new Rectangle(0, 0, bBox.toRectangle().getWidth(), bBox.toRectangle().getHeight()));
                 }
-                if (matrix != null) {
-                    appearance.put(PdfName.Matrix, matrix);
-                }
+                appearance.put(PdfName.Matrix, matrix);
                 //Create text appearance
                 if (PdfName.Tx.equals(type)) {
                     if (!isMultiline()) {
@@ -2007,6 +2009,18 @@ public boolean regenerateField() {
         return true;
     }
 
+    private PdfObject getAcroFormKey(PdfName key, int type) {
+        PdfObject acroFormKey = null;
+        PdfDocument document = getDocument();
+        if (document != null) {
+            PdfDictionary acroFormDictionary = document.getCatalog().getPdfObject().getAsDictionary(PdfName.AcroForm);
+            if (acroFormDictionary != null) {
+                acroFormKey = acroFormDictionary.get(key);
+            }
+        }
+        return (acroFormKey != null && acroFormKey.getType() == type) ? acroFormKey : null;
+    }
+
     /**
      * According to spec (ISO-32000-1, 12.7.3.3) zero font size should interpretaded as auto size.
      */
@@ -2464,12 +2478,7 @@ protected Object[] getFontAndSize(PdfDictionary asNormal) throws IOException {
         PdfDictionary normalResources = null;
         PdfDictionary defaultResources = null;
         PdfDocument document = getDocument();
-        if (document != null) {
-            PdfDictionary acroformDictionary = document.getCatalog().getPdfObject().getAsDictionary(PdfName.AcroForm);
-            if (acroformDictionary != null) {
-                defaultResources = acroformDictionary.getAsDictionary(PdfName.DR);
-            }
-        }
+        defaultResources = (PdfDictionary) getAcroFormKey(PdfName.DR, PdfObject.DICTIONARY);
         if (asNormal != null) {
             normalResources = asNormal.getAsDictionary(PdfName.Resources);
         }

forms/src/test/java/com/itextpdf/forms/FormFieldFlatteningTest.java

@@ -79,11 +79,7 @@ public void formFlatteningTest01() throws IOException, InterruptedException {
 
         doc.close();
 
-        CompareTool compareTool = new CompareTool();
-        String errorMessage = compareTool.compareByContent(filename, sourceFolder + "cmp_formFlatteningTest01.pdf", destinationFolder, "diff_");
-        if (errorMessage != null) {
-            Assert.fail(errorMessage);
-        }
+        Assert.assertNull(new CompareTool().compareByContent(filename, sourceFolder + "cmp_formFlatteningTest01.pdf", destinationFolder, "diff_"));
     }
 
     @Test
@@ -105,11 +101,7 @@ public void formFlatteningTest_DefaultAppearanceGeneration_Rot0() throws IOExcep
 
             doc.close();
 
-            CompareTool compareTool = new CompareTool();
-            String errorMessage = compareTool.compareByContent(dest, cmp, destinationFolder, "diff_");
-            if (errorMessage != null) {
-                Assert.fail(errorMessage);
-            }
+            Assert.assertNull(new CompareTool().compareByContent(dest, cmp, destinationFolder, "diff_"));
         }
 
     }
@@ -133,11 +125,7 @@ public void formFlatteningTest_DefaultAppearanceGeneration_Rot90() throws IOExce
 
             doc.close();
 
-            CompareTool compareTool = new CompareTool();
-            String errorMessage = compareTool.compareByContent(dest, cmp, destinationFolder, "diff_");
-            if (errorMessage != null) {
-                Assert.fail(errorMessage);
-            }
+            Assert.assertNull(new CompareTool().compareByContent(dest, cmp, destinationFolder, "diff_"));
         }
 
     }
@@ -161,11 +149,7 @@ public void formFlatteningTest_DefaultAppearanceGeneration_Rot180() throws IOExc
 
             doc.close();
 
-            CompareTool compareTool = new CompareTool();
-            String errorMessage = compareTool.compareByContent(dest, cmp, destinationFolder, "diff_");
-            if (errorMessage != null) {
-                Assert.fail(errorMessage);
-            }
+            Assert.assertNull(new CompareTool().compareByContent(dest, cmp, destinationFolder, "diff_"));
         }
 
     }
@@ -189,12 +173,7 @@ public void formFlatteningTest_DefaultAppearanceGeneration_Rot270() throws IOExc
 
             doc.close();
 
-            CompareTool compareTool = new CompareTool();
-            String errorMessage = compareTool.compareByContent(dest, cmp, destinationFolder, "diff_");
-            if (errorMessage != null) {
-                Assert.fail(errorMessage);
-            }
+            Assert.assertNull(new CompareTool().compareByContent(dest, cmp, destinationFolder, "diff_"));
         }
-
     }
 }