PDFBOX-6131: allow first char lower case in "pdfaProperty:valueType" for extension schemas + test

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1930828 13f79535-47bb-0310-9956-ffa450edef68

Author: THausherr

xmpbox/src/main/java/org/apache/xmpbox/xml/PdfaExtensionHelper.java

@@ -51,9 +51,11 @@
 public final class PdfaExtensionHelper
 {
 
-    public static final String CLOSED_CHOICE = "closed Choice of ";
+    private static final String CLOSED_CHOICE = "closed Choice of ";
+    private static final String CLOSED_CHOICE_U = "Closed Choice of ";
 
-    public static final String OPEN_CHOICE = "open Choice of ";
+    private static final String OPEN_CHOICE = "open Choice of ";
+    private static final String OPEN_CHOICE_U = "Open Choice of ";
 
     private PdfaExtensionHelper()
     {
@@ -263,19 +265,19 @@ private static PropertyType transformValueType(TypeMapping tm, String valueType)
             return TypeMapping.createPropertyType(Types.LangAlt, Cardinality.Simple);
         }
         // else all other cases
-        if (valueType.startsWith(CLOSED_CHOICE))
+        if (valueType.startsWith(CLOSED_CHOICE) || valueType.startsWith(CLOSED_CHOICE_U))
         {
             valueType = valueType.substring(CLOSED_CHOICE.length());
         }
-        else if (valueType.startsWith(OPEN_CHOICE))
+        else if (valueType.startsWith(OPEN_CHOICE) || valueType.startsWith(OPEN_CHOICE_U))
         {
             valueType = valueType.substring(OPEN_CHOICE.length());
         }
         int pos = valueType.indexOf(' ');
         Cardinality card = Cardinality.Simple;
         if (pos > 0)
         {
-            String scard = valueType.substring(0, pos);
+            String scard = valueType.substring(0, pos).toLowerCase();
             switch (scard)
             {
                 case "seq":

xmpbox/src/test/java/org/apache/xmpbox/xml/DomXmpParserTest.java

@@ -1396,4 +1396,17 @@ void testNoInstantiation() throws XmpParsingException
                 () -> xmpParser1.parse(s.getBytes(StandardCharsets.UTF_8)));
         assertEquals("Failed to instantiate DateType property with value 2019-05-02T22:03:5Z in xmp:CreateDate", ex.getMessage());
     }
+
+    @Test
+    void testPDFBox6131() throws IOException, XmpParsingException, BadFieldValueException
+    {
+        // Contains "Open Choice of Integer" instead of "open Choice of Integer"
+        try (InputStream is = DomXmpParser.class.getResourceAsStream("/org/apache/xmpbox/xml/PDFBOX-6131-0015675.xml"))
+        {
+            DomXmpParser xmpParser = new DomXmpParser();
+            XMPMetadata xmp = xmpParser.parse(is);
+            XMPSchema uaSchema2  = xmp.getSchema("http://www.aiim.org/pdfua/ns/id/");
+            assertEquals(1, uaSchema2.getIntegerPropertyValueAsSimple("part"));
+        }
+    }
 }