Return-Path: X-Original-To: apmail-camel-commits-archive@www.apache.org Delivered-To: apmail-camel-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EC98D18AA7 for ; Mon, 4 Apr 2016 21:40:56 +0000 (UTC) Received: (qmail 56304 invoked by uid 500); 4 Apr 2016 21:40:56 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 56257 invoked by uid 500); 4 Apr 2016 21:40:56 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 56248 invoked by uid 99); 4 Apr 2016 21:40:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 04 Apr 2016 21:40:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 9C9B0DFC6E; Mon, 4 Apr 2016 21:40:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bibryam@apache.org To: commits@camel.apache.org Message-Id: <2b68c828c29c4251b09af81bfadad6c4@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: camel git commit: Extend FOP component with headers to set rendererOptions in FOUserAgent Date: Mon, 4 Apr 2016 21:40:56 +0000 (UTC) Repository: camel Updated Branches: refs/heads/master aac97e1c0 -> 6dc4800cf Extend FOP component with headers to set rendererOptions in FOUserAgent Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6dc4800c Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6dc4800c Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6dc4800c Branch: refs/heads/master Commit: 6dc4800cfca530c051346357ca035d82b1bddaf1 Parents: aac97e1 Author: bibryam Authored: Mon Apr 4 22:40:46 2016 +0100 Committer: bibryam Committed: Mon Apr 4 22:40:46 2016 +0100 ---------------------------------------------------------------------- .../org/apache/camel/component/fop/FopConstants.java | 1 + .../java/org/apache/camel/component/fop/FopProducer.java | 11 +++++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6dc4800c/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopConstants.java ---------------------------------------------------------------------- diff --git a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopConstants.java b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopConstants.java index 8c699da..e4ab6f2 100644 --- a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopConstants.java +++ b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopConstants.java @@ -19,5 +19,6 @@ package org.apache.camel.component.fop; public interface FopConstants { String CAMEL_FOP_RENDER = "CamelFop.Render."; String CAMEL_FOP_ENCRYPT = "CamelFop.Encrypt."; + String CAMEL_FOP_RENDERER_OPTIONS = "CamelFop.RendererOptions."; String CAMEL_FOP_OUTPUT_FORMAT = "CamelFop.Output.Format"; } http://git-wip-us.apache.org/repos/asf/camel/blob/6dc4800c/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java index a6da1aa..dd77570 100644 --- a/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java +++ b/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java @@ -54,6 +54,7 @@ public class FopProducer extends DefaultProducer { Map headers = exchange.getIn().getHeaders(); setRenderParameters(userAgent, headers); setEncryptionParameters(userAgent, headers); + setUserAgentRendererOptions(userAgent, headers); String outputFormat = getOutputFormat(exchange); Source src = exchange.getIn().getBody(StreamSource.class); @@ -104,9 +105,15 @@ public class FopProducer extends DefaultProducer { } } + private void setUserAgentRendererOptions(FOUserAgent userAgent, Map headers) { + Map parameters = IntrospectionSupport.extractProperties(headers, FopConstants.CAMEL_FOP_RENDERER_OPTIONS); + if (!parameters.isEmpty()) { + userAgent.getRendererOptions().putAll(parameters); + } + } + private void setRenderParameters(FOUserAgent userAgent, Map headers) throws Exception { - Map parameters = IntrospectionSupport - .extractProperties(headers, FopConstants.CAMEL_FOP_RENDER); + Map parameters = IntrospectionSupport.extractProperties(headers, FopConstants.CAMEL_FOP_RENDER); if (!parameters.isEmpty()) { IntrospectionSupport.setProperties(userAgent, parameters); }