Repository: camel Updated Branches: refs/heads/camel-2.17.x e3adb2e3c -> 484707506
CAMEL-9860: csv dataformat - Should have quoteMode option in model Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3fcbad2b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3fcbad2b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3fcbad2b Branch: refs/heads/camel-2.17.x Commit: 3fcbad2bdd26f7f093d0f5b72a2641b6e9d9ee71 Parents: e3adb2e Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue Apr 12 13:49:35 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue Apr 12 14:00:22 2016 +0200 ---------------------------------------------------------------------- .../camel/model/dataformat/CsvDataFormat.java | 21 ++++- ...arshalAutogenColumnsSpringQuoteModeTest.java | 94 ++++++++++++++++++++ ...utogenColumnsSpringQuoteModeTest-context.xml | 54 +++++++++++ 3 files changed, 166 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3fcbad2b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java ---------------------------------------------------------------------- diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java index 83aeaa2..0d43eae 100644 --- a/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java +++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/CsvDataFormat.java @@ -76,7 +76,8 @@ public class CsvDataFormat extends DataFormatDefinition { private String recordSeparator; @XmlAttribute private Boolean skipHeaderRecord; - + @XmlAttribute + private String quoteMode; // Unmarshall options @XmlAttribute private Boolean lazyLoad; @@ -159,7 +160,10 @@ public class CsvDataFormat extends DataFormatDefinition { if (skipHeaderRecord != null) { setProperty(camelContext, dataFormat, "skipHeaderRecord", skipHeaderRecord); } - + if (quoteMode != null) { + setProperty(camelContext, dataFormat, "quoteMode", quoteMode); + } + // Unmarshall options if (lazyLoad != null) { setProperty(camelContext, dataFormat, "lazyLoad", lazyLoad); @@ -391,7 +395,18 @@ public class CsvDataFormat extends DataFormatDefinition { this.skipHeaderRecord = skipHeaderRecord; } - public Boolean getLazyLoad() { + public String getQuoteMode() { + return quoteMode; + } + + /** + * Sets the quote mode + */ + public void setQuoteMode(String quoteMode) { + this.quoteMode = quoteMode; + } + + public Boolean getLazyLoad() { return lazyLoad; } http://git-wip-us.apache.org/repos/asf/camel/blob/3fcbad2b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java new file mode 100644 index 0000000..290c20d --- /dev/null +++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest.java @@ -0,0 +1,94 @@ +/** + * 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.EndpointInject; +import org.apache.camel.component.mock.MockEndpoint; +import org.apache.camel.test.spring.CamelSpringTestSupport; +import org.junit.Test; +import org.springframework.context.support.ClassPathXmlApplicationContext; + +/** + * Spring based integration test for the <code>CsvDataFormat</code> demonstrating the usage of + * the <tt>autogenColumns</tt>, <tt>configRef</tt> and <tt>strategyRef</tt> options. + */ + +public class CsvMarshalAutogenColumnsSpringQuoteModeTest extends CamelSpringTestSupport { + + @EndpointInject(uri = "mock:result") + private MockEndpoint result; + + @EndpointInject(uri = "mock:result2") + private MockEndpoint result2; + + @Test + public void retrieveColumnsWithAutogenColumnsFalseAndItemColumnsSet() throws Exception { + result.expectedMessageCount(1); + + template.sendBody("direct:start", createBody()); + + result.assertIsSatisfied(); + + String body = result.getReceivedExchanges().get(0).getIn().getBody(String.class); + String[] lines = body.split(LS); + assertEquals(2, lines.length); + assertEquals("\"Camel in Action\"", lines[0].trim()); + assertEquals("\"ActiveMQ in Action\"", lines[1].trim()); + } + + @Test + public void retrieveColumnsWithAutogenColumnsFalseAndOrderIdAmountColumnsSet() throws Exception { + result2.expectedMessageCount(1); + + template.sendBody("direct:start2", createBody()); + + result2.assertIsSatisfied(); + + String body = result2.getReceivedExchanges().get(0).getIn().getBody(String.class); + String[] lines = body.split(LS); + assertEquals(2, lines.length); + assertEquals("123|1", lines[0].trim()); + assertEquals("124|2", lines[1].trim()); + } + + private static List<Map<String, Object>> createBody() { + 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); + return data; + } + + @Override + protected ClassPathXmlApplicationContext createApplicationContext() { + return new ClassPathXmlApplicationContext("org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest-context.xml"); + } +} \ No newline at end of file http://git-wip-us.apache.org/repos/asf/camel/blob/3fcbad2b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest-context.xml ---------------------------------------------------------------------- diff --git a/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest-context.xml b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest-context.xml new file mode 100644 index 0000000..aaed0af --- /dev/null +++ b/components/camel-csv/src/test/resources/org/apache/camel/dataformat/csv/CsvMarshalAutogenColumnsSpringQuoteModeTest-context.xml @@ -0,0 +1,54 @@ +<?xml version="1.0" encoding="UTF-8"?> + <!-- + 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. + --> +<beans xmlns="http://www.springframework.org/schema/beans"; + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; + xsi:schemaLocation=" + http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd + http://camel.apache.org/schema/spring http://camel.apache.org/schema/spring/camel-spring.xsd";> + + <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";> + + <route> + <from uri="direct:start"/> + <marshal> + <csv delimiter="|" skipHeaderRecord="true" quoteMode="ALL"> + <header>item</header> + </csv> + </marshal> + <convertBodyTo type="java.lang.String" /> + <to uri="mock:result" /> + </route> + + <route> + <from uri="direct:start2" /> + <marshal> + <csv formatRef="excelFormat" delimiter="|" skipHeaderRecord="true" > + <header>orderId</header> + <header>amount</header> + </csv> + </marshal> + <convertBodyTo type="java.lang.String" /> + <to uri="mock:result2" /> + </route> + + </camelContext> + + <bean id="excelFormat" class="org.springframework.beans.factory.config.FieldRetrievingFactoryBean"> + <property name="staticField" value="org.apache.commons.csv.CSVFormat.EXCEL"/> + </bean> + +</beans> \ No newline at end of file
