PDFBOX-5292: move validateNaming() to more appropriate position, revert preflight change

THausherr · THausherr · commit ded8b62edc31 · 2025-12-08T10:28:57.000Z
git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1930359 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java b/xmpbox/src/main/java/org/apache/xmpbox/xml/DomXmpParser.java
@@ -183,7 +183,6 @@ public XMPMetadata parse(InputStream input) throws XmpParsingException
         List<Element> descriptions = DomHelper.getElementChildren(rdfRdf);
         for (Element description : descriptions)
         {
-            PdfaExtensionHelper.validateNaming(xmp, description);
             parseSchemaExtensions(xmp, description);
         }
 
@@ -216,6 +215,10 @@ private void parseSchemaExtensions(final XMPMetadata xmp, final Element descript
                     .stream()
                     .filter(this::isSchemaExtensionProperty)
                     .collect(Collectors.toList());
+            if (!schemaExtensions.isEmpty())
+            {
+                PdfaExtensionHelper.validateNaming(xmp, description);
+            }
             for (final Element schemaExtension : schemaExtensions)
             {
                 final String namespace = schemaExtension.getNamespaceURI();

Original file line number	Diff line number	Diff line change
`@@ -183,7 +183,6 @@ public XMPMetadata parse(InputStream input) throws XmpParsingException`
`183`	`183`	`List<Element> descriptions = DomHelper.getElementChildren(rdfRdf);`
`184`	`184`	`for (Element description : descriptions)`
`185`	`185`	`{`
`186`		`- PdfaExtensionHelper.validateNaming(xmp, description);`
`187`	`186`	`parseSchemaExtensions(xmp, description);`
`188`	`187`	`}`
`189`	`188`
`@@ -216,6 +215,10 @@ private void parseSchemaExtensions(final XMPMetadata xmp, final Element descript`
`216`	`215`	`.stream()`
`217`	`216`	`.filter(this::isSchemaExtensionProperty)`
`218`	`217`	`.collect(Collectors.toList());`
	`218`	`+ if (!schemaExtensions.isEmpty())`
	`219`	`+ {`
	`220`	`+ PdfaExtensionHelper.validateNaming(xmp, description);`
	`221`	`+ }`
`219`	`222`	`for (final Element schemaExtension : schemaExtensions)`
`220`	`223`	`{`
`221`	`224`	`final String namespace = schemaExtension.getNamespaceURI();`