Author: davsclaus
Date: Tue Sep 13 16:17:24 2011
New Revision: 1170228
URL: http://svn.apache.org/viewvc?rev=1170228&view=rev
Log:
Merged revisions 1170226 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/Converter.java
camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Sep 13 16:17:24 2011
@@ -1 +1 @@
-/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164544,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620,1170122
+/camel/trunk:1148706,1148710,1149570,1150651,1151000,1151054,1151087,1151362,1152170,1152755,1153620,1153812,1153829,1154684,1155230,1156108,1156260,1156277,1156479,1156524,1157348,1157749,1157798,1157831,1157878,1158153,1159171,1159174,1159326,1159457,1159460,1159606,1159682-1159683,1159867,1160547,1160637,1161010,1161082,1161524,1162309,1162395,1163231,1163420,1164544,1164557,1164633,1164973-1165000,1165152,1165157,1165658,1165971,1165987,1167098,1167131,1167448,1167487,1167555,1169610,1169620,1170122,1170226
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/Converter.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/Converter.java?rev=1170228&r1=1170227&r2=1170228&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/Converter.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/util/Converter.java
Tue Sep 13 16:17:24 2011
@@ -27,11 +27,12 @@ public final class Converter {
}
public static char getCharDelimitor(String separator) {
-
if (separator.equals("\\u0001")) {
return '\u0001';
} else if (separator.equals("\\t") || separator.equals("\\u0009")) {
return '\u0009';
+ } else if (separator.length() > 1) {
+ return separator.charAt(separator.length() - 1);
} else {
return separator.charAt(0);
}
Modified:
camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
URL:
http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java?rev=1170228&r1=1170227&r2=1170228&view=diff
==============================================================================
---
camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
(original)
+++
camel/branches/camel-2.8.x/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyPipeDelimiterTest.java
Tue Sep 13 16:17:24 2011
@@ -32,11 +32,11 @@ import org.junit.Test;
public class BindyPipeDelimiterTest extends CamelTestSupport {
@Test
- public void testBindyPipeDelimiter() throws Exception {
+ public void testBindyPipeDelimiterUnmarshal() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- template.sendBody("direct:start", "COL1|COL2|COL3\nHAPPY | NEW |
YEAR");
+ template.sendBody("direct:unmarshal", "COL1|COL2|COL3\nHAPPY | NEW |
YEAR");
assertMockEndpointsSatisfied();
@@ -55,14 +55,33 @@ public class BindyPipeDelimiterTest exte
assertEquals(" YEAR", rec2.getCol3());
}
+ @Test
+ public void testBindyPipeDelimiterMarshal() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+ mock.message(0).body().startsWith("HAPPY|NEW|YEAR");
+
+ MyData data = new MyData();
+ data.setCol1("HAPPY");
+ data.setCol2("NEW");
+ data.setCol3("YEAR");
+ template.sendBody("direct:marshal", data);
+
+ assertMockEndpointsSatisfied();
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("direct:start")
+ from("direct:unmarshal")
.unmarshal().bindy(BindyType.Csv,
"org.apache.camel.dataformat.bindy.model.simple.pipeline")
.to("mock:result");
+
+ from("direct:marshal")
+ .marshal().bindy(BindyType.Csv,
"org.apache.camel.dataformat.bindy.model.simple.pipeline")
+ .to("mock:result");
}
};
}