You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2009/09/13 11:40:20 UTC
svn commit: r814293 - in /camel/trunk/components/camel-csv/src:
main/java/org/apache/camel/dataformat/csv/CsvDataFormat.java
test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
Author: davsclaus
Date: Sun Sep 13 09:40:19 2009
New Revision: 814293
URL: http://svn.apache.org/viewvc?rev=814293&view=rev
Log:
CAMEL-2006: camel-csv marshal now supports List<Map> instead of only Map to be able to marshal multiple rows.
Added:
camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java (with props)
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=814293&r1=814292&r2=814293&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 Sun Sep 13 09:40:19 2009
@@ -20,6 +20,7 @@
import java.io.InputStreamReader;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
+import java.io.Writer;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -55,22 +56,35 @@
public void marshal(Exchange exchange, Object object, OutputStream outputStream) throws Exception {
ObjectHelper.notNull(config, "config");
- Map map = ExchangeHelper.convertToMandatoryType(exchange, Map.class, object);
OutputStreamWriter out = new OutputStreamWriter(outputStream);
+ CSVWriter csv = new CSVWriter(config);
+ csv.setWriter(out);
+
try {
- if (autogenColumns) {
- // no specific config has been set so lets add fields
- Set set = map.keySet();
- updateFieldsInConfig(set, exchange);
+ List list = ExchangeHelper.convertToType(exchange, List.class, object);
+ if (list != null) {
+ for (Object child : list) {
+ Map row = ExchangeHelper.convertToMandatoryType(exchange, Map.class, child);
+ doMarshalRecord(exchange, row, out, csv);
+ }
+ } else {
+ Map row = ExchangeHelper.convertToMandatoryType(exchange, Map.class, object);
+ doMarshalRecord(exchange, row, out, csv);
}
- CSVWriter writer = new CSVWriter(config);
- writer.setWriter(out);
- writer.writeRecord(map);
} finally {
out.close();
}
}
+ private void doMarshalRecord(Exchange exchange, Map row, Writer out, CSVWriter csv) throws Exception {
+ if (autogenColumns) {
+ // no specific config has been set so lets add fields
+ Set set = row.keySet();
+ updateFieldsInConfig(set, exchange);
+ }
+ csv.writeRecord(row);
+ }
+
public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
InputStreamReader in = new InputStreamReader(inputStream);
try {
Added: camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java?rev=814293&view=auto
==============================================================================
--- camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java (added)
+++ camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java Sun Sep 13 09:40:19 2009
@@ -0,0 +1,76 @@
+/**
+ * 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.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+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$
+ */
+public class CsvMarshalTest extends CamelTestSupport {
+
+ @Test
+ public void testCsvMarshal() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
+ List<Map<String, Object>> data = new ArrayList<Map<String, Object>>();
+
+ Map<String, Object> row1 = new LinkedHashMap<String, Object>();
+ row1.put("orderId", 123);
+ row1.put("item", "Camel in Action");
+ row1.put("amount", 1);
+ data.add(row1);
+
+ Map<String, Object> row2 = new LinkedHashMap<String, Object>();
+ row2.put("orderId", 124);
+ row2.put("item", "ActiveMQ in Action");
+ row2.put("amount", 2);
+ data.add(row2);
+
+ template.sendBody("direct:toCsv", data);
+
+ assertMockEndpointsSatisfied();
+
+ String body = mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ String[] lines = body.split("\n");
+ assertEquals("There should be 2 rows", 2, lines.length);
+ assertEquals("123,Camel in Action,1", lines[0]);
+ assertEquals("124,ActiveMQ in Action,2", lines[1]);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:toCsv")
+ .marshal().csv()
+ .convertBodyTo(String.class)
+ .to("mock:result");
+ }
+ };
+ }
+}
Propchange: camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date