camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ningji...@apache.org
Subject svn commit: r1443351 - in /camel/trunk/components/camel-bindy/src: main/java/org/apache/camel/dataformat/bindy/csv/ test/java/org/apache/camel/dataformat/bindy/csv/
Date Thu, 07 Feb 2013 08:39:45 GMT
Author: ningjiang
Date: Thu Feb  7 08:39:45 2013
New Revision: 1443351

URL: http://svn.apache.org/viewvc?rev=1443351&view=rev
Log:
CAMEL-6041 Fix the issue of Bindy does not handle separator at the end of quoted field

Added:
    camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCVSFieldEndingWithSeparatorIssueTest.java
    camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/Record.java
Modified:
    camel/trunk/components/camel-bindy/src/main/java/org/apache/camel/dataformat/bindy/csv/BindyCsvDataFormat.java

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=1443351&r1=1443350&r2=1443351&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 Feb  7 08:39:45 2013
@@ -224,6 +224,15 @@ public class BindyCsvDataFormat extends 
             // are we in progress of rebuilding a broken token
             boolean currentInProgress = current.length() > 0;
 
+            // situation when field ending with a separator symbol. 
+            if (currentInProgress && startQuote && s.isEmpty()) {
+                // Add separator, append current and reset it
+                current.append(separator);
+                answer.add(current.toString());
+                current.setLength(0);
+                continue;
+            }
+            
             // if we hit a start token then rebuild a broken token
             if (currentInProgress || startQuote) {
                 // append to current if we are in the middle of a start quote

Added: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCVSFieldEndingWithSeparatorIssueTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCVSFieldEndingWithSeparatorIssueTest.java?rev=1443351&view=auto
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCVSFieldEndingWithSeparatorIssueTest.java
(added)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/BindyCVSFieldEndingWithSeparatorIssueTest.java
Thu Feb  7 08:39:45 2013
@@ -0,0 +1,119 @@
+/**
+ * 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.csv;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ProducerTemplate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.model.dataformat.BindyType;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * The parsing issue when field ends with separator is fixed by updating BindyCvsDataFormat.unquoteTokens(..)<br>
+ * See capture.png<br>
+ * 
+ * The suggested update does fix only the separator at the end of field.
+ * !!! The separator in the beginning of the quoted field is still not handled.
+ *
+ */
+public class BindyCVSFieldEndingWithSeparatorIssueTest extends CamelTestSupport {
+
+    @Test
+    public void testBindy() throws Exception {
+        CamelContext ctx = new DefaultCamelContext();
+        ctx.addRoutes(createRoute()); // new ReconciliationRoute()
+        ctx.start();
+
+        String addressLine1 = "8506 SIX FORKS ROAD,";
+
+        MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
+        mock.expectedPropertyReceived("addressLine1", addressLine1);
+
+        String csvLine = "\"PROBLEM SOLVER\",\"" + addressLine1
+                         + "\",\"SUITE 104\",\"RALEIGH\",\"NC\",\"27615\",\"US\"";
+        ProducerTemplate template = ctx.createProducerTemplate();
+        template.sendBody("direct:fromCsv", csvLine.trim());
+
+        
+        mock.assertIsSatisfied();
+
+        // The algorithm of BindyCvsDataFormat.unquoteTokens(..) does not handle
+        // separator at end of a field
+        // addressLine1 results in the next field being appended -> '8506 SIX
+        // FORKS ROAD,,SUITE 104'
+    }
+
+    @Test
+    public void testBindyMoreSeparators() throws Exception {
+        CamelContext ctx = new DefaultCamelContext();
+        ctx.addRoutes(createRoute()); // new ReconciliationRoute()
+        ctx.start();
+
+        String addressLine1 = "8506 SIX FORKS ROAD, , ,,, ,";
+
+        MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
+        mock.expectedPropertyReceived("addressLine1", addressLine1);
+
+        String csvLine = "\"PROBLEM SOLVER\",\"" + addressLine1
+                         + "\",\"SUITE 104\",\"RALEIGH\",\"NC\",\"27615\",\"US\"";
+        ProducerTemplate template = ctx.createProducerTemplate();
+        template.sendBody("direct:fromCsv", csvLine.trim());
+        
+        mock.assertIsSatisfied();
+
+    }
+
+    @Test
+    @Ignore("This issue will be revisit when we have chance to rewrite bindy parser")
+    public void testBindySeparatorsAround() throws Exception {
+        CamelContext ctx = new DefaultCamelContext();
+        ctx.addRoutes(createRoute()); // new ReconciliationRoute()
+        ctx.start();
+
+        // TODO The separator in the beginning of the quoted field is still not handled.
+        // We may need to convert the separators in the quote into some kind of safe code

+        String addressLine1 = ",8506 SIX FORKS ROAD,";
+
+        MockEndpoint mock = ctx.getEndpoint("mock:result", MockEndpoint.class);
+        mock.expectedPropertyReceived("addressLine1", addressLine1);
+
+        String csvLine = "\"PROBLEM SOLVER\",\"" + addressLine1
+                         + "\",\"SUITE 104\",\"RALEIGH\",\"NC\",\"27615\",\"US\"";
+        ProducerTemplate template = ctx.createProducerTemplate();
+        template.sendBody("direct:fromCsv", csvLine.trim());
+        
+        mock.assertIsSatisfied();
+
+    }
+
+    private RouteBuilder createRoute() {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("direct:fromCsv").unmarshal().bindy(BindyType.Csv, Record.class)
+                    .setProperty("addressLine1", simple("${in.body.addressLine1}"))
+                    .setProperty("addressLine2", simple("${in.body.addressLine2}")).log("${in.body}")
+                    .to("mock:result");
+            }
+        };
+    }
+
+}

