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 2015/12/05 10:02:46 UTC
[1/6] camel git commit: Changed the DynamicColumnMarshaller to always
use the record map to define the columns. This allows the marshaller to be
reused for asymmetric records.
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x 958b66b60 -> b4b8c656a
refs/heads/master 0a36e769a -> 19e63dbaf
Changed the DynamicColumnMarshaller to always use the record map to define the columns. This allows the marshaller to be reused for asymmetric records.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bbc905eb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bbc905eb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bbc905eb
Branch: refs/heads/master
Commit: bbc905eb6f6ef03d139e74b2fb37b63e09fd8880
Parents: 0a36e76
Author: Fabricio Toresan <fa...@senior.com.br>
Authored: Mon Nov 30 16:42:37 2015 -0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Dec 5 09:53:19 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/dataformat/csv/CsvMarshaller.java | 8 ++------
.../org/apache/camel/dataformat/csv/CsvMarshalTest.java | 12 ++++++++++++
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bbc905eb/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
index f23f1ec..2764d5e 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
@@ -22,7 +22,6 @@ import java.io.OutputStreamWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -130,17 +129,14 @@ abstract class CsvMarshaller {
* This marshaller adapts the columns but always keep them in the same order
*/
private static final class DynamicColumnsMarshaller extends CsvMarshaller {
- private final LinkedHashSet<Object> columns = new LinkedHashSet<Object>();
-
private DynamicColumnsMarshaller(CSVFormat format) {
super(format);
}
@Override
protected Iterable<?> getMapRecordValues(Map<?, ?> map) {
- columns.addAll(map.keySet());
- List<Object> result = new ArrayList<Object>(columns.size());
- for (Object key : columns) {
+ List<Object> result = new ArrayList<Object>(map.size());
+ for (Object key : map.keySet()) {
result.add(map.get(key));
}
return result;
http://git-wip-us.apache.org/repos/asf/camel/blob/bbc905eb/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
index f232ad5..8f44d9b 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
@@ -98,6 +98,18 @@ public class CsvMarshalTest extends CamelTestSupport {
assertArrayEquals(new String[]{"A,C", "1,3", "one,three"}, readOutputLines());
}
+ @Test
+ public void shouldMarshalDifferentDynamicColumns() throws Exception {
+ output.expectedMessageCount(2);
+
+ template.sendBody("direct:default", TestUtils.asMap("A", "1", "B", "2"));
+ template.sendBody("direct:default", TestUtils.asMap("X", "1", "Y", "2", "Z", "3"));
+
+ output.assertIsSatisfied();
+ assertArrayEquals(new String[]{"1,2"}, readOutputLines());
+ assertArrayEquals(new String[]{"1,2,3"}, output.getExchanges().get(1).getIn().getBody(String.class).split("\r\n|\r|\n"));
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
[2/6] camel git commit: Order matter so use linked hashmap instead of
hashmap
Posted by da...@apache.org.
Order matter so use linked hashmap instead of hashmap
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/07e80718
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/07e80718
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/07e80718
Branch: refs/heads/master
Commit: 07e8071855d29ecf4ae44389e90e71229d1a6139
Parents: bbc905e
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Dec 5 10:00:29 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Dec 5 10:00:29 2015 +0100
----------------------------------------------------------------------
.../camel/dataformat/csv/CsvMarshalTest.java | 19 +++++++++----------
.../camel/dataformat/csv/CsvRouteTest.java | 12 ++++++------
.../apache/camel/dataformat/csv/TestUtils.java | 4 ++--
3 files changed, 17 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/07e80718/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
index 8f44d9b..3827d67 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.dataformat.csv;
-
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -44,7 +43,7 @@ public class CsvMarshalTest extends CamelTestSupport {
));
output.assertIsSatisfied();
- String[] actuals = readOutputLines();
+ String[] actuals = readOutputLines(0);
assertArrayEquals(new String[]{"1,2,3", "one,two,three"}, actuals);
}
@@ -58,7 +57,7 @@ public class CsvMarshalTest extends CamelTestSupport {
));
output.assertIsSatisfied();
- String[] actuals = readOutputLines();
+ String[] actuals = readOutputLines(0);
assertArrayEquals(new String[]{"1", "one"}, actuals);
}
@@ -72,7 +71,7 @@ public class CsvMarshalTest extends CamelTestSupport {
));
output.assertIsSatisfied();
- assertArrayEquals(new String[]{"1,2,3", "one,two,three"}, readOutputLines());
+ assertArrayEquals(new String[]{"1,2,3", "one,two,three"}, readOutputLines(0));
}
@Test
@@ -82,7 +81,7 @@ public class CsvMarshalTest extends CamelTestSupport {
template.sendBody("direct:default", TestUtils.asMap("A", "1", "B", "2", "C", "3"));
output.assertIsSatisfied();
- assertArrayEquals(new String[]{"1,2,3"}, readOutputLines());
+ assertArrayEquals(new String[]{"1,2,3"}, readOutputLines(0));
}
@Test
@@ -95,7 +94,7 @@ public class CsvMarshalTest extends CamelTestSupport {
));
output.assertIsSatisfied();
- assertArrayEquals(new String[]{"A,C", "1,3", "one,three"}, readOutputLines());
+ assertArrayEquals(new String[]{"A,C", "1,3", "one,three"}, readOutputLines(0));
}
@Test
@@ -106,8 +105,8 @@ public class CsvMarshalTest extends CamelTestSupport {
template.sendBody("direct:default", TestUtils.asMap("X", "1", "Y", "2", "Z", "3"));
output.assertIsSatisfied();
- assertArrayEquals(new String[]{"1,2"}, readOutputLines());
- assertArrayEquals(new String[]{"1,2,3"}, output.getExchanges().get(1).getIn().getBody(String.class).split("\r\n|\r|\n"));
+ assertArrayEquals(new String[]{"1,2"}, readOutputLines(0));
+ assertArrayEquals(new String[]{"1,2,3"}, readOutputLines(1));
}
@@ -129,7 +128,7 @@ public class CsvMarshalTest extends CamelTestSupport {
};
}
- private String[] readOutputLines() {
- return output.getExchanges().get(0).getIn().getBody(String.class).split("\r\n|\r|\n");
+ private String[] readOutputLines(int index) {
+ return output.getExchanges().get(index).getIn().getBody(String.class).split("\r\n|\r|\n");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/07e80718/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
index 91b718a..bf9ccd0 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
@@ -32,7 +32,7 @@
*/
package org.apache.camel.dataformat.csv;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
@@ -55,7 +55,7 @@ public class CsvRouteTest extends CamelTestSupport {
resultEndpoint.expectedMessageCount(1);
// START SNIPPET: marshalInput
- Map<String, Object> body = new HashMap<String, Object>();
+ Map<String, Object> body = new LinkedHashMap<String, Object>();
body.put("foo", "abc");
body.put("bar", 123);
// END SNIPPET: marshalInput
@@ -82,11 +82,11 @@ public class CsvRouteTest extends CamelTestSupport {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:resultMulti",
MockEndpoint.class);
resultEndpoint.expectedMessageCount(2);
- Map<String, Object> body1 = new HashMap<String, Object>();
+ Map<String, Object> body1 = new LinkedHashMap<String, Object>();
body1.put("foo", "abc");
body1.put("bar", 123);
- Map<String, Object> body2 = new HashMap<String, Object>();
+ Map<String, Object> body2 = new LinkedHashMap<String, Object>();
body2.put("foo", "def");
body2.put("bar", 456);
body2.put("baz", 789);
@@ -123,11 +123,11 @@ public class CsvRouteTest extends CamelTestSupport {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:resultMultiCustom",
MockEndpoint.class);
resultEndpoint.expectedMessageCount(2);
- Map<String, Object> body1 = new HashMap<String, Object>();
+ Map<String, Object> body1 = new LinkedHashMap<String, Object>();
body1.put("foo", "abc");
body1.put("bar", 123);
- Map<String, Object> body2 = new HashMap<String, Object>();
+ Map<String, Object> body2 = new LinkedHashMap<String, Object>();
body2.put("foo", "def");
body2.put("bar", 456);
body2.put("baz", 789);
http://git-wip-us.apache.org/repos/asf/camel/blob/07e80718/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java
index 38e74a7..6d4b0b7 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.dataformat.csv;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
/**
@@ -39,7 +39,7 @@ final class TestUtils {
throw new IllegalArgumentException("Cannot create a map with an add number of strings");
}
- Map<String, String> map = new HashMap<String, String>(strings.length / 2);
+ Map<String, String> map = new LinkedHashMap<>(strings.length / 2);
for (int i = 0; i < strings.length; i += 2) {
map.put(strings[i], strings[i + 1]);
}
[3/6] camel git commit: Fixed CS. Fixes #704. Fixes #707.
Posted by da...@apache.org.
Fixed CS. Fixes #704. Fixes #707.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/19e63dba
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/19e63dba
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/19e63dba
Branch: refs/heads/master
Commit: 19e63dbaf56d1dd53e63d06c784bb2ab69980679
Parents: 07e8071
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Dec 5 10:01:36 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Dec 5 10:01:36 2015 +0100
----------------------------------------------------------------------
.../camel/dataformat/csv/CsvMarshalTest.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/19e63dba/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
index 3827d67..35929e9 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
@@ -99,16 +99,15 @@ public class CsvMarshalTest extends CamelTestSupport {
@Test
public void shouldMarshalDifferentDynamicColumns() throws Exception {
- output.expectedMessageCount(2);
-
- template.sendBody("direct:default", TestUtils.asMap("A", "1", "B", "2"));
- template.sendBody("direct:default", TestUtils.asMap("X", "1", "Y", "2", "Z", "3"));
-
- output.assertIsSatisfied();
- assertArrayEquals(new String[]{"1,2"}, readOutputLines(0));
- assertArrayEquals(new String[]{"1,2,3"}, readOutputLines(1));
+ output.expectedMessageCount(2);
+
+ template.sendBody("direct:default", TestUtils.asMap("A", "1", "B", "2"));
+ template.sendBody("direct:default", TestUtils.asMap("X", "1", "Y", "2", "Z", "3"));
+
+ output.assertIsSatisfied();
+ assertArrayEquals(new String[]{"1,2"}, readOutputLines(0));
+ assertArrayEquals(new String[]{"1,2,3"}, readOutputLines(1));
}
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
[6/6] camel git commit: Fixed CS. Fixes #704. Fixes #707.
Posted by da...@apache.org.
Fixed CS. Fixes #704. Fixes #707.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/b4b8c656
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/b4b8c656
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/b4b8c656
Branch: refs/heads/camel-2.16.x
Commit: b4b8c656af1adee0877cb2b3dd41150fc9d65eae
Parents: 913c8ec
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Dec 5 10:01:36 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Dec 5 10:02:13 2015 +0100
----------------------------------------------------------------------
.../camel/dataformat/csv/CsvMarshalTest.java | 17 ++++++++---------
1 file changed, 8 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/b4b8c656/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
index 3827d67..35929e9 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
@@ -99,16 +99,15 @@ public class CsvMarshalTest extends CamelTestSupport {
@Test
public void shouldMarshalDifferentDynamicColumns() throws Exception {
- output.expectedMessageCount(2);
-
- template.sendBody("direct:default", TestUtils.asMap("A", "1", "B", "2"));
- template.sendBody("direct:default", TestUtils.asMap("X", "1", "Y", "2", "Z", "3"));
-
- output.assertIsSatisfied();
- assertArrayEquals(new String[]{"1,2"}, readOutputLines(0));
- assertArrayEquals(new String[]{"1,2,3"}, readOutputLines(1));
+ output.expectedMessageCount(2);
+
+ template.sendBody("direct:default", TestUtils.asMap("A", "1", "B", "2"));
+ template.sendBody("direct:default", TestUtils.asMap("X", "1", "Y", "2", "Z", "3"));
+
+ output.assertIsSatisfied();
+ assertArrayEquals(new String[]{"1,2"}, readOutputLines(0));
+ assertArrayEquals(new String[]{"1,2,3"}, readOutputLines(1));
}
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
[4/6] camel git commit: Changed the DynamicColumnMarshaller to always
use the record map to define the columns. This allows the marshaller to be
reused for asymmetric records.
Posted by da...@apache.org.
Changed the DynamicColumnMarshaller to always use the record map to define the columns. This allows the marshaller to be reused for asymmetric records.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/aab14d79
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/aab14d79
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/aab14d79
Branch: refs/heads/camel-2.16.x
Commit: aab14d7966a69abdd2dd396c4f82b79e0e0c6246
Parents: 958b66b
Author: Fabricio Toresan <fa...@senior.com.br>
Authored: Mon Nov 30 16:42:37 2015 -0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Dec 5 10:02:00 2015 +0100
----------------------------------------------------------------------
.../org/apache/camel/dataformat/csv/CsvMarshaller.java | 8 ++------
.../org/apache/camel/dataformat/csv/CsvMarshalTest.java | 12 ++++++++++++
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/aab14d79/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
index f23f1ec..2764d5e 100644
--- a/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
+++ b/components/camel-csv/src/main/java/org/apache/camel/dataformat/csv/CsvMarshaller.java
@@ -22,7 +22,6 @@ import java.io.OutputStreamWriter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
-import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
@@ -130,17 +129,14 @@ abstract class CsvMarshaller {
* This marshaller adapts the columns but always keep them in the same order
*/
private static final class DynamicColumnsMarshaller extends CsvMarshaller {
- private final LinkedHashSet<Object> columns = new LinkedHashSet<Object>();
-
private DynamicColumnsMarshaller(CSVFormat format) {
super(format);
}
@Override
protected Iterable<?> getMapRecordValues(Map<?, ?> map) {
- columns.addAll(map.keySet());
- List<Object> result = new ArrayList<Object>(columns.size());
- for (Object key : columns) {
+ List<Object> result = new ArrayList<Object>(map.size());
+ for (Object key : map.keySet()) {
result.add(map.get(key));
}
return result;
http://git-wip-us.apache.org/repos/asf/camel/blob/aab14d79/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
index f232ad5..8f44d9b 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
@@ -98,6 +98,18 @@ public class CsvMarshalTest extends CamelTestSupport {
assertArrayEquals(new String[]{"A,C", "1,3", "one,three"}, readOutputLines());
}
+ @Test
+ public void shouldMarshalDifferentDynamicColumns() throws Exception {
+ output.expectedMessageCount(2);
+
+ template.sendBody("direct:default", TestUtils.asMap("A", "1", "B", "2"));
+ template.sendBody("direct:default", TestUtils.asMap("X", "1", "Y", "2", "Z", "3"));
+
+ output.assertIsSatisfied();
+ assertArrayEquals(new String[]{"1,2"}, readOutputLines());
+ assertArrayEquals(new String[]{"1,2,3"}, output.getExchanges().get(1).getIn().getBody(String.class).split("\r\n|\r|\n"));
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
[5/6] camel git commit: Order matter so use linked hashmap instead of
hashmap
Posted by da...@apache.org.
Order matter so use linked hashmap instead of hashmap
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/913c8ec0
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/913c8ec0
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/913c8ec0
Branch: refs/heads/camel-2.16.x
Commit: 913c8ec0cf696d0defabe4432405a1c8089c5286
Parents: aab14d7
Author: Claus Ibsen <da...@apache.org>
Authored: Sat Dec 5 10:00:29 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Sat Dec 5 10:02:07 2015 +0100
----------------------------------------------------------------------
.../camel/dataformat/csv/CsvMarshalTest.java | 19 +++++++++----------
.../camel/dataformat/csv/CsvRouteTest.java | 12 ++++++------
.../apache/camel/dataformat/csv/TestUtils.java | 4 ++--
3 files changed, 17 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/913c8ec0/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
index 8f44d9b..3827d67 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvMarshalTest.java
@@ -16,7 +16,6 @@
*/
package org.apache.camel.dataformat.csv;
-
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -44,7 +43,7 @@ public class CsvMarshalTest extends CamelTestSupport {
));
output.assertIsSatisfied();
- String[] actuals = readOutputLines();
+ String[] actuals = readOutputLines(0);
assertArrayEquals(new String[]{"1,2,3", "one,two,three"}, actuals);
}
@@ -58,7 +57,7 @@ public class CsvMarshalTest extends CamelTestSupport {
));
output.assertIsSatisfied();
- String[] actuals = readOutputLines();
+ String[] actuals = readOutputLines(0);
assertArrayEquals(new String[]{"1", "one"}, actuals);
}
@@ -72,7 +71,7 @@ public class CsvMarshalTest extends CamelTestSupport {
));
output.assertIsSatisfied();
- assertArrayEquals(new String[]{"1,2,3", "one,two,three"}, readOutputLines());
+ assertArrayEquals(new String[]{"1,2,3", "one,two,three"}, readOutputLines(0));
}
@Test
@@ -82,7 +81,7 @@ public class CsvMarshalTest extends CamelTestSupport {
template.sendBody("direct:default", TestUtils.asMap("A", "1", "B", "2", "C", "3"));
output.assertIsSatisfied();
- assertArrayEquals(new String[]{"1,2,3"}, readOutputLines());
+ assertArrayEquals(new String[]{"1,2,3"}, readOutputLines(0));
}
@Test
@@ -95,7 +94,7 @@ public class CsvMarshalTest extends CamelTestSupport {
));
output.assertIsSatisfied();
- assertArrayEquals(new String[]{"A,C", "1,3", "one,three"}, readOutputLines());
+ assertArrayEquals(new String[]{"A,C", "1,3", "one,three"}, readOutputLines(0));
}
@Test
@@ -106,8 +105,8 @@ public class CsvMarshalTest extends CamelTestSupport {
template.sendBody("direct:default", TestUtils.asMap("X", "1", "Y", "2", "Z", "3"));
output.assertIsSatisfied();
- assertArrayEquals(new String[]{"1,2"}, readOutputLines());
- assertArrayEquals(new String[]{"1,2,3"}, output.getExchanges().get(1).getIn().getBody(String.class).split("\r\n|\r|\n"));
+ assertArrayEquals(new String[]{"1,2"}, readOutputLines(0));
+ assertArrayEquals(new String[]{"1,2,3"}, readOutputLines(1));
}
@@ -129,7 +128,7 @@ public class CsvMarshalTest extends CamelTestSupport {
};
}
- private String[] readOutputLines() {
- return output.getExchanges().get(0).getIn().getBody(String.class).split("\r\n|\r|\n");
+ private String[] readOutputLines(int index) {
+ return output.getExchanges().get(index).getIn().getBody(String.class).split("\r\n|\r|\n");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/913c8ec0/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
index 91b718a..bf9ccd0 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/CsvRouteTest.java
@@ -32,7 +32,7 @@
*/
package org.apache.camel.dataformat.csv;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.regex.Pattern;
@@ -55,7 +55,7 @@ public class CsvRouteTest extends CamelTestSupport {
resultEndpoint.expectedMessageCount(1);
// START SNIPPET: marshalInput
- Map<String, Object> body = new HashMap<String, Object>();
+ Map<String, Object> body = new LinkedHashMap<String, Object>();
body.put("foo", "abc");
body.put("bar", 123);
// END SNIPPET: marshalInput
@@ -82,11 +82,11 @@ public class CsvRouteTest extends CamelTestSupport {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:resultMulti",
MockEndpoint.class);
resultEndpoint.expectedMessageCount(2);
- Map<String, Object> body1 = new HashMap<String, Object>();
+ Map<String, Object> body1 = new LinkedHashMap<String, Object>();
body1.put("foo", "abc");
body1.put("bar", 123);
- Map<String, Object> body2 = new HashMap<String, Object>();
+ Map<String, Object> body2 = new LinkedHashMap<String, Object>();
body2.put("foo", "def");
body2.put("bar", 456);
body2.put("baz", 789);
@@ -123,11 +123,11 @@ public class CsvRouteTest extends CamelTestSupport {
MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:resultMultiCustom",
MockEndpoint.class);
resultEndpoint.expectedMessageCount(2);
- Map<String, Object> body1 = new HashMap<String, Object>();
+ Map<String, Object> body1 = new LinkedHashMap<String, Object>();
body1.put("foo", "abc");
body1.put("bar", 123);
- Map<String, Object> body2 = new HashMap<String, Object>();
+ Map<String, Object> body2 = new LinkedHashMap<String, Object>();
body2.put("foo", "def");
body2.put("bar", 456);
body2.put("baz", 789);
http://git-wip-us.apache.org/repos/asf/camel/blob/913c8ec0/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java
----------------------------------------------------------------------
diff --git a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java
index 38e74a7..6d4b0b7 100644
--- a/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java
+++ b/components/camel-csv/src/test/java/org/apache/camel/dataformat/csv/TestUtils.java
@@ -16,7 +16,7 @@
*/
package org.apache.camel.dataformat.csv;
-import java.util.HashMap;
+import java.util.LinkedHashMap;
import java.util.Map;
/**
@@ -39,7 +39,7 @@ final class TestUtils {
throw new IllegalArgumentException("Cannot create a map with an add number of strings");
}
- Map<String, String> map = new HashMap<String, String>(strings.length / 2);
+ Map<String, String> map = new LinkedHashMap<>(strings.length / 2);
for (int i = 0; i < strings.length; i += 2) {
map.put(strings[i], strings[i + 1]);
}