Repository: camel Updated Branches: refs/heads/master 158b8bb68 -> 67b2e6927
CAMEL-10110: Solved removal of regexp escape char from HEADER Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/67b2e692 Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/67b2e692 Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/67b2e692 Branch: refs/heads/master Commit: 67b2e69274335953d4c56be00818cbaf134f276b Parents: 158b8bb Author: Arno Noordover <anoordo...@users.noreply.github.com> Authored: Sat Jul 2 01:07:26 2016 +0200 Committer: Arno Noordover <anoordo...@users.noreply.github.com> Committed: Sat Jul 2 01:07:26 2016 +0200 ---------------------------------------------------------------------- .../camel/dataformat/bindy/BindyCsvFactory.java | 2 +- .../bindy/csv/BindyPipeDelimiterTest.java | 21 +++++++++++++------- .../bindy/model/simple/pipeline/MyData.java | 2 +- 3 files changed, 16 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/67b2e692/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java index e92bdc5..943f85c 100755 --- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java +++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java @@ -515,7 +515,7 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor } if (it.hasNext()) { - builderHeader.append(separator); + builderHeader.append(ConverterUtils.getCharDelimiter(separator)); } } http://git-wip-us.apache.org/repos/asf/camel/blob/67b2e692/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java index f6dabc8..86b67fb 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java @@ -18,15 +18,18 @@ package org.apache.camel.dataformat.bindy.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.dataformat.bindy.model.simple.pipeline.MyData; import org.apache.camel.model.dataformat.BindyType; +import org.apache.camel.processor.aggregate.AggregationStrategy; +import org.apache.camel.processor.aggregate.GroupedExchangeAggregationStrategy; import org.apache.camel.test.junit4.CamelTestSupport; import org.junit.Test; /** - * @version + * @version */ public class BindyPipeDelimiterTest extends CamelTestSupport { @@ -41,7 +44,7 @@ public class BindyPipeDelimiterTest extends CamelTestSupport { MyData rec1 = (MyData) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(0); MyData rec2 = (MyData) mock.getReceivedExchanges().get(0).getIn().getBody(List.class).get(1); - + //MyData rec1 = (MyData) map1.values().iterator().next(); //MyData rec2 = (MyData) map2.values().iterator().next(); @@ -58,7 +61,8 @@ public class BindyPipeDelimiterTest extends CamelTestSupport { public void testBindyPipeDelimiterMarshal() throws Exception { MockEndpoint mock = getMockEndpoint("mock:result"); mock.expectedMessageCount(1); - mock.message(0).body().startsWith("HAPPY|NEW|YEAR"); + mock.message(0).body().startsWith("col1|col2|col3"); + //mock.message(0).body().("HAPPY|NEW|YEAR"); MyData data = new MyData(); data.setCol1("HAPPY"); @@ -67,6 +71,7 @@ public class BindyPipeDelimiterTest extends CamelTestSupport { template.sendBody("direct:marshal", data); assertMockEndpointsSatisfied(); + System.out.println(mock.message(0).body().convertToString()); } @Override @@ -75,12 +80,14 @@ public class BindyPipeDelimiterTest extends CamelTestSupport { @Override public void configure() throws Exception { from("direct:unmarshal") - .unmarshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData.class) - .to("mock:result"); + .unmarshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData.class) + .to("log:after.unmarshal") + .to("mock:result"); from("direct:marshal") - .marshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData.class) - .to("mock:result"); + .marshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.model.simple.pipeline.MyData.class) + .to("log:after.marshal") + .to("mock:result"); } }; } http://git-wip-us.apache.org/repos/asf/camel/blob/67b2e692/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/pipeline/MyData.java ---------------------------------------------------------------------- diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/pipeline/MyData.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/pipeline/MyData.java index 4692180..ee8fc43 100644 --- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/pipeline/MyData.java +++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/pipeline/MyData.java @@ -22,7 +22,7 @@ import org.apache.camel.dataformat.bindy.annotation.DataField; /** * @version */ -@CsvRecord(separator = "\\|") +@CsvRecord(separator = "\\|", generateHeaderColumns = true) public class MyData { @DataField(pos = 1)
