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 2011/09/25 09:45:23 UTC
svn commit: r1175318 - in /camel/branches/camel-2.8.x: ./
camel-core/src/main/java/org/apache/camel/
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/main/java/org/apache/camel/processor/
camel-core/src/test/java/org/apache/camel/builder...
Author: davsclaus
Date: Sun Sep 25 07:45:22 2011
New Revision: 1175318
URL: http://svn.apache.org/viewvc?rev=1175318&view=rev
Log:
Merged revisions 1175313 via svnmerge from
https://svn.apache.org/repos/asf/camel/trunk
Added:
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java
- copied, changed from r1175313, camel/trunk/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/processor/EvaluateExpressionProcessorTest.java
- copied unchanged from r1175313, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/EvaluateExpressionProcessorTest.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/processor/RecipientListThrowExceptionFromExpressionTest.java
- copied unchanged from r1175313, camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListThrowExceptionFromExpressionTest.java
Modified:
camel/branches/camel-2.8.x/ (props changed)
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/Exchange.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Sep 25 07:45:22 2011
@@ -1 +1 @@
-/camel/trunk:1173732,1173958,1174047,1174129,1174245,1174565,1174626,1174745,1174817,1174837,1175139
+/camel/trunk:1173732,1173958,1174047,1174129,1174245,1174565,1174626,1174745,1174817,1174837,1175139,1175313
Propchange: camel/branches/camel-2.8.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/Exchange.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/Exchange.java?rev=1175318&r1=1175317&r2=1175318&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/Exchange.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/Exchange.java Sun Sep 25 07:45:22 2011
@@ -104,8 +104,9 @@ public interface Exchange {
String DISABLE_HTTP_STREAM_CACHE = "CamelDisableHttpStreamCache";
String DUPLICATE_MESSAGE = "CamelDuplicateMessage";
- String ERRORHANDLER_HANDLED = "CamelErrorHandlerHandled";
- String EXCEPTION_CAUGHT = "CamelExceptionCaught";
+ String EXCEPTION_CAUGHT = "CamelExceptionCaught";
+ String EVALUATE_EXPRESSION_RESULT = "CamelEvaluateExpressionResult";
+ String ERRORHANDLER_HANDLED = "CamelErrorHandlerHandled";
String FAILURE_HANDLED = "CamelFailureHandled";
String FAILURE_ENDPOINT = "CamelFailureEndpoint";
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java?rev=1175318&r1=1175317&r2=1175318&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/ProcessorDefinition.java Sun Sep 25 07:45:22 2011
@@ -265,8 +265,8 @@ public abstract class ProcessorDefinitio
// do not use error handler for recipient list as it offers fine grained error handlers for its outputs
// however if share unit of work is enabled, we need to wrap an error handler on the recipient list parent
RecipientListDefinition def = (RecipientListDefinition) defn;
- if (def.isShareUnitOfWork() && child == null) {
- // only wrap the parent (not the children of the multicast)
+ if (def.isShareUnitOfWork()) {
+ // note a recipient list cannot have children so no need for a child == null check
wrapChannelInErrorHandler(channel, routeContext);
} else {
log.trace("{} is part of multicast/recipientList which have special error handling so no error handler is applied", defn);
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java?rev=1175318&r1=1175317&r2=1175318&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/model/RecipientListDefinition.java Sun Sep 25 07:45:22 2011
@@ -16,6 +16,8 @@
*/
package org.apache.camel.model;
+import java.util.ArrayList;
+import java.util.List;
import java.util.concurrent.ExecutorService;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@@ -26,6 +28,8 @@ import javax.xml.bind.annotation.XmlTran
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.model.language.ExpressionDefinition;
+import org.apache.camel.processor.EvaluateExpressionProcessor;
+import org.apache.camel.processor.Pipeline;
import org.apache.camel.processor.RecipientList;
import org.apache.camel.processor.aggregate.AggregationStrategy;
import org.apache.camel.processor.aggregate.UseLatestAggregationStrategy;
@@ -91,7 +95,7 @@ public class RecipientListDefinition<Typ
@Override
public Processor createProcessor(RouteContext routeContext) throws Exception {
- Expression expression = getExpression().createExpression(routeContext);
+ final Expression expression = getExpression().createExpression(routeContext);
RecipientList answer;
if (delimiter != null) {
@@ -129,7 +133,29 @@ public class RecipientListDefinition<Typ
throw new IllegalArgumentException("Timeout is used but ParallelProcessing has not been enabled.");
}
- return answer;
+ // create a pipeline with two processors
+ // the first is the eval processor which evaluates the expression to use
+ // the second is the recipient list
+ List<Processor> pipe = new ArrayList<Processor>(2);
+
+ // the eval processor must be wrapped in error handler, so in case there was an
+ // error during evaluation, the error handler can deal with it
+ // the recipient list is not in error handler, as its has its own special error handling
+ // when sending to the recipients individually
+ Processor evalProcessor = new EvaluateExpressionProcessor(expression);
+ evalProcessor = super.wrapInErrorHandler(routeContext, getErrorHandlerBuilder(), evalProcessor);
+
+ pipe.add(evalProcessor);
+ pipe.add(answer);
+
+ // wrap in nested pipeline so this appears as one processor
+ // (threads definition does this as well)
+ return new Pipeline(routeContext.getCamelContext(), pipe) {
+ @Override
+ public String toString() {
+ return "RecipientList[" + expression + "]";
+ }
+ };
}
private AggregationStrategy createAggregationStrategy(RouteContext routeContext) {
Copied: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java (from r1175313, camel/trunk/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java)
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java?p2=camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java&p1=camel/trunk/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java&r1=1175313&r2=1175318&rev=1175318&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/EvaluateExpressionProcessor.java Sun Sep 25 07:45:22 2011
@@ -20,7 +20,6 @@ import org.apache.camel.AsyncCallback;
import org.apache.camel.AsyncProcessor;
import org.apache.camel.Exchange;
import org.apache.camel.Expression;
-import org.apache.camel.Traceable;
import org.apache.camel.util.AsyncProcessorHelper;
/**
Modified: camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java?rev=1175318&r1=1175317&r2=1175318&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/main/java/org/apache/camel/processor/RecipientList.java Sun Sep 25 07:45:22 2011
@@ -101,7 +101,13 @@ public class RecipientList extends Servi
throw new IllegalStateException("RecipientList has not been started: " + this);
}
- Object recipientList = expression.evaluate(exchange, Object.class);
+ // use the evaluate expression result if exists
+ Object recipientList = exchange.removeProperty(Exchange.EVALUATE_EXPRESSION_RESULT);
+ if (recipientList == null && expression != null) {
+ // fallback and evaluate the expression
+ recipientList = expression.evaluate(exchange, Object.class);
+ }
+
return sendToRecipientList(exchange, recipientList, callback);
}
Modified: camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java?rev=1175318&r1=1175317&r2=1175318&view=diff
==============================================================================
--- camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java (original)
+++ camel/branches/camel-2.8.x/camel-core/src/test/java/org/apache/camel/builder/RouteBuilderTest.java Sun Sep 25 07:45:22 2011
@@ -17,6 +17,7 @@
package org.apache.camel.builder;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import org.apache.camel.CamelContext;
@@ -32,6 +33,7 @@ import org.apache.camel.impl.EventDriven
import org.apache.camel.processor.ChoiceProcessor;
import org.apache.camel.processor.DeadLetterChannel;
import org.apache.camel.processor.DelegateProcessor;
+import org.apache.camel.processor.EvaluateExpressionProcessor;
import org.apache.camel.processor.FilterProcessor;
import org.apache.camel.processor.MulticastProcessor;
import org.apache.camel.processor.Pipeline;
@@ -367,7 +369,17 @@ public class RouteBuilderTest extends Te
EventDrivenConsumerRoute consumer = assertIsInstanceOf(EventDrivenConsumerRoute.class, route);
Channel channel = unwrapChannel(consumer.getProcessor());
- assertIsInstanceOf(RecipientList.class, channel.getNextProcessor());
+ Pipeline line = assertIsInstanceOf(Pipeline.class, channel.getNextProcessor());
+ Iterator it = line.getProcessors().iterator();
+
+ // EvaluateExpressionProcessor should be wrapped in error handler
+ Object first = it.next();
+ first = assertIsInstanceOf(DeadLetterChannel.class, first).getOutput();
+ assertIsInstanceOf(EvaluateExpressionProcessor.class, first);
+
+ // and the second should NOT be wrapped in error handler
+ Object second = it.next();
+ assertIsInstanceOf(RecipientList.class, second);
}
}