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 2012/04/25 14:02:42 UTC
svn commit: r1330225 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/processor/ConvertBodyProcessor.java
test/java/org/apache/camel/processor/ConvertBodyTest.java
Author: davsclaus
Date: Wed Apr 25 12:02:42 2012
New Revision: 1330225
URL: http://svn.apache.org/viewvc?rev=1330225&view=rev
Log:
CAMEL-5216: Convert body EIP uses a default message type like the transform and setbody EIP does.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java?rev=1330225&r1=1330224&r2=1330225&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java Wed Apr 25 12:02:42 2012
@@ -19,6 +19,7 @@ package org.apache.camel.processor;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.impl.DefaultMessage;
import org.apache.camel.support.ServiceSupport;
import org.apache.camel.util.IOHelper;
import org.apache.camel.util.ObjectHelper;
@@ -53,21 +54,26 @@ public class ConvertBodyProcessor extend
public void process(Exchange exchange) throws Exception {
Message in = exchange.getIn();
+ if (in.getBody() == null) {
+ // only convert if the is a body
+ return;
+ }
+
if (charset != null) {
exchange.setProperty(Exchange.CHARSET_NAME, charset);
}
+ // use mandatory conversion
+ Object value = in.getMandatoryBody(type);
- // only convert if the is a body
- if (in.getBody() != null) {
- Object value = in.getMandatoryBody(type);
-
- if (exchange.getPattern().isOutCapable()) {
- Message out = exchange.getOut();
- out.copyFrom(in);
- out.setBody(value);
- } else {
- in.setBody(value);
- }
+ // create a new message container so we do not drag specialized message objects along
+ Message msg = new DefaultMessage();
+ msg.copyFrom(in);
+ msg.setBody(value);
+
+ if (exchange.getPattern().isOutCapable()) {
+ exchange.setOut(msg);
+ } else {
+ exchange.setIn(msg);
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java?rev=1330225&r1=1330224&r2=1330225&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java Wed Apr 25 12:02:42 2012
@@ -22,6 +22,7 @@ import java.util.Date;
import java.util.Locale;
import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
import org.apache.camel.InvalidPayloadException;
import org.apache.camel.RuntimeCamelException;
import org.apache.camel.builder.RouteBuilder;
@@ -43,6 +44,21 @@ public class ConvertBodyTest extends Con
}
}
+ public void testConvertBodyCharset() throws Exception {
+ context.addRoutes(new RouteBuilder() {
+ public void configure() {
+ from("direct:foo").convertBodyTo(byte[].class, "iso-8859-1").to("mock:foo");
+ }
+ });
+
+ getMockEndpoint("mock:foo").expectedMessageCount(1);
+ getMockEndpoint("mock:foo").expectedPropertyReceived(Exchange.CHARSET_NAME, "iso-8859-1");
+
+ template.sendBody("direct:foo", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
public void testConvertToInteger() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
result.expectedBodiesReceived(11);