From 1385818dc477bb73aea46203a5b11bc4d0fd55f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Juan=20Manuel=20M=C3=A9ndez=20Rey?= Date: Tue, 3 Nov 2026 17:01:39 +0100 Subject: [PATCH] FOP-3367: Use the user agent creation date for xmp:MetadataDate When a creation date is set with FOUserAgent.setCreationDate(), use it for xmp:MetadataDate too, so it matches xmp:CreateDate and /CreationDate. Without a creation date the current time is used, as before. --- .../fop/render/intermediate/IFRenderer.java | 3 +- .../fop/render/pdf/PDFRenderingUtil.java | 3 +- .../fop/pdf/PDFCreationDateTestCase.java | 71 +++++++++++++++++++ 3 files changed, 75 insertions(+), 2 deletions(-) create mode 100644 fop-core/src/test/java/org/apache/fop/pdf/PDFCreationDateTestCase.java diff --git a/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java b/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java index 075f94253cf..6132c86f1cf 100644 --- a/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java +++ b/fop-core/src/main/java/org/apache/fop/render/intermediate/IFRenderer.java @@ -545,7 +545,8 @@ private Metadata createDefaultDocumentMetadata() { } else { xmpBasic.setCreatorTool(Version.getVersion()); } - xmpBasic.setMetadataDate(new java.util.Date()); + java.util.Date creationDate = getUserAgent().getCreationDate(); + xmpBasic.setMetadataDate(creationDate != null ? creationDate : new java.util.Date()); if (getUserAgent().getCreationDate() != null) { xmpBasic.setCreateDate(getUserAgent().getCreationDate()); } else { diff --git a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java index 6590e7b3a7f..ddcb3fbb627 100644 --- a/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java +++ b/fop-core/src/main/java/org/apache/fop/render/pdf/PDFRenderingUtil.java @@ -262,7 +262,8 @@ public void renderXMPMetadata(XMPMetadata metadata) { fopXMP.mergeInto(docXMP, exclude); XMPBasicAdapter xmpBasic = XMPBasicSchema.getAdapter(docXMP); //Metadata was changed so update metadata date - xmpBasic.setMetadataDate(new java.util.Date()); + Date creationDate = userAgent.getCreationDate(); + xmpBasic.setMetadataDate(creationDate != null ? creationDate : new Date()); PDFMetadata.updateInfoFromMetadata(docXMP, pdfDoc.getInfo()); PDFMetadata pdfMetadata = pdfDoc.getFactory().makeMetadata( diff --git a/fop-core/src/test/java/org/apache/fop/pdf/PDFCreationDateTestCase.java b/fop-core/src/test/java/org/apache/fop/pdf/PDFCreationDateTestCase.java new file mode 100644 index 00000000000..da2267aeb5f --- /dev/null +++ b/fop-core/src/test/java/org/apache/fop/pdf/PDFCreationDateTestCase.java @@ -0,0 +1,71 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +/* $Id$ */ + +package org.apache.fop.pdf; + +import java.io.ByteArrayOutputStream; +import java.io.File; +import java.util.Date; +import java.util.TimeZone; + +import javax.xml.transform.Result; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.sax.SAXResult; +import javax.xml.transform.stream.StreamSource; + +import org.junit.Assert; +import org.junit.Test; + +import org.apache.xmlgraphics.util.DateFormatUtil; + +import org.apache.fop.apps.FOUserAgent; +import org.apache.fop.apps.Fop; +import org.apache.fop.apps.FopFactory; +import org.apache.fop.apps.MimeConstants; + +/** + * Checks that the creation date set on the user agent is used for the XMP metadata dates. + */ +public class PDFCreationDateTestCase { + + private static final Date CREATION_DATE = new Date(1000L * 1793491658L); + + @Test + public void testMetadataDateUsesCreationDate() throws Exception { + String pdf = new String(render(), "ISO-8859-1"); + String date = DateFormatUtil.formatISO8601(CREATION_DATE, TimeZone.getDefault()); + Assert.assertTrue(pdf, pdf.contains("" + date + "")); + Assert.assertTrue(pdf, pdf.contains("" + date + "")); + } + + private byte[] render() throws Exception { + FopFactory fopFactory = FopFactory.newInstance(new File(".").toURI()); + FOUserAgent userAgent = fopFactory.newFOUserAgent(); + userAgent.setCreationDate(CREATION_DATE); + ByteArrayOutputStream out = new ByteArrayOutputStream(); + Fop fop = fopFactory.newFop(MimeConstants.MIME_PDF, userAgent, out); + Transformer transformer = TransformerFactory.newInstance().newTransformer(); + Source src = new StreamSource(PDFCreationDateTestCase.class.getResource("PDFPageXMP.fo").openStream()); + Result res = new SAXResult(fop.getDefaultHandler()); + transformer.transform(src, res); + return out.toByteArray(); + } +}