Author: davsclaus Date: Wed Aug 24 08:43:25 2011 New Revision: 1161010 URL: http://svn.apache.org/viewvc?rev=1161010&view=rev Log: CAMEL-4370: Fixed issue with file consumer preserving existing headers when binding to exchange, so for example move done option can use custom headers.
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileMoveDoneCustomHeaderTest.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java?rev=1161010&r1=1161009&r2=1161010&view=diff ============================================================================== --- camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java (original) +++ camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFile.java Wed Aug 24 08:43:25 2011 @@ -18,6 +18,7 @@ package org.apache.camel.component.file; import java.io.File; import java.util.Date; +import java.util.Map; import org.apache.camel.Exchange; import org.apache.camel.util.FileUtil; @@ -93,10 +94,25 @@ public class GenericFile<T> { * Bind this GenericFile to an Exchange */ public void bindToExchange(Exchange exchange) { + Map<String, Object> headers; + exchange.setProperty(FileComponent.FILE_EXCHANGE_FILE, this); - GenericFileMessage<T> in = new GenericFileMessage<T>(this); - exchange.setIn(in); - populateHeaders(in); + GenericFileMessage<T> msg = new GenericFileMessage<T>(this); + if (exchange.hasOut()) { + headers = exchange.getOut().hasHeaders() ? exchange.getOut().getHeaders() : null; + exchange.setOut(msg); + } else { + headers = exchange.getIn().hasHeaders() ? exchange.getIn().getHeaders() : null; + exchange.setIn(msg); + } + + // preserve any existing (non file) headers, before we re-populate headers + if (headers != null) { + msg.setHeaders(headers); + // remove any file related headers, as we will re-populate file headers + msg.removeHeaders("CamelFile*"); + } + populateHeaders(msg); } /** Added: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileMoveDoneCustomHeaderTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileMoveDoneCustomHeaderTest.java?rev=1161010&view=auto ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileMoveDoneCustomHeaderTest.java (added) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FromFileMoveDoneCustomHeaderTest.java Wed Aug 24 08:43:25 2011 @@ -0,0 +1,59 @@ +/** + * 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. + */ +package org.apache.camel.component.file; + +import org.apache.camel.ContextTestSupport; +import org.apache.camel.Exchange; +import org.apache.camel.builder.RouteBuilder; +import org.apache.camel.component.mock.MockEndpoint; + +/** + * + */ +public class FromFileMoveDoneCustomHeaderTest extends ContextTestSupport { + + @Override + protected void setUp() throws Exception { + deleteDirectory("target/inbox"); + deleteDirectory("target/outbox"); + super.setUp(); + } + + public void testMoveDoneCustomHeader() throws Exception { + MockEndpoint mock = getMockEndpoint("mock:result"); + mock.expectedMessageCount(1); + mock.expectedFileExists("target/outbox/hello.txt"); + mock.expectedFileExists("target/inbox/dones/mydone.txt"); + + template.sendBodyAndHeader("file:target/inbox", "Hello World", Exchange.FILE_NAME, "hello.txt"); + + assertMockEndpointsSatisfied(); + } + + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("file:target/inbox?move=${header.bar}") + .setHeader("bar", constant("dones/mydone.txt")) + .transform(constant("Bye World")) + .to("mock:result", "file:target/outbox"); + } + }; + } +}