Author: davsclaus
Date: Thu Jan 21 11:44:33 2010
New Revision: 901661
URL: http://svn.apache.org/viewvc?rev=901661&view=rev
Log:
CAMEL-2387: Fixed file converter not picking up charset set on Exchange for
example from a convertBodyTo.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java?rev=901661&r1=901660&r2=901661&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/file/GenericFileConverter.java
Thu Jan 21 11:44:33 2010
@@ -59,9 +59,9 @@
@Converter
public static String convertToString(GenericFile<?> file, Exchange
exchange) {
if (exchange != null) {
- return
exchange.getContext().getTypeConverter().convertTo(String.class,
file.getBody());
+ return
exchange.getContext().getTypeConverter().convertTo(String.class, exchange,
file.getBody());
} else {
- // should revert to fallback converter if we dont have an exchange
+ // should revert to fallback converter if we don't have an exchange
return null;
}
}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java?rev=901661&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java
Thu Jan 21 11:44:33 2010
@@ -0,0 +1,90 @@
+/**
+ * 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;
+import org.apache.camel.util.ObjectHelper;
+
+/**
+ * @version $Revision$
+ */
+public class FileConvertBodyToUTF8Test extends ContextTestSupport {
+
+ private byte[] body;
+
+ @Override
+ protected void setUp() throws Exception {
+ deleteDirectory("target/utf8");
+ super.setUp();
+
+ // include a UTF-8 char in the text \u0E08 is a Thai elephant
+ body = "Hello Thai Elephant \u0E08".getBytes("UTF-8");
+
+ template.sendBodyAndHeader("file://target/utf8", body,
Exchange.FILE_NAME, "utf8.txt");
+ }
+
+ @Override
+ public boolean isUseRouteBuilder() {
+ return false;
+ }
+
+ public void testFileUTF8() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("file://target/utf8")
+ .convertBodyTo(String.class, "UTF-8")
+ .to("mock:result");
+ }
+ });
+ context.start();
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ assertMockEndpointsSatisfied();
+
+ byte[] data =
mock.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
+ boolean same = ObjectHelper.equal(body, data);
+ assertTrue("Should be same byte data", same);
+ }
+
+ public void testFileUTF8ConvertDefaultCharset() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("file://target/utf8")
+ .convertBodyTo(String.class)
+ .to("mock:result");
+ }
+ });
+ context.start();
+
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ assertMockEndpointsSatisfied();
+
+ byte[] data =
mock.getReceivedExchanges().get(0).getIn().getBody(byte[].class);
+ boolean same = ObjectHelper.equal(body, data);
+ assertTrue("Should NOT be same byte data", same);
+ }
+
+}
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConvertBodyToUTF8Test.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
