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 2009/02/25 09:39:55 UTC
svn commit: r747708 - in /camel/trunk:
camel-core/src/main/java/org/apache/camel/model/
camel-core/src/test/java/org/apache/camel/processor/
components/camel-jms/src/test/java/org/apache/camel/component/jms/
components/camel-spring/src/main/java/org/ap...
Author: davsclaus
Date: Wed Feb 25 08:39:54 2009
New Revision: 747708
URL: http://svn.apache.org/viewvc?rev=747708&view=rev
Log:
CAMEL-1380: aggregator renamed option completed to completion predicate.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java
camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml
camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java?rev=747708&r1=747707&r2=747708&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/AggregatorType.java Wed Feb 25 08:39:54 2009
@@ -68,9 +68,8 @@
private String collectionRef;
@XmlAttribute(required = false)
private Boolean groupExchanges;
- @XmlElement(name = "completedPredicate", required = false)
- private ExpressionSubElementType completedPredicate;
-
+ @XmlElement(name = "completionPredicate", required = false)
+ private ExpressionSubElementType completionPredicate;
public AggregatorType() {
}
@@ -150,8 +149,8 @@
Expression aggregateExpression = getExpression().createExpression(routeContext);
Predicate predicate = null;
- if (getCompletedPredicate() != null) {
- predicate = getCompletedPredicate().createPredicate(routeContext);
+ if (getCompletionPredicate() != null) {
+ predicate = getCompletionPredicate().createPredicate(routeContext);
}
if (predicate != null) {
aggregator = new Aggregator(processor, aggregateExpression, strategy, predicate);
@@ -255,12 +254,12 @@
this.collectionRef = collectionRef;
}
- public void setCompletedPredicate(ExpressionSubElementType completedPredicate) {
- this.completedPredicate = completedPredicate;
+ public void setCompletionPredicate(ExpressionSubElementType completionPredicate) {
+ this.completionPredicate = completionPredicate;
}
- public ExpressionSubElementType getCompletedPredicate() {
- return completedPredicate;
+ public ExpressionSubElementType getCompletionPredicate() {
+ return completionPredicate;
}
public Boolean getGroupExchanges() {
@@ -367,10 +366,10 @@
*
* @return the clause used to create the predicate
*/
- public ExpressionClause<AggregatorType> completedPredicate() {
+ public ExpressionClause<AggregatorType> completionPredicate() {
checkNoCompletedPredicate();
ExpressionClause<AggregatorType> clause = new ExpressionClause<AggregatorType>(this);
- setCompletedPredicate(new ExpressionSubElementType((Expression)clause));
+ setCompletionPredicate(new ExpressionSubElementType((Expression)clause));
return clause;
}
@@ -379,15 +378,15 @@
*
* @param predicate the predicate
*/
- public AggregatorType completedPredicate(Predicate predicate) {
+ public AggregatorType completionPredicate(Predicate predicate) {
checkNoCompletedPredicate();
- setCompletedPredicate(new ExpressionSubElementType(predicate));
+ setCompletionPredicate(new ExpressionSubElementType(predicate));
return this;
}
protected void checkNoCompletedPredicate() {
- if (getCompletedPredicate() != null) {
- throw new IllegalArgumentException("There is already a completedPredicate defined for this aggregator: " + this);
+ if (getCompletionPredicate() != null) {
+ throw new IllegalArgumentException("There is already a completionPredicate defined for this aggregator: " + this);
}
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java?rev=747708&r1=747707&r2=747708&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/AggregatorTest.java Wed Feb 25 08:39:54 2009
@@ -91,18 +91,18 @@
// in this sample we aggregate using our own strategy with a completion predicate
// stating that the aggregated header is equal to 5.
from("direct:predicate").aggregate(header("cheese"), new MyAggregationStrategy()).
- completedPredicate(header("aggregated").isEqualTo(5)).to("mock:result");
+ completionPredicate(header("aggregated").isEqualTo(5)).to("mock:result");
// this sample is similar to the one above but it also illustrates the use of outBatchSize
// to send exchanges to mock:endpoint in batches of 10.
from("direct:outBatchPredicate").aggregate(header("cheese"), new MyAggregationStrategy()).
- completedPredicate(header("aggregated").isEqualTo(5)).outBatchSize(10).to("mock:result");
+ completionPredicate(header("aggregated").isEqualTo(5)).outBatchSize(10).to("mock:result");
// END SNIPPET: ex
// turning off in batching (batchSize = 1) is a good way to test "out" batching. Don't include
// in wiki snippet as it may not be a good example to follow.
from("direct:outBatchNoInBatching").aggregate(header("cheese"), new MyAggregationStrategy()).
- completedPredicate(header("aggregated").isEqualTo(5)).batchSize(1).outBatchSize(10).to("mock:result");
+ completionPredicate(header("aggregated").isEqualTo(5)).batchSize(1).outBatchSize(10).to("mock:result");
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java?rev=747708&r1=747707&r2=747708&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java Wed Feb 25 08:39:54 2009
@@ -81,7 +81,7 @@
from("direct:z").process(new AppendingProcessor("z")).to("direct:aggregator");
from("direct:aggregator").aggregate(header("cheese"), new BodyInAggregatingStrategy()).
- completedPredicate(header(Exchange.AGGREGATED_SIZE).isEqualTo(3)).to("mock:result");
+ completionPredicate(header(Exchange.AGGREGATED_SIZE).isEqualTo(3)).to("mock:result");
// END SNIPPET: example
}
};
Modified: camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java?rev=747708&r1=747707&r2=747708&view=diff
==============================================================================
--- camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java (original)
+++ camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/AggregratedJmsRouteTest.java Wed Feb 25 08:39:54 2009
@@ -113,7 +113,7 @@
result.setProperty("aggregated", old + 1);
return result;
}
- }).completedPredicate(header("aggregated").isEqualTo(3))
+ }).completionPredicate(header("aggregated").isEqualTo(3))
.to("mock:reply");
}
};
Modified: camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java?rev=747708&r1=747707&r2=747708&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java (original)
+++ camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/handler/CamelNamespaceHandler.java Wed Feb 25 08:39:54 2009
@@ -103,6 +103,7 @@
try {
cl = Class.forName("org.apache.camel.osgi.CamelContextFactoryBean");
} catch (Throwable t) {
+ // not running OSGi so we callback to the regular factory bean
}
registerParser("camelContext", new CamelContextBeanDefinitionParser(cl));
}
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml?rev=747708&r1=747707&r2=747708&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator.xml Wed Feb 25 08:39:54 2009
@@ -57,9 +57,9 @@
<simple>header.cheese</simple>
</correlationExpression>
<to uri="mock:result"/>
- <completedPredicate>
+ <completionPredicate>
<method bean="myAggregatorStrategy" method="isCompleted"/>
- </completedPredicate>
+ </completionPredicate>
</aggregate>
</route>
@@ -70,9 +70,9 @@
<simple>header.cheese</simple>
</correlationExpression>
<to uri="mock:result"/>
- <completedPredicate>
+ <completionPredicate>
<method bean="myAggregatorStrategy" method="isCompleted"/>
- </completedPredicate>
+ </completionPredicate>
</aggregate>
</route>
@@ -86,9 +86,9 @@
<simple>header.cheese</simple>
</correlationExpression>
<to uri="mock:result"/>
- <completedPredicate>
+ <completionPredicate>
<method bean="myAggregatorStrategy" method="isCompleted"/>
- </completedPredicate>
+ </completionPredicate>
</aggregate>
</route>
</camelContext>
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml?rev=747708&r1=747707&r2=747708&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/multicastAggregator.xml Wed Feb 25 08:39:54 2009
@@ -65,9 +65,9 @@
<simple>header.cheese</simple>
</correlationExpression>
<to uri="mock:result"/>
- <completedPredicate>
+ <completionPredicate>
<method bean="bodyInAggregatorStrategy" method="isCompleted"/>
- </completedPredicate>
+ </completionPredicate>
</aggregate>
</route>
</camelContext>
Modified: camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java
URL: http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java?rev=747708&r1=747707&r2=747708&view=diff
==============================================================================
--- camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java (original)
+++ camel/trunk/examples/camel-example-loan-broker/src/main/java/org/apache/camel/loanbroker/queue/version/LoanBroker.java Wed Feb 25 08:39:54 2009
@@ -16,7 +16,6 @@
*/
package org.apache.camel.loanbroker.queue.version;
-
import javax.jms.ConnectionFactory;
import org.apache.activemq.ActiveMQConnectionFactory;
@@ -26,18 +25,15 @@
import org.apache.camel.component.jms.JmsComponent;
import org.apache.camel.impl.DefaultCamelContext;
-
-
/**
* The LoanBroker is a RouteBuilder which builds the whole loan message routing rules
*
- * @version $
+ * @version $Revision$
*/
public class LoanBroker extends RouteBuilder {
/**
* A main() so we can easily run these routing rules in our IDE
- * @throws Exception
*/
// START SNIPPET: starting
public static void main(String... args) throws Exception {
@@ -89,7 +85,7 @@
// name of the aggregated message size.
from("jms:queue:bankReplyQueue")
.aggregate(header(Constants.PROPERTY_SSN), new BankResponseAggregationStrategy())
- .completedPredicate(header(Exchange.AGGREGATED_SIZE).isEqualTo(3))
+ .completionPredicate(header(Exchange.AGGREGATED_SIZE).isEqualTo(3))
// Here we do some translation and put the message back to loanReplyQueue
.process(new Translator()).to("jms:queue:loanReplyQueue");
@@ -108,8 +104,6 @@
from("jms:queue2:bank1").process(new Bank("bank1"));
from("jms:queue2:bank2").process(new Bank("bank2"));
from("jms:queue2:bank3").process(new Bank("bank3"));
-
-
// END SNIPPET: dsl-2
}
}