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 2017/05/24 11:23:23 UTC
[1/2] camel git commit: CAMEL-11313 Set defaultValue when using
BindyFixedLengthFactory
Repository: camel
Updated Branches:
refs/heads/camel-2.19.x 894a54f25 -> c0d70f609
refs/heads/master 12d4f2d10 -> c3fbf76a3
CAMEL-11313 Set defaultValue when using BindyFixedLengthFactory
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0d70f60
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0d70f60
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0d70f60
Branch: refs/heads/camel-2.19.x
Commit: c0d70f609e0028314064d8ad9becbfd4bcd00dfc
Parents: 894a54f
Author: jpoth <po...@gmail.com>
Authored: Wed May 24 12:02:29 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed May 24 13:22:14 2017 +0200
----------------------------------------------------------------------
.../bindy/BindyFixedLengthFactory.java | 6 +
...yMarshallUnmarshallWithDefaultValueTest.java | 237 +++++++++++++++++++
2 files changed, 243 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c0d70f60/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
index 302a2f7..0435eb0 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
@@ -33,6 +33,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
import org.apache.camel.dataformat.bindy.annotation.Link;
import org.apache.camel.dataformat.bindy.format.FormatException;
import org.apache.camel.dataformat.bindy.util.ConverterUtils;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -404,6 +405,11 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
// Get field value
Object value = field.get(obj);
+ // If the field value is empty, populate it with the default value
+ if (ObjectHelper.isNotEmpty(datafield.defaultValue()) && ObjectHelper.isEmpty(value)) {
+ value = datafield.defaultValue();
+ }
+
result = formatString(format, value);
// trim if enabled
http://git-wip-us.apache.org/repos/asf/camel/blob/c0d70f60/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java
new file mode 100644
index 0000000..5c6fd2a
--- /dev/null
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java
@@ -0,0 +1,237 @@
+/**
+ * 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;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+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.BindyType;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class BindyMarshallUnmarshallWithDefaultValueTest extends CamelTestSupport {
+
+ @Test
+ public void testUnMarshallMessage() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:resultUnmarshal");
+ template.sendBody("direct:unmarshal", "10A9 ISINXD12345678BUYShare000002500.45USD01-08-2009Hello ");
+
+ // check the model
+ Order order = mock.getReceivedExchanges().get(0).getIn().getBody(Order.class);
+ Assert.assertEquals(10, order.getOrderNr());
+ // Default values are set
+ Assert.assertEquals("John", order.getFirstName());
+ Assert.assertEquals("Doe", order.getLastName());
+ Assert.assertEquals("Hello ", order.getComment());
+ }
+
+ @Test
+ public void testMarshallMessage() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:resultMarshal");
+
+ mock.expectedBodiesReceived("10A9 JohnDoe ISINXD12345678BUYShare000002500.45USD01-08-2009 \r\n");
+
+ template.sendBody("direct:marshal", createOrder());
+ mock.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("direct:marshal")
+ .marshal().bindy(BindyType.Fixed, Order.class)
+ .to("mock:resultMarshal");
+
+ from("direct:unmarshal")
+ .unmarshal().bindy(BindyType.Fixed, Order.class)
+ .to("mock:resultUnmarshal");
+ }
+ };
+
+ }
+
+ private Order createOrder() {
+ Order order = new Order();
+ order.setOrderNr(10);
+ order.setOrderType("BUY");
+ order.setClientNr("A9");
+ 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 = 75)
+ 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, defaultValue = "John", trim = true)
+ private String firstName;
+
+ @DataField(pos = 14, length = 5, align = "L", defaultValue = "Doe", trim = true)
+ 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;
+
+ @DataField(pos = 66, length = 10)
+ private String comment;
+
+ 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;
+ }
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ @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-11313 Set defaultValue when using
BindyFixedLengthFactory
Posted by da...@apache.org.
CAMEL-11313 Set defaultValue when using BindyFixedLengthFactory
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c3fbf76a
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c3fbf76a
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c3fbf76a
Branch: refs/heads/master
Commit: c3fbf76a3f916082753850d8d2411313a2595a83
Parents: 12d4f2d
Author: jpoth <po...@gmail.com>
Authored: Wed May 24 12:02:29 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed May 24 13:23:16 2017 +0200
----------------------------------------------------------------------
.../bindy/BindyFixedLengthFactory.java | 6 +
...yMarshallUnmarshallWithDefaultValueTest.java | 237 +++++++++++++++++++
2 files changed, 243 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c3fbf76a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
index 302a2f7..0435eb0 100644
--- a/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
+++ b/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/BindyFixedLengthFactory.java
@@ -33,6 +33,7 @@ import org.apache.camel.dataformat.bindy.annotation.FixedLengthRecord;
import org.apache.camel.dataformat.bindy.annotation.Link;
import org.apache.camel.dataformat.bindy.format.FormatException;
import org.apache.camel.dataformat.bindy.util.ConverterUtils;
+import org.apache.camel.util.ObjectHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -404,6 +405,11 @@ public class BindyFixedLengthFactory extends BindyAbstractFactory implements Bin
// Get field value
Object value = field.get(obj);
+ // If the field value is empty, populate it with the default value
+ if (ObjectHelper.isNotEmpty(datafield.defaultValue()) && ObjectHelper.isEmpty(value)) {
+ value = datafield.defaultValue();
+ }
+
result = formatString(format, value);
// trim if enabled
http://git-wip-us.apache.org/repos/asf/camel/blob/c3fbf76a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java
new file mode 100644
index 0000000..5c6fd2a
--- /dev/null
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/fixed/BindyMarshallUnmarshallWithDefaultValueTest.java
@@ -0,0 +1,237 @@
+/**
+ * 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;
+
+import java.math.BigDecimal;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+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.BindyType;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Assert;
+import org.junit.Test;
+
+public class BindyMarshallUnmarshallWithDefaultValueTest extends CamelTestSupport {
+
+ @Test
+ public void testUnMarshallMessage() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:resultUnmarshal");
+ template.sendBody("direct:unmarshal", "10A9 ISINXD12345678BUYShare000002500.45USD01-08-2009Hello ");
+
+ // check the model
+ Order order = mock.getReceivedExchanges().get(0).getIn().getBody(Order.class);
+ Assert.assertEquals(10, order.getOrderNr());
+ // Default values are set
+ Assert.assertEquals("John", order.getFirstName());
+ Assert.assertEquals("Doe", order.getLastName());
+ Assert.assertEquals("Hello ", order.getComment());
+ }
+
+ @Test
+ public void testMarshallMessage() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:resultMarshal");
+
+ mock.expectedBodiesReceived("10A9 JohnDoe ISINXD12345678BUYShare000002500.45USD01-08-2009 \r\n");
+
+ template.sendBody("direct:marshal", createOrder());
+ mock.assertIsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() {
+ from("direct:marshal")
+ .marshal().bindy(BindyType.Fixed, Order.class)
+ .to("mock:resultMarshal");
+
+ from("direct:unmarshal")
+ .unmarshal().bindy(BindyType.Fixed, Order.class)
+ .to("mock:resultUnmarshal");
+ }
+ };
+
+ }
+
+ private Order createOrder() {
+ Order order = new Order();
+ order.setOrderNr(10);
+ order.setOrderType("BUY");
+ order.setClientNr("A9");
+ 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 = 75)
+ 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, defaultValue = "John", trim = true)
+ private String firstName;
+
+ @DataField(pos = 14, length = 5, align = "L", defaultValue = "Doe", trim = true)
+ 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;
+
+ @DataField(pos = 66, length = 10)
+ private String comment;
+
+ 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;
+ }
+
+ public String getComment() {
+ return comment;
+ }
+
+ public void setComment(String comment) {
+ this.comment = comment;
+ }
+
+ @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);
+ }
+ }
+
+}