Author: bvahdat
Date: Wed May  1 15:13:35 2013
New Revision: 1478044

URL: http://svn.apache.org/r1478044
Log:
CAMEL-6284: FOPProducer should populate the existing headers properly.

Modified:
    
camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
    
camel/trunk/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java

Modified: 
camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java?rev=1478044&r1=1478043&r2=1478044&view=diff
==============================================================================
--- 
camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
 (original)
+++ 
camel/trunk/components/camel-fop/src/main/java/org/apache/camel/component/fop/FopProducer.java
 Wed May  1 15:13:35 2013
@@ -61,6 +61,9 @@ public class FopProducer extends Default
 
         OutputStream out = transform(userAgent, outputFormat, src);
         exchange.getOut().setBody(out);
+
+        // propagate headers
+        exchange.getOut().setHeaders(headers);
     }
 
     private String getOutputFormat(Exchange exchange) {

Modified: 
camel/trunk/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java
URL: 
http://svn.apache.org/viewvc/camel/trunk/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java?rev=1478044&r1=1478043&r2=1478044&view=diff
==============================================================================
--- 
camel/trunk/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java
 (original)
+++ 
camel/trunk/components/camel-fop/src/test/java/org/apache/camel/component/fop/FopComponentTest.java
 Wed May  1 15:13:35 2013
@@ -26,6 +26,7 @@ import org.apache.camel.builder.RouteBui
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.test.junit4.CamelTestSupport;
 import org.apache.pdfbox.pdmodel.PDDocument;
+import org.junit.Before;
 import org.junit.Test;
 
 public class FopComponentTest extends CamelTestSupport {
@@ -36,6 +37,14 @@ public class FopComponentTest extends Ca
     @Produce(uri = "direct:start")
     protected ProducerTemplate template;
 
+    @Override
+    @Before
+    public void setUp() throws Exception {
+        deleteDirectory("target/data");
+
+        super.setUp();
+    }
+
     @Test
     public void createPdfUsingXmlDataAndXsltTransformation() throws Exception {
         resultEndpoint.expectedMessageCount(1);
@@ -48,6 +57,10 @@ public class FopComponentTest extends Ca
         String pdfText = FopHelper.extractTextFrom(document);
         assertTrue(pdfText.contains("Project"));    //from xsl template
         assertTrue(pdfText.contains("John Doe"));   //from data xml
+
+        // assert on the header "foo" being populated
+        Exchange exchange = resultEndpoint.getReceivedExchanges().get(0);
+        assertEquals("Header value is lost!", "bar", 
exchange.getIn().getHeader("foo"));
     }
 
     @Override
@@ -56,6 +69,7 @@ public class FopComponentTest extends Ca
             public void configure() {
                 from("direct:start")
                         .to("xslt:xslt/template.xsl")
+                        .setHeader("foo", constant("bar"))
                         .to("fop:application/pdf")
                         .setHeader(Exchange.FILE_NAME, constant("result.pdf"))
                         .to("file:target/data")


Reply via email to