You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/07/16 10:04:21 UTC
svn commit: r794580 - in /camel/trunk/components/camel-bindy/src:
main/java/org/apache/camel/dataformat/bindy/
main/java/org/apache/camel/dataformat/bindy/csv/
test/java/org/apache/camel/dataformat/bindy/csv/
test/java/org/apache/camel/dataformat/bindy...
Author: ningjiang
Date: Thu Jul 16 08:04:20 2009
New Revision: 794580
URL: http://svn.apache.org/viewvc?rev=794580&view=rev
Log:
Fixed the camel-bindy test error and CS errors
Modified:
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclass/Order.java
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java?rev=794580&r1=794579&r2=794580&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyAbstractFactory.java Thu Jul 16 08:04:20 2009
@@ -207,7 +207,7 @@
} else if (clazz == char.class || clazz == Character.class) {
return null;
} else if (clazz == boolean.class || clazz == Boolean.class) {
- return false;
+ return false;
} else {
throw new IllegalArgumentException("Can not find type corresponding : " + clazz.getCanonicalName());
}
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java?rev=794580&r1=794579&r2=794580&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyCsvFactory.java Thu Jul 16 08:04:20 2009
@@ -49,9 +49,9 @@
private Map<Integer, DataField> dataFields = new LinkedHashMap<Integer, DataField>();
private Map<Integer, Field> annotedFields = new LinkedHashMap<Integer, Field>();
private Map<String, Integer> sections = new HashMap<String, Integer>();
- private int numberOptionalFields = 0;
- private int numberMandatoryFields = 0;
- private int totalFields = 0;
+ private int numberOptionalFields;
+ private int numberMandatoryFields;
+ private int totalFields;
private String separator;
private boolean skipFirstLine;
@@ -100,10 +100,10 @@
+ dataField.pos() + ", Field : " + dataField.toString());
}
- if ( dataField.required() ) {
- ++numberMandatoryFields;
+ if (dataField.required()) {
+ ++numberMandatoryFields;
} else {
- ++numberOptionalFields;
+ ++numberOptionalFields;
}
dataFields.put(dataField.pos(), dataField);
@@ -142,20 +142,21 @@
int counterMandatoryFields = 0;
for (String data : tokens) {
-
- // Get DataField from model
+
+ // Get DataField from model
DataField dataField = dataFields.get(pos);
ObjectHelper.notNull(dataField, "No position " + pos + " defined for the field : " + data);
- if ( dataField.required()) {
- // Increment counter of mandatory fields
- ++counterMandatoryFields;
-
- // Check if content of the field is empty
- // This is not possible for mandatory fields
- if ( data.equals("")) {
- throw new IllegalArgumentException("The mandatory field defined at the position " + pos + " is empty !");
- }
+ if (dataField.required()) {
+ // Increment counter of mandatory fields
+ ++counterMandatoryFields;
+
+ // Check if content of the field is empty
+ // This is not possible for mandatory fields
+ if (data.equals("")) {
+ throw new IllegalArgumentException("The mandatory field defined at the position " + pos
+ + " is empty !");
+ }
}
// Get Field to be setted
@@ -180,10 +181,10 @@
// format the data received
Object value = null;
- if ( ! data.equals("") ) {
- value = format.parse( data );
- } else {
- value = getDefaultValueforPrimitive(field.getType());
+ if (!data.equals("")) {
+ value = format.parse(data);
+ } else {
+ value = getDefaultValueforPrimitive(field.getType());
}
field.set(modelField, value);
@@ -205,7 +206,7 @@
ObjectHelper.notNull(dataField, "No position defined for the field");
if ( dataField.required()) {
- ++counterMandatoryFields;
+ ++counterMandatoryFields;
}
Field field = annotedFields.get(pos);
@@ -240,12 +241,12 @@
}
- if ( pos < totalFields ) {
- throw new IllegalArgumentException("Some fields are missing (optional or mandatory) !!");
+ if (pos < totalFields) {
+ throw new IllegalArgumentException("Some fields are missing (optional or mandatory) !!");
}
-
- if ( counterMandatoryFields < numberMandatoryFields) {
- throw new IllegalArgumentException("Some mandatory fields are missing !!");
+
+ if (counterMandatoryFields < numberMandatoryFields) {
+ throw new IllegalArgumentException("Some mandatory fields are missing !!");
}
}
Modified: camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java?rev=794580&r1=794579&r2=794580&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java (original)
+++ camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java Thu Jul 16 08:04:20 2009
@@ -122,16 +122,16 @@
String[] tokens = line.split(separator, -1);
List<String> result = Arrays.asList(tokens);
- if ( result.size() == 0 || result.isEmpty() ) {
- throw new java.lang.IllegalArgumentException("No records have been defined in the CSV !");
+ if (result.size() == 0 || result.isEmpty()) {
+ throw new java.lang.IllegalArgumentException("No records have been defined in the CSV !");
}
- if ( result.size() > 0 ) {
-
+ if (result.size() > 0) {
+
if (LOG.isDebugEnabled()) {
LOG.debug("Size of the record splitted : " + result.size());
}
-
+
// Bind data from CSV record with model classes
factory.bind(result, model);
@@ -144,19 +144,18 @@
if (LOG.isDebugEnabled()) {
LOG.debug("Graph of objects created : " + model);
}
-
+
}
-
}
// Test if models list is empty or not
// If this is the case (correspond to an empty stream, ...)
- if ( models.size() == 0 ) {
- throw new java.lang.Exception("No records have been defined in the CSV !");
- } else {
- return models;
- }
+ if (models.size() == 0) {
+ throw new java.lang.Exception("No records have been defined in the CSV !");
+ } else {
+ return models;
+ }
} finally {
scanner.close();
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java?rev=794580&r1=794579&r2=794580&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyComplexCsvUnmarshallTest.java Thu Jul 16 08:04:20 2009
@@ -31,37 +31,36 @@
@ContextConfiguration(locations = "org.apache.camel.dataformat.bindy.csv.BindyComplexCsvUnmarshallTest$ContextConfig", loader = JavaConfigContextLoader.class)
public class BindyComplexCsvUnmarshallTest extends AbstractJUnit4SpringContextTests {
+ @Produce(uri = "direct:start")
+ protected ProducerTemplate template;
+
+ private String record = "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n"
+ + "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n"
+ + "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n"
+ + "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n"
+ + "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n"
+ + "06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
+ + "07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n"
+ + "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ + ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n"
+ + ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" + ",,,D,ISIN,LU123456789,,,,,\r\n"
+ + "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n"
+ + "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
- private String record = "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
- "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n" +
- "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
- "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n" +
- "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" +
- "06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n" +
- "07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
- "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n" +
- ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" +
- ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" +
- ",,,D,ISIN,LU123456789,,,,,\r\n" +
- "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" +
- "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
-
- @EndpointInject(uri = "mock:result")
- private MockEndpoint resultEndpoint;
-
- @Produce(uri = "direct:start")
- protected ProducerTemplate template;
+ @EndpointInject(uri = "mock:result")
+ private MockEndpoint resultEndpoint;
@Test
public void testUnMarshallMessage() throws Exception {
- template.sendBody(record);
+ template.sendBody(record);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
@Configuration
public static class ContextConfig extends SingleRouteCamelConfiguration {
- BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat("org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink");
+ BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
+ "org.apache.camel.dataformat.bindy.model.complex.twoclassesandonelink");
@Override
@Bean
@@ -69,10 +68,8 @@
return new RouteBuilder() {
@Override
public void configure() {
- //from("file://src/test/data?noop=true")
- from("direct:start")
- .unmarshal(camelDataFormat)
- .to("mock:result");
+ // from("file://src/test/data?noop=true")
+ from("direct:start").unmarshal(camelDataFormat).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java?rev=794580&r1=794579&r2=794580&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvMandatoryFieldsUnmarshallTest.java Thu Jul 16 08:04:20 2009
@@ -16,8 +16,6 @@
*/
package org.apache.camel.dataformat.bindy.csv;
-import static org.junit.Assert.fail;
-
import org.apache.camel.CamelExecutionException;
import org.apache.camel.EndpointInject;
import org.apache.camel.Produce;
@@ -36,100 +34,106 @@
import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
import org.springframework.util.Assert;
+import static org.junit.Assert.fail;
+
@ContextConfiguration(locations = "org.apache.camel.dataformat.bindy.csv.BindySimpleCsvMandatoryFieldsUnmarshallTest$ContextConfig", loader = JavaConfigContextLoader.class)
public class BindySimpleCsvMandatoryFieldsUnmarshallTest extends AbstractJUnit4SpringContextTests {
-
- private static final transient Log LOG = LogFactory.getLog(BindySimpleCsvMandatoryFieldsUnmarshallTest.class);
-
- String header = "order nr,client ref,first name, last name,instrument code,instrument name,order type, instrument type, quantity,currency,date\r\n";
- String record1 = "";
- String record2 = ",,blabla,,,,,,,,";
- String record3 = "1,A1,Charles,Moulliard,ISIN,LU123456789,,,,,";
- String record4 = "1,A1,Charles,,ISIN,LU123456789,,,,,";
- String record5 = ",,,,,,,,,,";
+
+ private static final transient Log LOG = LogFactory
+ .getLog(BindySimpleCsvMandatoryFieldsUnmarshallTest.class);
@EndpointInject(uri = "mock:result1")
protected MockEndpoint resultEndpoint1;
-
+
@EndpointInject(uri = "mock:result2")
protected MockEndpoint resultEndpoint2;
-
+
@Produce(uri = "direct:start1")
protected ProducerTemplate template1;
-
+
@Produce(uri = "direct:start2")
protected ProducerTemplate template2;
+
+ String header = "order nr,client ref,first name, last name,instrument code,instrument name,order type, instrument type, quantity,currency,date\r\n";
+ String record1 = "";
+ String record2 = ",,blabla,,,,,,,,";
+ String record3 = "1,A1,Charles,Moulliard,ISIN,LU123456789,,,,,";
+ String record4 = "1,A1,Charles,,ISIN,LU123456789,,,,,";
+ String record5 = ",,,,,,,,,,";
@DirtiesContext
@Test
public void testEmptyRecord() throws Exception {
- resultEndpoint1.expectedMessageCount(0);
-
- try {
- template1.sendBody(record1);
+ resultEndpoint1.expectedMessageCount(0);
+
+ try {
+ template1.sendBody(record1);
fail("Should have thrown an exception");
- } catch (CamelExecutionException e) {
- // Assert.isInstanceOf(java.lang.IllegalArgumentException.class, e.getCause());
- Assert.isInstanceOf(Exception.class, e.getCause());
- // LOG.info(">> Error : " + e);
- }
-
+ } catch (CamelExecutionException e) {
+ // Assert.isInstanceOf(java.lang.IllegalArgumentException.class,
+ // e.getCause());
+ Assert.isInstanceOf(Exception.class, e.getCause());
+ // LOG.info(">> Error : " + e);
+ }
+
resultEndpoint1.assertIsSatisfied();
}
-
+
@DirtiesContext
@Test
public void testEmptyFields() throws Exception {
- resultEndpoint1.expectedMessageCount(1);
- template1.sendBody(record2);
-
+ resultEndpoint1.expectedMessageCount(1);
+ template1.sendBody(record2);
+
resultEndpoint1.assertIsSatisfied();
}
-
+
@DirtiesContext
@Test
public void testOneOptionalField() throws Exception {
- resultEndpoint1.expectedMessageCount(1);
-
- template1.sendBody(record2);
+ resultEndpoint1.expectedMessageCount(1);
+
+ template1.sendBody(record2);
resultEndpoint1.assertIsSatisfied();
}
-
+
@DirtiesContext
@Test
public void testSeveralOptionalField() throws Exception {
- resultEndpoint1.expectedMessageCount(1);
-
- template1.sendBody(record3);
+ resultEndpoint1.expectedMessageCount(1);
+
+ template1.sendBody(record3);
resultEndpoint1.assertIsSatisfied();
}
-
+
@DirtiesContext
@Test
public void testMandatoryFields() throws Exception {
- resultEndpoint2.expectedMessageCount(1);
-
- template2.sendBody(header + record3);
+ resultEndpoint2.expectedMessageCount(1);
+
+ template2.sendBody(header + record3);
resultEndpoint2.assertIsSatisfied();
}
-
+
@DirtiesContext
@Test
public void testMissingMandatoryFields() throws Exception {
- resultEndpoint2.expectedMessageCount(1);
-
- try {
- template2.sendBody(header + record4);
- resultEndpoint2.assertIsSatisfied();
- } catch (CamelExecutionException e) {
- //LOG.info(">> Error : " + e);
- }
+ resultEndpoint2.expectedMessageCount(1);
+
+ try {
+ template2.sendBody(header + record4);
+ resultEndpoint2.assertIsSatisfied();
+ } catch (CamelExecutionException e) {
+ // LOG.info(">> Error : " + e);
+ }
}
-
+
@Configuration
public static class ContextConfig extends SingleRouteCamelConfiguration {
- BindyCsvDataFormat formatOptional = new BindyCsvDataFormat("org.apache.camel.dataformat.bindy.model.simple.oneclass");
- BindyCsvDataFormat formatMandatory = new BindyCsvDataFormat("org.apache.camel.dataformat.bindy.model.simple.oneclassmandatory");
+ BindyCsvDataFormat formatOptional =
+ new BindyCsvDataFormat("org.apache.camel.dataformat.bindy.model.simple.oneclass");
+ BindyCsvDataFormat formatMandatory =
+ new BindyCsvDataFormat("org.apache.camel.dataformat.bindy.model.simple.oneclassmandatory");
@Override
@Bean
@@ -137,12 +141,12 @@
return new RouteBuilder() {
@Override
public void configure() {
- try {
- from("direct:start1").unmarshal(formatOptional).to("mock:result1");
- from("direct:start2").unmarshal(formatMandatory).to("mock:result2");
- } catch (Exception e) {
- //
- }
+ try {
+ from("direct:start1").unmarshal(formatOptional).to("mock:result1");
+ from("direct:start2").unmarshal(formatMandatory).to("mock:result2");
+ } catch (Exception e) {
+ //
+ }
}
};
}
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java?rev=794580&r1=794579&r2=794580&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvSkipFirstLineUnmarshallTest.java Thu Jul 16 08:04:20 2009
@@ -31,38 +31,40 @@
@ContextConfiguration(locations = "org.apache.camel.dataformat.bindy.csv.BindySimpleCsvSkipFirstLineUnmarshallTest$ContextConfig", loader = JavaConfigContextLoader.class)
public class BindySimpleCsvSkipFirstLineUnmarshallTest extends AbstractJUnit4SpringContextTests {
-
- private String record = "order nr,client ref,first name, last name,instrument code,instrument name,order type, instrument type, quantity,currency,date\r\n" +
- "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
- "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n" +
- "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
- "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n" +
- "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" +
- "06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n" +
- "07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
- "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n" +
- ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" +
- ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" +
- ",,,D,ISIN,LU123456789,,,,,\r\n" +
- "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" +
- "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
- @EndpointInject(uri = "mock:result")
- private MockEndpoint resultEndpoint;
-
- @Produce(uri = "direct:start")
- protected ProducerTemplate template;
+ @Produce(uri = "direct:start")
+ protected ProducerTemplate template;
+
+ private String record = "order nr,client ref,first name, last name,instrument code,instrument name,order type, instrument type, quantity,currency,date\r\n"
+ + "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n"
+ + "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n"
+ + "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n"
+ + "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n"
+ + "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n"
+ + "06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
+ + "07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n"
+ + "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ + ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n"
+ + ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n"
+ + ",,,D,ISIN,LU123456789,,,,,\r\n"
+ + "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n"
+ + "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
+
+ @EndpointInject(uri = "mock:result")
+ private MockEndpoint resultEndpoint;
+
@Test
public void testUnMarshallMessage() throws Exception {
- template.sendBody(record);
+ template.sendBody(record);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
@Configuration
public static class ContextConfig extends SingleRouteCamelConfiguration {
- BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat("org.apache.camel.dataformat.bindy.model.simple.oneclassandskipfirstline");
+ BindyCsvDataFormat camelDataFormat =
+ new BindyCsvDataFormat("org.apache.camel.dataformat.bindy.model.simple.oneclassandskipfirstline");
@Override
@Bean
@@ -70,10 +72,8 @@
return new RouteBuilder() {
@Override
public void configure() {
- //from("file://src/test/data2")
- from("direct:start")
- .unmarshal(camelDataFormat)
- .to("mock:result");
+ // from("file://src/test/data2")
+ from("direct:start").unmarshal(camelDataFormat).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java?rev=794580&r1=794579&r2=794580&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallDslTest.java Thu Jul 16 08:04:20 2009
@@ -33,29 +33,29 @@
@ContextConfiguration(locations = "org.apache.camel.dataformat.bindy.csv.BindySimpleCsvUnmarshallTest$ContextConfig", loader = JavaConfigContextLoader.class)
public class BindySimpleCsvUnmarshallDslTest extends AbstractJUnit4SpringContextTests {
- private String record ="01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
- "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n" +
- "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
- "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n" +
- "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" +
- "06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n" +
- "07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
- "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n" +
- ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" +
- ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" +
- ",,,D,ISIN,LU123456789,,,,,\r\n" +
- "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" +
- "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
+ @Produce(uri = "direct:start")
+ protected ProducerTemplate template;
+
+ private String record = "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n"
+ + "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n"
+ + "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n"
+ + "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n"
+ + "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n"
+ + "06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
+ + "07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n"
+ + "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ + ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n"
+ + ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" + ",,,D,ISIN,LU123456789,,,,,\r\n"
+ + "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n"
+ + "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
- @EndpointInject(uri = "mock:result")
- private MockEndpoint resultEndpoint;
-
- @Produce(uri = "direct:start")
- protected ProducerTemplate template;
+ @EndpointInject(uri = "mock:result")
+ private MockEndpoint resultEndpoint;
+
@Test
public void testUnMarshallMessage() throws Exception {
- template.sendBody(record);
+ template.sendBody(record);
resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
}
@@ -68,9 +68,9 @@
return new RouteBuilder() {
@Override
public void configure() {
- //from("file://src/test/data?noop=true")
- from("direct:start")
- .unmarshal().bindy(BindyType.Csv, "org.apache.camel.dataformat.bindy.model.simple.oneclass")
+ // from("file://src/test/data?noop=true")
+ from("direct:start").unmarshal()
+ .bindy(BindyType.Csv, "org.apache.camel.dataformat.bindy.model.simple.oneclass")
.to("mock:result");
}
};
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java?rev=794580&r1=794579&r2=794580&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindySimpleCsvUnmarshallTest.java Thu Jul 16 08:04:20 2009
@@ -35,49 +35,49 @@
@ContextConfiguration(locations = "org.apache.camel.dataformat.bindy.csv.BindySimpleCsvUnmarshallTest$ContextConfig", loader = JavaConfigContextLoader.class)
public class BindySimpleCsvUnmarshallTest extends AbstractJUnit4SpringContextTests {
-
- private static final transient Log LOG = LogFactory.getLog(BindySimpleCsvUnmarshallTest.class);
-
- private String record ="01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
- "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n" +
- "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n" +
- "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n" +
- "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n" +
- "06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n" +
- "07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n" +
- "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n" +
- ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n" +
- ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" +
- ",,,D,ISIN,LU123456789,,,,,\r\n" +
- "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n" +
- "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
- @EndpointInject(uri = "mock:result")
- private MockEndpoint resultEndpoint;
-
+ private static final transient Log LOG = LogFactory.getLog(BindySimpleCsvUnmarshallTest.class);
+
@Produce(uri = "direct:start")
protected ProducerTemplate template;
+ private String record = "01,,Albert,Cartier,ISIN,BE12345678,SELL,,1500,EUR,08-01-2009\r\n"
+ + "02,A1,,Preud'Homme,ISIN,XD12345678,BUY,,2500,USD,08-01-2009\r\n"
+ + "03,A2,Jacques,,,BE12345678,SELL,,1500,EUR,08-01-2009\r\n"
+ + "04,A3,Michel,Dupond,,,BUY,,2500,USD,08-01-2009\r\n"
+ + "05,A4,Annie,Dutronc,ISIN,BE12345678,,,1500,EUR,08-01-2009\r\n"
+ + "06,A5,André,Rieux,ISIN,XD12345678,SELL,Share,,USD,08-01-2009\r\n"
+ + "07,A6,Mylène,Farmer,ISIN,BE12345678,BUY,1500,,,08-01-2009\r\n"
+ + "08,A7,Eva,Longoria,ISIN,XD12345678,SELL,Share,2500,USD,\r\n"
+ + ",,,D,,BE12345678,SELL,,,,08-01-2009\r\n"
+ + ",,,D,ISIN,BE12345678,,,,,08-01-2009\r\n" + ",,,D,ISIN,LU123456789,,,,,\r\n"
+ + "10,A8,Pauline,M,ISIN,XD12345678,SELL,Share,2500,USD,08-01-2009\r\n"
+ + "10,A9,Pauline,M,ISIN,XD12345678,BUY,Share,2500.45,USD,08-01-2009";
+
+ @EndpointInject(uri = "mock:result")
+ private MockEndpoint resultEndpoint;
+
@Test
public void testUnMarshallMessage() throws Exception {
-
- template.sendBody(record);
-
- resultEndpoint.expectedMessageCount(1);
+
+ template.sendBody(record);
+
+ resultEndpoint.expectedMessageCount(1);
resultEndpoint.assertIsSatisfied();
-
-/* List<Exchange> exchanges = resultEndpoint.getExchanges();
-
- for(Exchange exchange : exchanges) {
- Object body = exchange.getOut().getBody();
- LOG.debug("Body received : " + body.toString());
- }*/
+
+ /*
+ * List<Exchange> exchanges = resultEndpoint.getExchanges();
+ * for(Exchange exchange : exchanges) { Object body =
+ * exchange.getOut().getBody(); LOG.debug("Body received : " +
+ * body.toString()); }
+ */
}
@Configuration
public static class ContextConfig extends SingleRouteCamelConfiguration {
- BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat("org.apache.camel.dataformat.bindy.model.simple.oneclass");
+ BindyCsvDataFormat camelDataFormat = new BindyCsvDataFormat(
+ "org.apache.camel.dataformat.bindy.model.simple.oneclass");
@Override
@Bean
@@ -85,8 +85,8 @@
return new RouteBuilder() {
@Override
public void configure() {
- //from("file://src/test/data?move=./target/done").unmarshal(camelDataFormat).to("mock:result");
- from("direct:start").unmarshal(camelDataFormat).to("mock:result");
+ // from("file://src/test/data?move=./target/done").unmarshal(camelDataFormat).to("mock:result");
+ from("direct:start").unmarshal(camelDataFormat).to("mock:result");
}
};
}
Modified: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclass/Order.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclass/Order.java?rev=794580&r1=794579&r2=794580&view=diff
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclass/Order.java (original)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/model/simple/oneclass/Order.java Thu Jul 16 08:04:20 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.camel.dataformat.bindy.model.simple.oneclassmandatory;
+package org.apache.camel.dataformat.bindy.model.simple.oneclass;
import java.math.BigDecimal;
import java.util.Date;
@@ -22,19 +22,19 @@
import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
import org.apache.camel.dataformat.bindy.annotation.DataField;
-@CsvRecord(separator = ",", skipFirstLine = true)
+@CsvRecord(separator = ",")
public class Order {
@DataField(pos = 0)
private int orderNr;
- @DataField(pos = 1, required = true)
+ @DataField(pos = 1)
private String clientNr;
- @DataField(pos = 2, required = true)
+ @DataField(pos = 2)
private String firstName;
- @DataField(pos = 3, required = true)
+ @DataField(pos = 3)
private String lastName;
@DataField(pos = 4)