Merge pull request #564 from fugerit-org/563-chore-fj-doc-mod-fop-fix-doc-creator-and-doc-producer-handling

fix: fj-doc-mod-fop, fix doc-creator and doc-producer handling #563

Author: fugerit79

CHANGELOG.md

@@ -11,6 +11,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - fj-doc-mod-fop, new mod-fop-xslt-debug property <https://github.com/fugerit-org/fj-doc/issues/560>
 
+### Fixed
+
+- fj-doc-mod-fop, fix doc-creator and doc-producer handling <https://github.com/fugerit-org/fj-doc/issues/563>
+
 ## [8.17.1] - 2025-10-28
 
 ### Added

fj-doc-guide/src/main/docs/asciidoc/chapters/00_2_release_notes.adoc

@@ -7,6 +7,7 @@ Whereas the link:https://github.com/fugerit-org/fj-doc/blob/main/CHANGELOG.md[CH
 ==== Unreleased
 
 - fj-doc-mod-fop, new mod-fop-xslt-debug property link:https://github.com/fugerit-org/fj-doc/issues/560[#560]
+- fj-doc-mod-fop, fix doc-creator and doc-producer handling link:https://github.com/fugerit-org/fj-doc/issues/563[#563]
 
 [#doc-release-notes-8-17-1]
 ==== Version 8.17.1 [2025-10-28]

fj-doc-mod-fop/src/main/java/org/fugerit/java/doc/mod/fop/PdfFopTypeHandler.java

@@ -185,8 +185,6 @@ private FopConfigWrap newFopWrap() throws ConfigException {
 		}
 		foUserAgent.setAccessibility( this.isAccessibility() );
 		foUserAgent.setKeepEmptyTags( this.isKeepEmptyTags() );
-		foUserAgent.setProducer( PRODUCER_DEFAULT );
-		foUserAgent.setCreator( VenusVersion.VENUS_CREATOR );
 		return new FopConfigWrap( fopFactory, foUserAgent );
 	}
 
@@ -226,6 +224,11 @@ private void xsltDebugCheck( DocBase docBase, byte[] xslContent, Transformer tra
         }
     }
 
+    private void setupMetadata( DocBase docBase, FOUserAgent foUserAgent ) {
+        foUserAgent.setProducer( StringUtils.valueWithDefault( docBase.getInfoDocProducer(), PRODUCER_DEFAULT ) );
+        foUserAgent.setCreator( StringUtils.valueWithDefault( docBase.getInfoDocCreator(), VenusVersion.VENUS_CREATOR  ) );
+    }
+
 	@SuppressWarnings("unchecked")
 	@Override
 	public void handle(DocInput docInput, DocOutput docOutput) throws Exception {
@@ -235,7 +238,9 @@ public void handle(DocInput docInput, DocOutput docOutput) throws Exception {
 			// the XML file which provides the input
 			StreamSource xmlSource = new StreamSource( new InputStreamReader( input, this.getCharset() ) );
 			FopConfigWrap fopWrap = this.fopWrapSupplier.get();
-			Fop fop = fopWrap.getFopFactory().newFop(MimeConstants.MIME_PDF, fopWrap.getFoUserAgent(), docOutput.getOs());
+            FOUserAgent foUserAgent = fopWrap.getFoUserAgent();
+            this.setupMetadata( docBase, foUserAgent);
+			Fop fop = fopWrap.getFopFactory().newFop(MimeConstants.MIME_PDF, foUserAgent, docOutput.getOs());
 			TransformerFactory factory = TransformerXML.newSafeTransformerFactory();
 			Transformer transformer = this.newTransformer( factory, docBase );
             this.xsltDebugCheck( docBase, xslContent, transformer );

fj-doc-mod-fop/src/test/resources/sample/doc_producer.xml

@@ -7,7 +7,8 @@
     <info name="doc-title">Apache FOP doc-producer</info>
     <info name="doc-subject">Integration test for doc-producer info attribure</info>
     <info name="doc-author">fugerit79</info>
-    <info name="doc-creator">My Creator</info>
+      <info name="doc-creator">My Creator</info>
+      <info name="doc-producer">My Producer</info>
     <footer-ext>
       <para align="center">Page ${currentPage}</para>
     </footer-ext>