You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2013/10/25 06:40:26 UTC
[1/3] git commit: CAMEL-6887 removed the unused constants
Updated Branches:
refs/heads/master 8b7896322 -> 599cf88bf
CAMEL-6887 removed the unused constants
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ea9dc13e
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ea9dc13e
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ea9dc13e
Branch: refs/heads/master
Commit: ea9dc13ed8c191072f2c03dcb50a83821aaffa3e
Parents: 8b78963
Author: Willem Jiang <ni...@apache.org>
Authored: Fri Oct 25 11:48:14 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Fri Oct 25 12:39:47 2013 +0800
----------------------------------------------------------------------
.../java/org/apache/camel/component/jclouds/JcloudsConstants.java | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/ea9dc13e/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
----------------------------------------------------------------------
diff --git a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
index e5481ef..811bbe7 100644
--- a/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
+++ b/components/camel-jclouds/src/main/java/org/apache/camel/component/jclouds/JcloudsConstants.java
@@ -36,7 +36,6 @@ public final class JcloudsConstants {
public static final String RUN_SCRIPT = "CamelJcloudsRunScript";
public static final String CONTENT_LANGUAGE = "CamelJcloudsContentLanguage";
- public static final String CONTENT_ENCODING = "CamelJcloudsContentEncoding";
public static final String CONTENT_DISPOSITION = "CamelJcloudsContentDisposition";
public static final String PAYLOAD_EXPIRES = "CamelJcloudsPayloadExpires";
[3/3] git commit: CAMEL-6895 Supported to set the camel-xmljson
Encoding from the message header
Posted by ni...@apache.org.
CAMEL-6895 Supported to set the camel-xmljson Encoding from the message header
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/599cf88b
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/599cf88b
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/599cf88b
Branch: refs/heads/master
Commit: 599cf88bf55213f470ddd5422e52537f69dfa5a2
Parents: c5be3e6
Author: Willem Jiang <ni...@apache.org>
Authored: Fri Oct 25 12:38:30 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Fri Oct 25 12:39:48 2013 +0800
----------------------------------------------------------------------
.../apache/camel/dataformat/xmljson/XmlJsonDataFormat.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/599cf88b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
----------------------------------------------------------------------
diff --git a/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
index 1120d73..f68c60b 100644
--- a/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
+++ b/components/camel-xmljson/src/main/java/org/apache/camel/dataformat/xmljson/XmlJsonDataFormat.java
@@ -31,6 +31,7 @@ import net.sf.json.xml.XMLSerializer;
import org.apache.camel.Exchange;
import org.apache.camel.spi.DataFormat;
import org.apache.camel.support.ServiceSupport;
+import org.apache.camel.util.IOHelper;
/**
* A <a href="http://camel.apache.org/data-format.html">data format</a> ({@link DataFormat}) using
@@ -136,10 +137,10 @@ public class XmlJsonDataFormat extends ServiceSupport implements DataFormat {
public void marshal(Exchange exchange, Object graph, OutputStream stream) throws Exception {
boolean streamTreatment = true;
// try to process as an InputStream if it's not a String
- Object xml = graph instanceof String ? null : exchange.getContext().getTypeConverter().convertTo(InputStream.class, graph);
+ Object xml = graph instanceof String ? null : exchange.getContext().getTypeConverter().convertTo(InputStream.class, exchange, graph);
// if conversion to InputStream was unfeasible, fall back to String
if (xml == null) {
- xml = exchange.getContext().getTypeConverter().mandatoryConvertTo(String.class, graph);
+ xml = exchange.getContext().getTypeConverter().mandatoryConvertTo(String.class, exchange, graph);
streamTreatment = false;
}
@@ -151,7 +152,7 @@ public class XmlJsonDataFormat extends ServiceSupport implements DataFormat {
json = serializer.read((String) xml);
}
- OutputStreamWriter osw = new OutputStreamWriter(stream);
+ OutputStreamWriter osw = new OutputStreamWriter(stream, IOHelper.getCharsetName(exchange));
json.write(osw);
osw.flush();
@@ -169,7 +170,7 @@ public class XmlJsonDataFormat extends ServiceSupport implements DataFormat {
if (inBody instanceof JSON) {
toConvert = (JSON) inBody;
} else {
- String jsonString = exchange.getContext().getTypeConverter().convertTo(String.class, inBody);
+ String jsonString = exchange.getContext().getTypeConverter().convertTo(String.class, exchange, inBody);
toConvert = JSONSerializer.toJSON(jsonString);
}
[2/3] git commit: Enhanced the Scala CBR test according the user
question from the mailing list.
Posted by ni...@apache.org.
Enhanced the Scala CBR test according the user question from the mailing list.
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c5be3e60
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c5be3e60
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c5be3e60
Branch: refs/heads/master
Commit: c5be3e6099c23fb7cbf0dd8453ada76cc218731d
Parents: ea9dc13
Author: Willem Jiang <ni...@apache.org>
Authored: Fri Oct 25 11:49:42 2013 +0800
Committer: Willem Jiang <ni...@apache.org>
Committed: Fri Oct 25 12:39:48 2013 +0800
----------------------------------------------------------------------
.../test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/c5be3e60/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala
----------------------------------------------------------------------
diff --git a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala
index d0067fb..aa21856 100644
--- a/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala
+++ b/components/camel-scala/src/test/scala/org/apache/camel/scala/dsl/CamelCBRTest.scala
@@ -28,7 +28,7 @@ class CamelCBRTest extends CamelTestSupport with RouteBuilderSupport {
def testFoo() {
getMockEndpoint("mock:foo").expectedMessageCount(1)
getMockEndpoint("mock:other").expectedMessageCount(0)
-
+ getMockEndpoint("mock:end").expectedMessageCount(1)
template.sendBody("direct:start", "foo")
assertMockEndpointsSatisfied()
@@ -38,6 +38,7 @@ class CamelCBRTest extends CamelTestSupport with RouteBuilderSupport {
def testOther() {
getMockEndpoint("mock:foo").expectedMessageCount(0)
getMockEndpoint("mock:other").expectedMessageCount(1)
+ getMockEndpoint("mock:end").expectedMessageCount(1)
template.sendBody("direct:start", "bar")
@@ -50,7 +51,9 @@ class CamelCBRTest extends CamelTestSupport with RouteBuilderSupport {
when(simple("${body} == 'foo'")) to "mock:foo"
otherwise to "mock:other"
}
+ to("mock:end")
}
+
}
}
\ No newline at end of file