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 2016/01/04 11:22:05 UTC
[1/2] camel git commit: CAMEL-9468 Bindy fails to marshal objects in
Spring Boot
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 62a1a3732 -> b234404c4
refs/heads/master 4545915b3 -> 348e1bcc2
CAMEL-9468 Bindy fails to marshal objects in Spring Boot
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/348e1bcc
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/348e1bcc
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/348e1bcc
Branch: refs/heads/master
Commit: 348e1bcc26d39a79f4b16e151c5c5cb28e0aea60
Parents: 4545915
Author: Björn Frantzén <bj...@r2m.se>
Authored: Sat Jan 2 23:06:30 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jan 4 11:20:10 2016 +0100
----------------------------------------------------------------------
components/camel-bindy/pom.xml | 13 +-
.../bindy/fixed/BindyFixedLengthDataFormat.java | 32 ++-
...indySimpleFixedLengthObjectMarshallTest.java | 283 +++++++++++++++++++
3 files changed, 321 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/348e1bcc/components/camel-bindy/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index baeed6c..e7d8e9e 100755
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -49,17 +49,22 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-core-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-javaconfig</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-boot</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/348e1bcc/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
index f1548d1..af8f6a3 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
@@ -64,7 +64,7 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
public String getDataFormatName() {
return "bindy-fixed";
}
-
+
@SuppressWarnings("unchecked")
public void marshal(Exchange exchange, Object body, OutputStream outputStream) throws Exception {
BindyFixedLengthFactory factory = (BindyFixedLengthFactory) getFactory();
@@ -76,14 +76,14 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
List<Map<String, Object>> models;
// the body is not a prepared list so help a bit here and create one for us
- if (exchange.getContext().getTypeConverter().convertTo(List.class, body) == null) {
+ if (!isPreparedList(body)) {
models = new ArrayList<Map<String, Object>>();
Iterator<?> it = ObjectHelper.createIterator(body);
while (it.hasNext()) {
Object model = it.next();
String name = model.getClass().getName();
Map<String, Object> row = new HashMap<String, Object>();
- row.put(name, body);
+ row.put(name, model);
models.add(row);
}
} else {
@@ -147,6 +147,32 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
}
}
+ /*
+ * Check if the body is already parsed.
+ * Bindy expects a list containing Map<String, Object> entries
+ * where each Map contains only one entry where the key is the class
+ * name of the object to be marshalled, and the value is the
+ * object to be marshalled.
+ */
+ private boolean isPreparedList(Object object) {
+ if (List.class.isAssignableFrom(object.getClass())) {
+ List<?> list = (List<?>) object;
+ if (list.size() > 0) {
+ // Check first entry, should be enough
+ Object entry = list.get(0);
+ if (Map.class.isAssignableFrom(entry.getClass())) {
+ Map<?, ?> map = (Map<?, ?>) entry;
+ if (map.size() == 1) {
+ if (map.keySet().toArray()[0] instanceof String) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
BindyFixedLengthFactory factory = (BindyFixedLengthFactory) getFactory();
ObjectHelper.notNull(factory, "not instantiated");
http://git-wip-us.apache.org/repos/asf/camel/blob/348e1bcc/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java
new file mode 100644
index 0000000..348162b
--- /dev/null
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java
@@ -0,0 +1,283 @@
+/**
+ * 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.bindy.fixed.marshall.simple;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.dataformat.bindy.annotation.DataField;
+import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
+import org.apache.camel.model.dataformat.BindyDataFormat;
+import org.apache.camel.model.dataformat.BindyType;
+import org.apache.camel.processor.interceptor.Tracer;
+import org.apache.camel.spring.boot.TypeConversionConfiguration;
+import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
+import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
+import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.context.annotation.Bean;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+@RunWith(CamelSpringJUnit4ClassRunner.class)
+@ContextConfiguration(
+ classes = {
+ BindySimpleFixedLengthObjectMarshallTest.Configuration.class,
+ TypeConversionConfiguration.class},
+ loader = CamelSpringDelegatingTestContextLoader.class)
+public class BindySimpleFixedLengthObjectMarshallTest extends AbstractJUnit4SpringContextTests {
+
+ private static final String URI_MOCK_RESULT = "mock:result";
+ private static final String URI_MOCK_ERROR = "mock:error";
+ private static final String URI_DIRECT_START = "direct:start";
+
+ private String expected;
+
+ @Produce(uri = URI_DIRECT_START)
+ private ProducerTemplate template;
+
+ @EndpointInject(uri = URI_MOCK_RESULT)
+ private MockEndpoint result;
+
+ @EndpointInject(uri = URI_MOCK_ERROR)
+ private MockEndpoint error;
+
+ public static class Configuration extends SingleRouteCamelConfiguration {
+
+ @Bean
+ @Override
+ public RouteBuilder route() {
+ return new RouteBuilder() {
+ public void configure() {
+ Tracer tracer = new Tracer();
+ tracer.setLogLevel(LoggingLevel.ERROR);
+ tracer.setLogName("org.apache.camel.bindy");
+ getContext().addInterceptStrategy(tracer);
+
+ // default should errors go to mock:error
+ errorHandler(deadLetterChannel(URI_MOCK_ERROR).redeliveryDelay(0));
+
+ onException(Exception.class).maximumRedeliveries(0).handled(true);
+
+ BindyDataFormat bindy = new BindyDataFormat();
+ bindy.setLocale("en");
+ bindy.setClassType(Order.class);
+ bindy.setType(BindyType.Fixed);
+
+ from(URI_DIRECT_START)
+ .marshal(bindy)
+ .to(URI_MOCK_RESULT);
+ }
+ };
+ }
+ }
+
+ @Test
+ @DirtiesContext
+ public void testMarshallObject() throws Exception {
+ expected = "10A9 PaulineM ISINXD12345678BUYShare000002500.45USD01-08-2009\r\n";
+ result.expectedBodiesReceived(expected);
+ error.expectedMessageCount(0);
+
+ template.sendBody(generateModel("Pauline"));
+ error.assertIsSatisfied();
+ result.assertIsSatisfied();
+ }
+
+ @Test
+ @DirtiesContext
+ public void testMarshallList() throws Exception {
+ expected = "10A9 PaulineM ISINXD12345678BUYShare000002500.45USD01-08-2009\r\n"
+ + "10A9 MarcoolM ISINXD12345678BUYShare000002500.45USD01-08-2009\r\n";
+ result.expectedBodiesReceived(expected);
+ error.expectedMessageCount(0);
+
+ List<Order> list = new ArrayList<Order>();
+ list.add(generateModel("Pauline"));
+ list.add(generateModel("Marcool"));
+ template.sendBody(list);
+ error.assertIsSatisfied();
+ result.assertIsSatisfied();
+ }
+
+ public Order generateModel(String firstName) {
+ Order order = new Order();
+ order.setOrderNr(10);
+ order.setOrderType("BUY");
+ order.setClientNr("A9");
+ order.setFirstName(firstName);
+ order.setLastName("M");
+ order.setAmount(new BigDecimal("2500.45"));
+ order.setInstrumentCode("ISIN");
+ order.setInstrumentNumber("XD12345678");
+ order.setInstrumentType("Share");
+ order.setCurrency("USD");
+
+ Calendar calendar = new GregorianCalendar();
+ calendar.set(2009, 7, 1);
+ order.setOrderDate(calendar.getTime());
+
+ return order;
+ }
+
+ @FixedLengthRecord(length = 65, paddingChar = ' ')
+ public static class Order {
+
+ @DataField(pos = 1, length = 2)
+ private int orderNr;
+
+ @DataField(pos = 3, length = 2)
+ private String clientNr;
+
+ @DataField(pos = 5, length = 9)
+ private String firstName;
+
+ @DataField(pos = 14, length = 5, align = "L")
+ private String lastName;
+
+ @DataField(pos = 19, length = 4)
+ private String instrumentCode;
+
+ @DataField(pos = 23, length = 10)
+ private String instrumentNumber;
+
+ @DataField(pos = 33, length = 3)
+ private String orderType;
+
+ @DataField(pos = 36, length = 5)
+ private String instrumentType;
+
+ @DataField(pos = 41, precision = 2, length = 12, paddingChar = '0')
+ private BigDecimal amount;
+
+ @DataField(pos = 53, length = 3)
+ private String currency;
+
+ @DataField(pos = 56, length = 10, pattern = "dd-MM-yyyy")
+ private Date orderDate;
+
+
+ public int getOrderNr() {
+ return orderNr;
+ }
+
+ public void setOrderNr(int orderNr) {
+ this.orderNr = orderNr;
+ }
+
+ public String getClientNr() {
+ return clientNr;
+ }
+
+ public void setClientNr(String clientNr) {
+ this.clientNr = clientNr;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public String getInstrumentCode() {
+ return instrumentCode;
+ }
+
+ public void setInstrumentCode(String instrumentCode) {
+ this.instrumentCode = instrumentCode;
+ }
+
+ public String getInstrumentNumber() {
+ return instrumentNumber;
+ }
+
+ public void setInstrumentNumber(String instrumentNumber) {
+ this.instrumentNumber = instrumentNumber;
+ }
+
+ public String getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(String orderType) {
+ this.orderType = orderType;
+ }
+
+ public String getInstrumentType() {
+ return instrumentType;
+ }
+
+ public void setInstrumentType(String instrumentType) {
+ this.instrumentType = instrumentType;
+ }
+
+ public BigDecimal getAmount() {
+ return amount;
+ }
+
+ public void setAmount(BigDecimal amount) {
+ this.amount = amount;
+ }
+
+ public String getCurrency() {
+ return currency;
+ }
+
+ public void setCurrency(String currency) {
+ this.currency = currency;
+ }
+
+ public Date getOrderDate() {
+ return orderDate;
+ }
+
+ public void setOrderDate(Date orderDate) {
+ this.orderDate = orderDate;
+ }
+
+ @Override
+ public String toString() {
+ return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " + String.valueOf(this.amount) + ", " + this.instrumentCode + ", "
+ + this.instrumentNumber + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " + this.firstName + ", " + this.lastName + ", "
+ + String.valueOf(this.orderDate);
+ }
+ }
+
+
+}
[2/2] camel git commit: CAMEL-9468 Bindy fails to marshal objects in
Spring Boot
Posted by da...@apache.org.
CAMEL-9468 Bindy fails to marshal objects in Spring Boot
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b234404c
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b234404c
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b234404c
Branch: refs/heads/camel-2.16.x
Commit: b234404c4d17207ca01d6f4933a68913fb58fb9a
Parents: 62a1a37
Author: Björn Frantzén <bj...@r2m.se>
Authored: Sat Jan 2 23:06:30 2016 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Mon Jan 4 11:21:53 2016 +0100
----------------------------------------------------------------------
components/camel-bindy/pom.xml | 13 +-
.../bindy/fixed/BindyFixedLengthDataFormat.java | 32 ++-
...indySimpleFixedLengthObjectMarshallTest.java | 283 +++++++++++++++++++
3 files changed, 321 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b234404c/components/camel-bindy/pom.xml
----------------------------------------------------------------------
diff --git a/components/camel-bindy/pom.xml b/components/camel-bindy/pom.xml
index f077f50..35330a3 100755
--- a/components/camel-bindy/pom.xml
+++ b/components/camel-bindy/pom.xml
@@ -49,17 +49,22 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-test</artifactId>
+ <artifactId>camel-core-xml</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-spring</artifactId>
+ <artifactId>camel-test-spring</artifactId>
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.springframework</groupId>
- <artifactId>spring-test</artifactId>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-javaconfig</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.camel</groupId>
+ <artifactId>camel-spring-boot</artifactId>
<scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/camel/blob/b234404c/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
index f1548d1..af8f6a3 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/fixed/BindyFixedLengthDataFormat.java
@@ -64,7 +64,7 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
public String getDataFormatName() {
return "bindy-fixed";
}
-
+
@SuppressWarnings("unchecked")
public void marshal(Exchange exchange, Object body, OutputStream outputStream) throws Exception {
BindyFixedLengthFactory factory = (BindyFixedLengthFactory) getFactory();
@@ -76,14 +76,14 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
List<Map<String, Object>> models;
// the body is not a prepared list so help a bit here and create one for us
- if (exchange.getContext().getTypeConverter().convertTo(List.class, body) == null) {
+ if (!isPreparedList(body)) {
models = new ArrayList<Map<String, Object>>();
Iterator<?> it = ObjectHelper.createIterator(body);
while (it.hasNext()) {
Object model = it.next();
String name = model.getClass().getName();
Map<String, Object> row = new HashMap<String, Object>();
- row.put(name, body);
+ row.put(name, model);
models.add(row);
}
} else {
@@ -147,6 +147,32 @@ public class BindyFixedLengthDataFormat extends BindyAbstractDataFormat {
}
}
+ /*
+ * Check if the body is already parsed.
+ * Bindy expects a list containing Map<String, Object> entries
+ * where each Map contains only one entry where the key is the class
+ * name of the object to be marshalled, and the value is the
+ * object to be marshalled.
+ */
+ private boolean isPreparedList(Object object) {
+ if (List.class.isAssignableFrom(object.getClass())) {
+ List<?> list = (List<?>) object;
+ if (list.size() > 0) {
+ // Check first entry, should be enough
+ Object entry = list.get(0);
+ if (Map.class.isAssignableFrom(entry.getClass())) {
+ Map<?, ?> map = (Map<?, ?>) entry;
+ if (map.size() == 1) {
+ if (map.keySet().toArray()[0] instanceof String) {
+ return true;
+ }
+ }
+ }
+ }
+ }
+ return false;
+ }
+
public Object unmarshal(Exchange exchange, InputStream inputStream) throws Exception {
BindyFixedLengthFactory factory = (BindyFixedLengthFactory) getFactory();
ObjectHelper.notNull(factory, "not instantiated");
http://git-wip-us.apache.org/repos/asf/camel/blob/b234404c/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java
new file mode 100644
index 0000000..348162b
--- /dev/null
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/marshall/simple/BindySimpleFixedLengthObjectMarshallTest.java
@@ -0,0 +1,283 @@
+/**
+ * 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.bindy.fixed.marshall.simple;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+import java.util.List;
+
+import org.apache.camel.EndpointInject;
+import org.apache.camel.LoggingLevel;
+import org.apache.camel.Produce;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.dataformat.bindy.annotation.DataField;
+import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
+import org.apache.camel.model.dataformat.BindyDataFormat;
+import org.apache.camel.model.dataformat.BindyType;
+import org.apache.camel.processor.interceptor.Tracer;
+import org.apache.camel.spring.boot.TypeConversionConfiguration;
+import org.apache.camel.spring.javaconfig.SingleRouteCamelConfiguration;
+import org.apache.camel.test.spring.CamelSpringDelegatingTestContextLoader;
+import org.apache.camel.test.spring.CamelSpringJUnit4ClassRunner;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.springframework.context.annotation.Bean;
+import org.springframework.test.annotation.DirtiesContext;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
+
+@RunWith(CamelSpringJUnit4ClassRunner.class)
+@ContextConfiguration(
+ classes = {
+ BindySimpleFixedLengthObjectMarshallTest.Configuration.class,
+ TypeConversionConfiguration.class},
+ loader = CamelSpringDelegatingTestContextLoader.class)
+public class BindySimpleFixedLengthObjectMarshallTest extends AbstractJUnit4SpringContextTests {
+
+ private static final String URI_MOCK_RESULT = "mock:result";
+ private static final String URI_MOCK_ERROR = "mock:error";
+ private static final String URI_DIRECT_START = "direct:start";
+
+ private String expected;
+
+ @Produce(uri = URI_DIRECT_START)
+ private ProducerTemplate template;
+
+ @EndpointInject(uri = URI_MOCK_RESULT)
+ private MockEndpoint result;
+
+ @EndpointInject(uri = URI_MOCK_ERROR)
+ private MockEndpoint error;
+
+ public static class Configuration extends SingleRouteCamelConfiguration {
+
+ @Bean
+ @Override
+ public RouteBuilder route() {
+ return new RouteBuilder() {
+ public void configure() {
+ Tracer tracer = new Tracer();
+ tracer.setLogLevel(LoggingLevel.ERROR);
+ tracer.setLogName("org.apache.camel.bindy");
+ getContext().addInterceptStrategy(tracer);
+
+ // default should errors go to mock:error
+ errorHandler(deadLetterChannel(URI_MOCK_ERROR).redeliveryDelay(0));
+
+ onException(Exception.class).maximumRedeliveries(0).handled(true);
+
+ BindyDataFormat bindy = new BindyDataFormat();
+ bindy.setLocale("en");
+ bindy.setClassType(Order.class);
+ bindy.setType(BindyType.Fixed);
+
+ from(URI_DIRECT_START)
+ .marshal(bindy)
+ .to(URI_MOCK_RESULT);
+ }
+ };
+ }
+ }
+
+ @Test
+ @DirtiesContext
+ public void testMarshallObject() throws Exception {
+ expected = "10A9 PaulineM ISINXD12345678BUYShare000002500.45USD01-08-2009\r\n";
+ result.expectedBodiesReceived(expected);
+ error.expectedMessageCount(0);
+
+ template.sendBody(generateModel("Pauline"));
+ error.assertIsSatisfied();
+ result.assertIsSatisfied();
+ }
+
+ @Test
+ @DirtiesContext
+ public void testMarshallList() throws Exception {
+ expected = "10A9 PaulineM ISINXD12345678BUYShare000002500.45USD01-08-2009\r\n"
+ + "10A9 MarcoolM ISINXD12345678BUYShare000002500.45USD01-08-2009\r\n";
+ result.expectedBodiesReceived(expected);
+ error.expectedMessageCount(0);
+
+ List<Order> list = new ArrayList<Order>();
+ list.add(generateModel("Pauline"));
+ list.add(generateModel("Marcool"));
+ template.sendBody(list);
+ error.assertIsSatisfied();
+ result.assertIsSatisfied();
+ }
+
+ public Order generateModel(String firstName) {
+ Order order = new Order();
+ order.setOrderNr(10);
+ order.setOrderType("BUY");
+ order.setClientNr("A9");
+ order.setFirstName(firstName);
+ order.setLastName("M");
+ order.setAmount(new BigDecimal("2500.45"));
+ order.setInstrumentCode("ISIN");
+ order.setInstrumentNumber("XD12345678");
+ order.setInstrumentType("Share");
+ order.setCurrency("USD");
+
+ Calendar calendar = new GregorianCalendar();
+ calendar.set(2009, 7, 1);
+ order.setOrderDate(calendar.getTime());
+
+ return order;
+ }
+
+ @FixedLengthRecord(length = 65, paddingChar = ' ')
+ public static class Order {
+
+ @DataField(pos = 1, length = 2)
+ private int orderNr;
+
+ @DataField(pos = 3, length = 2)
+ private String clientNr;
+
+ @DataField(pos = 5, length = 9)
+ private String firstName;
+
+ @DataField(pos = 14, length = 5, align = "L")
+ private String lastName;
+
+ @DataField(pos = 19, length = 4)
+ private String instrumentCode;
+
+ @DataField(pos = 23, length = 10)
+ private String instrumentNumber;
+
+ @DataField(pos = 33, length = 3)
+ private String orderType;
+
+ @DataField(pos = 36, length = 5)
+ private String instrumentType;
+
+ @DataField(pos = 41, precision = 2, length = 12, paddingChar = '0')
+ private BigDecimal amount;
+
+ @DataField(pos = 53, length = 3)
+ private String currency;
+
+ @DataField(pos = 56, length = 10, pattern = "dd-MM-yyyy")
+ private Date orderDate;
+
+
+ public int getOrderNr() {
+ return orderNr;
+ }
+
+ public void setOrderNr(int orderNr) {
+ this.orderNr = orderNr;
+ }
+
+ public String getClientNr() {
+ return clientNr;
+ }
+
+ public void setClientNr(String clientNr) {
+ this.clientNr = clientNr;
+ }
+
+ public String getFirstName() {
+ return firstName;
+ }
+
+ public void setFirstName(String firstName) {
+ this.firstName = firstName;
+ }
+
+ public String getLastName() {
+ return lastName;
+ }
+
+ public void setLastName(String lastName) {
+ this.lastName = lastName;
+ }
+
+ public String getInstrumentCode() {
+ return instrumentCode;
+ }
+
+ public void setInstrumentCode(String instrumentCode) {
+ this.instrumentCode = instrumentCode;
+ }
+
+ public String getInstrumentNumber() {
+ return instrumentNumber;
+ }
+
+ public void setInstrumentNumber(String instrumentNumber) {
+ this.instrumentNumber = instrumentNumber;
+ }
+
+ public String getOrderType() {
+ return orderType;
+ }
+
+ public void setOrderType(String orderType) {
+ this.orderType = orderType;
+ }
+
+ public String getInstrumentType() {
+ return instrumentType;
+ }
+
+ public void setInstrumentType(String instrumentType) {
+ this.instrumentType = instrumentType;
+ }
+
+ public BigDecimal getAmount() {
+ return amount;
+ }
+
+ public void setAmount(BigDecimal amount) {
+ this.amount = amount;
+ }
+
+ public String getCurrency() {
+ return currency;
+ }
+
+ public void setCurrency(String currency) {
+ this.currency = currency;
+ }
+
+ public Date getOrderDate() {
+ return orderDate;
+ }
+
+ public void setOrderDate(Date orderDate) {
+ this.orderDate = orderDate;
+ }
+
+ @Override
+ public String toString() {
+ return "Model : " + Order.class.getName() + " : " + this.orderNr + ", " + this.orderType + ", " + String.valueOf(this.amount) + ", " + this.instrumentCode + ", "
+ + this.instrumentNumber + ", " + this.instrumentType + ", " + this.currency + ", " + this.clientNr + ", " + this.firstName + ", " + this.lastName + ", "
+ + String.valueOf(this.orderDate);
+ }
+ }
+
+
+}