Added: camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/Record.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/Record.java?rev=1443351&view=auto
==============================================================================
--- camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/Record.java
(added)
+++ camel/trunk/components/camel-bindy/src/test/java/org/apache/camel/dataformat/bindy/csv/Record.java
Thu Feb  7 08:39:45 2013
@@ -0,0 +1,130 @@
+/**
+ * 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.csv;
+
+import java.io.Serializable;
+
+import org.apache.camel.dataformat.bindy.annotation.CsvRecord;
+import org.apache.camel.dataformat.bindy.annotation.DataField;
+
+@SuppressWarnings("serial")
+@CsvRecord(separator = "," , skipFirstLine = false)
+public class Record implements Serializable {
+
+    @DataField(pos = 1)
+    private String attention;
+    @DataField(pos = 2)
+    private String addressLine1;
+    @DataField(pos = 3)
+    private String addressLine2;
+    @DataField(pos = 4)
+    private String city;
+    @DataField(pos = 5)
+    private String state;
+    @DataField(pos = 6)
+    private String zip;
+    @DataField(pos = 7)
+    private String country;
+    @DataField(pos = 8)
+    private String dummy1;
+    @DataField(pos = 9)
+    private String dummy2;
+
+    public Record() {
+        super();
+    }
+
+    public String getAttention() {
+        return attention;
+    }
+
+    public void setAttention(String attention) {
+        this.attention = attention;
+    }
+
+    public String getAddressLine1() {
+        return addressLine1;
+    }
+
+    public void setAddressLine1(String addressLine1) {
+        this.addressLine1 = addressLine1;
+    }
+
+    public String getAddressLine2() {
+        return addressLine2;
+    }
+
+    public void setAddressLine2(String addressLine2) {
+        this.addressLine2 = addressLine2;
+    }
+
+    public String getCity() {
+        return city;
+    }
+
+    public void setCity(String city) {
+        this.city = city;
+    }
+
+    public String getState() {
+        return state;
+    }
+
+    public void setState(String state) {
+        this.state = state;
+    }
+
+    public String getZip() {
+        return zip;
+    }
+
+    public void setZip(String zip) {
+        this.zip = zip;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public void setCountry(String country) {
+        this.country = country;
+    }
+
+    public String getDummy1() {
+        return dummy1;
+    }
+
+    public void setDummy1(String dummy1) {
+        this.dummy1 = dummy1;
+    }
+
+    public String getDummy2() {
+        return dummy2;
+    }
+
+    public void setDummy2(String dummy2) {
+        this.dummy2 = dummy2;
+    }
+
+    @Override
+    public String toString() {
+        return "Record [attention=" + attention + ", addressLine1=" + addressLine1 + ", addressLine2="
+               + addressLine2 + ", city=" + city + ", state=" + state + ", zip=" + zip +
", country="
+               + country + ", dummy1=" + dummy1 + ", dummy2=" + dummy2 + "]";
+    }
+
+}



Mime
View raw message