Author: tilman
Date: Thu Nov 27 15:29:22 2025
New Revision: 1930034
Log:
PDFBOX-2378: add namespace declaration of simple properties to rdf element to
avoid them getting lost in serialization
Modified:
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/XmpSerializer.java
pdfbox/branches/2.0/xmpbox/src/test/java/org/apache/xmpbox/parser/DeserializationTest.java
Modified:
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/XmpSerializer.java
==============================================================================
---
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/XmpSerializer.java
Thu Nov 27 15:29:17 2025 (r1930033)
+++
pdfbox/branches/2.0/xmpbox/src/main/java/org/apache/xmpbox/xml/XmpSerializer.java
Thu Nov 27 15:29:22 2025 (r1930034)
@@ -56,6 +56,7 @@ public class XmpSerializer
private final TransformerFactory transformerFactory;
private final DocumentBuilder documentBuilder;
+ private Element rdf;
private boolean parseTypeResourceForLi = true;
@@ -94,7 +95,7 @@ public class XmpSerializer
{
Document doc = documentBuilder.newDocument();
// fill document
- Element rdf = createRdfElement(doc, metadata, withXpacket);
+ rdf = createRdfElement(doc, metadata, withXpacket);
for (XMPSchema schema : metadata.getAllSchemas())
{
rdf.appendChild(serializeSchema(doc, schema));
@@ -166,6 +167,13 @@ public class XmpSerializer
attribute.getValue());
}
}
+
+ // PDFBOX-2378 part 2: add namespace declaration to the top
+ if (!field.getPrefix().isEmpty() && field.getNamespace() !=
null && !field.getNamespace().isEmpty())
+ {
+ rdf.setAttributeNS(XMLConstants.XMLNS_ATTRIBUTE_NS_URI,
"xmlns:" + field.getPrefix(), field.getNamespace());
+ }
+
parent.appendChild(esimple);
}
else if (field instanceof ArrayProperty)
@@ -304,11 +312,11 @@ public class XmpSerializer
doc.appendChild(endXPacket);
}
// rdf element
- Element rdf = doc.createElementNS(XmpConstants.RDF_NAMESPACE,
"rdf:RDF");
+ Element rdfElement = doc.createElementNS(XmpConstants.RDF_NAMESPACE,
"rdf:RDF");
// rdf.setAttributeNS(XMPSchema.NS_NAMESPACE, qualifiedName, value)
- xmpmeta.appendChild(rdf);
+ xmpmeta.appendChild(rdfElement);
// return the rdf element where all will be put
- return rdf;
+ return rdfElement;
}
/**
@@ -336,4 +344,4 @@ public class XmpSerializer
// save
transformer.transform(source, result);
}
-}
+}
\ No newline at end of file
Modified:
pdfbox/branches/2.0/xmpbox/src/test/java/org/apache/xmpbox/parser/DeserializationTest.java
==============================================================================
---
pdfbox/branches/2.0/xmpbox/src/test/java/org/apache/xmpbox/parser/DeserializationTest.java
Thu Nov 27 15:29:17 2025 (r1930033)
+++
pdfbox/branches/2.0/xmpbox/src/test/java/org/apache/xmpbox/parser/DeserializationTest.java
Thu Nov 27 15:29:22 2025 (r1930034)
@@ -90,7 +90,7 @@ public class DeserializationTest
{
InputStream is =
DomXmpParser.class.getResourceAsStream("/org/apache/xmpbox/parser/structured_recursive.xml");
XMPMetadata metadata = xdb.parse(is);
- checkTransform(metadata,
"50429052370059903229869639943824137435756655804864824611365505219590816799783");
+ checkTransform(metadata,
"52753264982056308826419701767667619100664406974698584945629426171445624909200",
metadata.getAllSchemas().size());
is.close();
}
@@ -99,7 +99,7 @@ public class DeserializationTest
{
InputStream is =
DomXmpParser.class.getResourceAsStream("/org/apache/xmpbox/parser/empty_list.xml");
XMPMetadata metadata = xdb.parse(is);
- checkTransform(metadata,
"92757984740574362800045336947395134346147179161385043989715484359442690118913");
+ checkTransform(metadata,
"19567447256605061134904612869562878052777123273535814661244629430271579345577",
metadata.getAllSchemas().size());
is.close();
}
@@ -110,7 +110,7 @@ public class DeserializationTest
XMPMetadata metadata = xdb.parse(is);
DublinCoreSchema dc = metadata.getDublinCoreSchema();
dc.getCreatorsProperty();
- checkTransform(metadata,
"84846877440303452108560435796840772468446174326989274262473618453524301429629");
+ checkTransform(metadata,
"39450703080437563739186076111811684356424147071014681699119272065568305393521",
metadata.getAllSchemas().size());
is.close();
}
@@ -130,7 +130,7 @@ public class DeserializationTest
{
InputStream is =
DomXmpParser.class.getResourceAsStream("/org/apache/xmpbox/parser/AltBagSeqTest.xml");
XMPMetadata metadata=xdb.parse(is);
- checkTransform(metadata,
"16805992283807186369849610414335227396239089071611806706387795179375897398118");
+ checkTransform(metadata,
"19154431745733679891721944365143324348437445906324353036103478292448653362772",
metadata.getAllSchemas().size());
is.close();
}
@@ -173,7 +173,7 @@ public class DeserializationTest
Assert.assertEquals("JPEG", thumb.getFormat());
Assert.assertEquals("/9j/4AAQSkZJRgABAgEASABIAAD", thumb.getImage());
- checkTransform(metadata,
"29120813843205587378639665706339183422557956085575883885304382528664692315203");
+ checkTransform(metadata,
"84558386150683037967795120526515137256954964034058806864845109667021390825020",
metadata.getAllSchemas().size());
is.close();
}
@@ -373,7 +373,7 @@ public class DeserializationTest
XMPBasicSchema basic = metadata.getXMPBasicSchema();
Assert.assertNotNull(basic.getCreateDate());
- checkTransform(metadata,
"18065297971979344549773207273794555094175502580946345976611821901439849242965");
+ checkTransform(metadata,
"103011318952861241491609772230618389876889507758821590919505444434501582047075",
metadata.getAllSchemas().size());
is.close();
}
@@ -389,12 +389,12 @@ public class DeserializationTest
// check creator tool
Assert.assertEquals("Canon
",metadata.getXMPBasicSchema().getCreatorTool());
- checkTransform(metadata,
"65475542891943378255730260794798768587695617138297196920293698476028940113080");
+ checkTransform(metadata,
"35040104785033687813052387728441520994588808120158942942660631178163542677230",
metadata.getAllSchemas().size());
is.close();
}
@Test
- public void testMetadataParsing() throws TransformerException,
NoSuchAlgorithmException, UnsupportedEncodingException, IOException
+ public void testMetadataParsing() throws TransformerException,
NoSuchAlgorithmException, UnsupportedEncodingException, IOException,
XmpParsingException
{
XMPMetadata metadata = XMPMetadata.createXMPMetadata();
@@ -408,7 +408,7 @@ public class DeserializationTest
pdf.setProducer("Producer");
pdf.setPDFVersion("1.4");
- checkTransform(metadata,
"90022311886271402508155234494196354960301469636090129252744270615851988530557");
+ checkTransform(metadata,
"24727341753942351260821151680330022244742411666459385225917195999704816908515",
metadata.getAllSchemas().size());
}
/**
@@ -431,18 +431,19 @@ public class DeserializationTest
+ " </rdf:RDF>\n"
+ "</x:xmpmeta>\n"
+ "<?xpacket end=\"w\"?>";
- XMPMetadata xmp = xdb.parse(xmpmeta.getBytes("UTF-8"));
- checkTransform(xmp,
"8175296932768628269367133054275876764131784758539061072921527253098102430315");
+ XMPMetadata metadata = xdb.parse(xmpmeta.getBytes("UTF-8"));
+ checkTransform(metadata,
"114563613226112098345006389295317658957506710850378716324758103164733276333281",
metadata.getAllSchemas().size());
}
- private void checkTransform(XMPMetadata metadata, String expected)
- throws TransformerException, NoSuchAlgorithmException,
UnsupportedEncodingException, IOException
+ private void checkTransform(XMPMetadata metadata, String expected, int
expectedSchemaCount)
+ throws TransformerException, NoSuchAlgorithmException,
UnsupportedEncodingException, IOException, XmpParsingException
{
serializer.serialize(metadata, baos, true);
String replaced = baos.toString("UTF-8").replace("\r\n", "\n");
byte[] ba = replaced.getBytes("UTF-8");
byte[] digest = MessageDigest.getInstance("SHA-256").digest(ba);
String result = new BigInteger(1, digest).toString();
- assertEquals("output:\n" + replaced, expected, result);
+ assertEquals("output:\n" + replaced, expected, result);XMPMetadata xmp
= xdb.parse(baos.toByteArray()); // tests round trip
+ assertEquals(expectedSchemaCount, xmp.getAllSchemas().size());
}
}
