Author: davsclaus
Date: Sat Nov 21 11:52:26 2009
New Revision: 882887
URL: http://svn.apache.org/viewvc?rev=882887&view=rev
Log:
CAMEL-2209: Fixed SetBody to not propagate specialized Message object so its
the same as transform for example.
Added:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
- copied, changed from r882834,
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetBodyProcessorTest.java
(with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java?rev=882887&r1=882886&r2=882887&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/model/SetBodyDefinition.java
Sat Nov 21 11:52:26 2009
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.model;
import javax.xml.bind.annotation.XmlAccessType;
@@ -24,7 +23,7 @@
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionClause;
-import org.apache.camel.builder.ProcessorBuilder;
+import org.apache.camel.processor.SetBodyProcessor;
import org.apache.camel.spi.RouteContext;
/**
@@ -59,7 +58,9 @@
@Override
public Processor createProcessor(RouteContext routeContext) throws
Exception {
Expression expr = getExpression().createExpression(routeContext);
- return ProcessorBuilder.setBody(expr);
+ Processor childProcessor = routeContext.createProcessor(this);
+
+ return new SetBodyProcessor(expr, childProcessor);
}
// Fluent API
Copied:
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
(from r882834,
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java)
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java?p2=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java&r1=882834&r2=882887&rev=882887&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/TransformProcessor.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/SetBodyProcessor.java
Sat Nov 21 11:52:26 2009
@@ -18,40 +18,45 @@
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
+import org.apache.camel.Message;
import org.apache.camel.Processor;
+import org.apache.camel.impl.DefaultMessage;
/**
- * A processor which sets the body on the OUT message with an expression
+ * A processor which sets the body on the IN message with an expression
*/
-public class TransformProcessor extends DelegateProcessor implements Traceable
{
+public class SetBodyProcessor extends DelegateProcessor implements Traceable {
private final Expression expression;
- public TransformProcessor(Expression expression) {
+ public SetBodyProcessor(Expression expression) {
this.expression = expression;
}
- public TransformProcessor(Expression expression, Processor childProcessor)
{
+ public SetBodyProcessor(Expression expression, Processor childProcessor) {
super(childProcessor);
this.expression = expression;
}
public void process(Exchange exchange) throws Exception {
Object newBody = expression.evaluate(exchange, Object.class);
- exchange.getOut().setBody(newBody);
- // propagate headers and attachments
- exchange.getOut().getHeaders().putAll(exchange.getIn().getHeaders());
- exchange.getOut().setAttachments(exchange.getIn().getAttachments());
+ Message old = exchange.getIn();
+
+ // create a new message container so we do not drag specialized
message objects along
+ Message msg = new DefaultMessage();
+ msg.copyFrom(old);
+ msg.setBody(newBody);
+ exchange.setIn(msg);
super.process(exchange);
}
@Override
public String toString() {
- return "Transform(" + expression + (processor != null ? "," +
processor : "") + ")";
+ return "SetBody(" + expression + (processor != null ? "," + processor
: "") + ")";
}
public String getTraceLabel() {
- return "transform[" + expression + "]";
+ return "setBody[" + expression + "]";
}
-}
+}
\ No newline at end of file
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetBodyProcessorTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetBodyProcessorTest.java?rev=882887&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetBodyProcessorTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetBodyProcessorTest.java
Sat Nov 21 11:52:26 2009
@@ -0,0 +1,87 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Predicate;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultMessage;
+
+import static org.apache.camel.language.simple.SimpleLanguage.simple;
+
+/**
+ * @version $Revision$
+ */
+public class SetBodyProcessorTest extends ContextTestSupport {
+
+ public void testSetBody() throws Exception {
+ MockEndpoint foo = getMockEndpoint("mock:foo");
+ foo.expectedBodiesReceived("World");
+ foo.expectedHeaderReceived("foo", 123);
+ foo.message(0).predicate(new Predicate() {
+ public boolean matches(Exchange exchange) {
+ // this time we should have the specialized message
+ return exchange.getIn() instanceof MyMessage;
+ }
+ });
+
+ MockEndpoint result = getMockEndpoint("mock:result");
+ result.expectedBodiesReceived("Bye World");
+ result.expectedHeaderReceived("foo", 123);
+ result.message(0).predicate(new Predicate() {
+ public boolean matches(Exchange exchange) {
+ // this time we should have lost the specialized message
+ return !(exchange.getIn() instanceof MyMessage);
+ }
+ });
+
+ template.send("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ MyMessage my = new MyMessage();
+ my.setBody("World");
+ my.setHeader("foo", 123);
+ exchange.setIn(my);
+ }
+ });
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .to("mock:foo")
+ .setBody(simple("Bye ${body}"))
+ .to("mock:result");
+ }
+ };
+ }
+
+ private class MyMessage extends DefaultMessage {
+
+ @Override
+ public MyMessage newInstance() {
+ return new MyMessage();
+ }
+ }
+}
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetBodyProcessorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetBodyProcessorTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date