svn commit: r1330227 - in /camel/branches/camel-2.9.x: ./ camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java

[davsclaus]

Author: davsclaus
Date: Wed Apr 25 12:04:52 2012
New Revision: 1330227

URL: http://svn.apache.org/viewvc?rev=1330227&view=rev
Log:
CAMEL-5216: Convert body EIP uses a default message type like the transform and 
setbody EIP does.

Modified:
    camel/branches/camel-2.9.x/   (props changed)
    
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
    
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1330225

Propchange: camel/branches/camel-2.9.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java?rev=1330227&r1=1330226&r2=1330227&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/main/java/org/apache/camel/processor/ConvertBodyProcessor.java
 Wed Apr 25 12:04:52 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.util.IOHelper;
 
 /**
@@ -49,21 +50,26 @@ public class ConvertBodyProcessor implem
 
     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, 
IOHelper.normalizeCharset(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/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
URL: 
http://svn.apache.org/viewvc/camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java?rev=1330227&r1=1330226&r2=1330227&view=diff
==============================================================================
--- 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
 (original)
+++ 
camel/branches/camel-2.9.x/camel-core/src/test/java/org/apache/camel/processor/ConvertBodyTest.java
 Wed Apr 25 12:04:52 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);