You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by cm...@apache.org on 2011/01/04 00:16:04 UTC
svn commit: r1054819 - in /camel/trunk/components/camel-csv/src:
main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java
test/resources/daltons-utf-8.csv
Author: cmueller
Date: Mon Jan 3 23:16:03 2011
New Revision: 1054819
URL: http://svn.apache.org/viewvc?rev=1054819&view=rev
Log:
CAMEL-3483: csv unmarshal and maybe other components uses default encoding
Added:
camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java (with props)
camel/trunk/components/camel-csv/src/test/resources/daltons-utf-8.csv
Modified:
camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
Modified: camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java?rev=1054819&r1=1054818&r2=1054819&view=diff
==============================================================================
--- camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java (original)
+++ camel/trunk/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java Mon Jan 3 23:16:03 2011
@@ -28,6 +28,7 @@ import java.util.Map;
import java.util.Set;
import org.apache.camel.Exchange;
+import org.apache.camel.converter.IOConverter;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.util.ExchangeHelper;
import org.apache.commons.csv.CSVParser;
@@ -58,7 +59,7 @@ public class CsvDataFormat implements Da
config.setDelimiter(delimiter.charAt(0));
}
- OutputStreamWriter out = new OutputStreamWriter(outputStream);
+ OutputStreamWriter out = new OutputStreamWriter(outputStream, IOConverter.getCharsetName(exchange));
CSVWriter csv = new CSVWriter(config);
csv.setWriter(out);
@@ -88,7 +89,7 @@ public class CsvDataFormat implements Da
}
public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
- InputStreamReader in = new InputStreamReader(inputStream);
+ InputStreamReader in = new InputStreamReader(inputStream, IOConverter.getCharsetName(exchange));
if (delimiter != null) {
strategy.setDelimiter(delimiter.charAt(0));
}
@@ -166,5 +167,4 @@ public class CsvDataFormat implements Da
}
}
}
-
-}
+}
\ No newline at end of file
Added: camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java?rev=1054819&view=auto
==============================================================================
--- camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java (added)
+++ camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java Mon Jan 3 23:16:03 2011
@@ -0,0 +1,71 @@
+/**
+ * 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.
+ */
+/**
+ * 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.dataformat.csv;
+
+import java.util.List;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ * @version $Revision: 938311 $
+ */
+public class CsvRouteCharsetTest extends CamelTestSupport {
+
+ @SuppressWarnings("unchecked")
+ @Test
+ public void testUnMarshal() throws Exception {
+ MockEndpoint endpoint = getMockEndpoint("mock:daltons");
+ endpoint.expectedMessageCount(1);
+ endpoint.assertIsSatisfied();
+
+ Exchange exchange = endpoint.getExchanges().get(0);
+ List<List<String>> data = (List<List<String>>) exchange.getIn().getBody();
+ assertEquals("Jäck Dalton", data.get(0).get(0));
+ assertEquals("Jöe Dalton", data.get(1).get(0));
+ assertEquals("Lücky Luke", data.get(2).get(0));
+ }
+
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ from("file:src/test/resources/?fileName=daltons-utf-8.csv&noop=true").
+ unmarshal().csv().
+ to("mock:daltons");
+ }
+ };
+ }
+}
\ No newline at end of file
Propchange: camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteCharsetTest.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: camel/trunk/components/camel-csv/src/test/resources/daltons-utf-8.csv
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-csv/src/test/resources/daltons-utf-8.csv?rev=1054819&view=auto
==============================================================================
--- camel/trunk/components/camel-csv/src/test/resources/daltons-utf-8.csv (added)
+++ camel/trunk/components/camel-csv/src/test/resources/daltons-utf-8.csv Mon Jan 3 23:16:03 2011
@@ -0,0 +1,3 @@
+Jäck Dalton, 115, mad at Averell
+Jöe Dalton, 105, calming Joe
+Lücky Luke, 120, capturing the Daltons