You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ra...@apache.org on 2014/02/28 20:22:06 UTC
[1/2] git commit: CAMEL-7258 Fix camel-xmljson elementName and
arrayName settings when using the xmljson() DSL. This closes #105.
Repository: camel
Updated Branches:
refs/heads/master c079447c0 -> a9af352b7
CAMEL-7258 Fix camel-xmljson elementName and arrayName settings when using the xmljson() DSL. This closes #105.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/bc61b7eb
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/bc61b7eb
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/bc61b7eb
Branch: refs/heads/master
Commit: bc61b7eb2f40cb6ff6027d59ad68ee5cc2d3fae0
Parents: c079447
Author: Alexander Lomov <al...@gmail.com>
Authored: Fri Feb 28 17:26:58 2014 +0400
Committer: Raul Kripalani <ra...@apache.org>
Committed: Fri Feb 28 19:15:46 2014 +0000
----------------------------------------------------------------------
.../org/apache/camel/model/dataformat/XmlJsonDataFormat.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/bc61b7eb/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
index b29f4ed..31eb6e7 100644
--- a/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
+++ b/camel-core/src/main/java/org/apache/camel/model/dataformat/XmlJsonDataFormat.java
@@ -96,10 +96,10 @@ public class XmlJsonDataFormat extends DataFormatDefinition {
rootName = options.get(ROOT_NAME);
}
if (options.containsKey(ELEMENT_NAME)) {
- encoding = options.get(ELEMENT_NAME);
+ elementName = options.get(ELEMENT_NAME);
}
if (options.containsKey(ARRAY_NAME)) {
- elementName = options.get(ARRAY_NAME);
+ arrayName = options.get(ARRAY_NAME);
}
if (options.containsKey(EXPANDABLE_PROPERTIES)) {
expandableProperties = Arrays.asList(options.get(EXPANDABLE_PROPERTIES).split(" "));
[2/2] git commit: CAMEL-7258 camel-xmljson: add tests for marshalling
and unmarshalling JSON arrays.
Posted by ra...@apache.org.
CAMEL-7258 camel-xmljson: add tests for marshalling and unmarshalling JSON arrays.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a9af352b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a9af352b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a9af352b
Branch: refs/heads/master
Commit: a9af352b7afa6a26c0d846bc2c3bf0be952cc123
Parents: bc61b7e
Author: Raul Kripalani <ra...@apache.org>
Authored: Fri Feb 28 19:15:35 2014 +0000
Committer: Raul Kripalani <ra...@apache.org>
Committed: Fri Feb 28 19:16:40 2014 +0000
----------------------------------------------------------------------
.../xmljson/XmlJsonDataFormatTest.java | 41 +++++++++++++++++++-
1 file changed, 39 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a9af352b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java
----------------------------------------------------------------------
diff --git a/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java
index 6c4b19f..af8ade6 100644
--- a/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java
+++ b/components/camel-xmljson/src/test/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormatTest.java
@@ -27,6 +27,7 @@ import javax.xml.transform.sax.SAXSource;
import org.w3c.dom.Document;
import net.sf.json.JSON;
+import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import net.sf.json.JSONSerializer;
import org.apache.camel.builder.RouteBuilder;
@@ -177,6 +178,32 @@ public class XmlJsonDataFormatTest extends CamelTestSupport {
mockXML.assertIsSatisfied();
}
+ @Test
+ public void testJsonArraysToXml() throws Exception {
+ MockEndpoint mockXML = getMockEndpoint("mock:xmlInlineOptionsArray");
+ mockXML.expectedMessageCount(1);
+ mockXML.message(0).body().isInstanceOf(String.class);
+
+ Object marshalled = template.requestBody("direct:unmarshalInlineOptionsArray", "[1, 2, 3, 4]");
+ Document document = context.getTypeConverter().convertTo(Document.class, marshalled);
+ assertEquals("There should be exactly 4 XML elements with tag 'el' (each array element)", 4, document.getDocumentElement().getElementsByTagName("el").getLength());
+ assertEquals("The document root should be named 'ar' (the array root)", "ar", document.getDocumentElement().getLocalName());
+ mockXML.assertIsSatisfied();
+ }
+
+ @Test
+ public void testXmlArraysToJson() throws Exception {
+ MockEndpoint mockJSON = getMockEndpoint("mock:jsonInlineOptionsArray");
+ mockJSON.expectedMessageCount(1);
+ mockJSON.message(0).body().isInstanceOf(byte[].class);
+
+ Object json = template.requestBody("direct:marshalInlineOptionsArray", "<ar><el>1</el><el>2</el><el>3</el><el>4</el></ar>");
+ String jsonString = context.getTypeConverter().convertTo(String.class, json);
+ JSONArray array = (JSONArray) JSONSerializer.toJSON(jsonString);
+ assertTrue("Expected a JSON array with string elements: 1, 2, 3, 4", array.containsAll(Arrays.asList("1", "2", "3", "4")));
+ mockJSON.assertIsSatisfied();
+ }
+
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@@ -191,7 +218,7 @@ public class XmlJsonDataFormatTest extends CamelTestSupport {
// from XML to JSON - inline dataformat
from("direct:marshalInline").marshal().xmljson().to("mock:jsonInline");
- // form JSON to XML - inline dataformat
+ // from JSON to XML - inline dataformat
from("direct:unmarshalInline").unmarshal().xmljson().to("mock:xmlInline");
Map<String, String> xmlJsonOptions = new HashMap<String, String>();
@@ -205,9 +232,19 @@ public class XmlJsonDataFormatTest extends CamelTestSupport {
// from XML to JSON - inline dataformat w/ options
from("direct:marshalInlineOptions").marshal().xmljson(xmlJsonOptions).to("mock:jsonInlineOptions");
- // form JSON to XML - inline dataformat w/ options
+ // from JSON to XML - inline dataformat w/ options
from("direct:unmarshalInlineOptions").unmarshal().xmljson(xmlJsonOptions).to("mock:xmlInlineOptions");
+ Map<String, String> xmlJsonOptionsArrays = new HashMap<String, String>();
+ xmlJsonOptionsArrays.put(org.apache.camel.model.dataformat.XmlJsonDataFormat.ELEMENT_NAME, "el");
+ xmlJsonOptionsArrays.put(org.apache.camel.model.dataformat.XmlJsonDataFormat.ARRAY_NAME, "ar");
+
+ // from XML arrays to JSON - inline dataformat w/ options
+ from("direct:marshalInlineOptionsArray").marshal().xmljson(xmlJsonOptionsArrays).to("mock:jsonInlineOptionsArray");
+ // from JSON arrays to XML - inline dataformat w/ options
+ from("direct:unmarshalInlineOptionsArray").unmarshal().xmljson(xmlJsonOptionsArrays).to("mock:xmlInlineOptionsArray");
+
+
}
};
}