You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/03/14 12:53:45 UTC
camel git commit: CAMEL-11012 bindy csv doesn't populate with
defaultValue on marshal
Repository: camel
Updated Branches:
refs/heads/master 4763c62bb -> 910b678f7
CAMEL-11012 bindy csv doesn't populate with defaultValue on marshal
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/910b678f
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/910b678f
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/910b678f
Branch: refs/heads/master
Commit: 910b678f752139a1f52dc7247b281c464e79349c
Parents: 4763c62
Author: Tomohisa Igarashi <tm...@gmail.com>
Authored: Tue Mar 14 21:40:55 2017 +0900
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Tue Mar 14 13:51:10 2017 +0100
----------------------------------------------------------------------
.../camel/dataformat/bindy/BindyCsvFactory.java | 5 ++
...ndyMarshalUnmarshalWithDefaultValueTest.java | 71 ++++++++++++++++++++
.../dataformat/bindy/csv2/WeatherModel.java | 2 +-
3 files changed, 77 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/910b678f/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 b437835..a055855 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
@@ -410,6 +410,11 @@ public class BindyCsvFactory extends BindyAbstractFactory implements BindyFactor
// 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);
if (datafield.trim()) {
http://git-wip-us.apache.org/repos/asf/camel/blob/910b678f/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java
new file mode 100644
index 0000000..d996cb9
--- /dev/null
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/BindyMarshalUnmarshalWithDefaultValueTest.java
@@ -0,0 +1,71 @@
+/**
+ * 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.csv2;
+
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.dataformat.bindy.util.ConverterUtils;
+import org.apache.camel.model.dataformat.BindyType;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+/**
+ *
+ */
+public class BindyMarshalUnmarshalWithDefaultValueTest extends CamelTestSupport {
+
+ @Test
+ public void testBindyMarshalWithDefaultValue() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:resultMarshal");
+ mock.expectedBodiesReceived("\"123\",\"Wednesday, November 9, 2011\",\"North Pole\"" + ConverterUtils.getStringCarriageReturn("WINDOWS"));
+
+ WeatherModel model = new WeatherModel();
+ model.setId(123);
+ model.setDate("Wednesday, November 9, 2011");
+
+ template.sendBody("direct:marshal", model);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Test
+ public void testBindyUnmarshalWithDefaultValue() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:resultUnmarshal");
+
+ String request = "\"123\",\"Wednesday, November 9, 2011\",\"\"" + ConverterUtils.getStringCarriageReturn("WINDOWS");
+ template.sendBody("direct:unmarshal", request);
+ WeatherModel answer = mock.getReceivedExchanges().get(0).getIn().getBody(WeatherModel.class);
+ assertEquals(123, answer.getId());
+ assertEquals("Wednesday, November 9, 2011", answer.getDate());
+ assertEquals("North Pole", answer.getPlace());
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:marshal")
+ .marshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class)
+ .to("mock:resultMarshal");
+ from("direct:unmarshal")
+ .unmarshal().bindy(BindyType.Csv, org.apache.camel.dataformat.bindy.csv2.WeatherModel.class)
+ .to("mock:resultUnmarshal");
+ }
+ };
+ }
+}
http://git-wip-us.apache.org/repos/asf/camel/blob/910b678f/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/WeatherModel.java
----------------------------------------------------------------------
diff --git a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/WeatherModel.java b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/WeatherModel.java
index e715e6d..9779cbb 100644
--- a/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/WeatherModel.java
+++ b/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv2/WeatherModel.java
@@ -29,7 +29,7 @@ public class WeatherModel {
private int id;
@DataField(pos = 2)
private String date;
- @DataField(pos = 3)
+ @DataField(pos = 3, defaultValue = "North Pole")
private String place;
public String getDate() {