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 2015/03/04 11:46:17 UTC
camel git commit: CAMEL-8423: Polished and added test
Repository: camel
Updated Branches:
refs/heads/master a6f6deeba -> a547de166
CAMEL-8423: Polished and added test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a547de16
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a547de16
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a547de16
Branch: refs/heads/master
Commit: a547de166fa8e4b72ce0858054ff8e0e0a73d51f
Parents: a6f6dee
Author: Claus Ibsen <da...@apache.org>
Authored: Wed Mar 4 11:47:33 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Wed Mar 4 11:47:33 2015 +0100
----------------------------------------------------------------------
.../apache/camel/model/AggregateDefinition.java | 4 +
.../processor/aggregate/AggregateProcessor.java | 3 -
.../AggregationStrategyAsPredicateTest.java | 79 ++++++++++++++++++++
3 files changed, 83 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a547de16/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
index ce1695e..f5d3746 100644
--- a/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++ b/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -217,6 +217,10 @@ public class AggregateDefinition extends ProcessorDefinition<AggregateDefinition
if (getCompletionPredicate() != null) {
Predicate predicate = getCompletionPredicate().createPredicate(routeContext);
answer.setCompletionPredicate(predicate);
+ } else if (strategy instanceof Predicate) {
+ // if aggregation strategy implements predicate and was not configured then use as fallback
+ log.debug("Using AggregationStrategy as completion predicate: {}", strategy);
+ answer.setCompletionPredicate((Predicate) strategy);
}
if (getCompletionTimeoutExpression() != null) {
Expression expression = getCompletionTimeoutExpression().createExpression(routeContext);
http://git-wip-us.apache.org/repos/asf/camel/blob/a547de16/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
----------------------------------------------------------------------
diff --git a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
index e30feb8..244501a 100644
--- a/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
+++ b/camel-core/src/main/java/org/apache/camel/processor/aggregate/AggregateProcessor.java
@@ -610,9 +610,6 @@ public class AggregateProcessor extends ServiceSupport implements AsyncProcessor
}
public Predicate getCompletionPredicate() {
- if (completionPredicate == null && aggregationStrategy instanceof Predicate) {
- return (Predicate)aggregationStrategy;
- }
return completionPredicate;
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a547de16/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyAsPredicateTest.java
----------------------------------------------------------------------
diff --git a/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyAsPredicateTest.java b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyAsPredicateTest.java
new file mode 100644
index 0000000..c1806a6
--- /dev/null
+++ b/camel-core/src/test/java/org/apache/camel/processor/aggregator/AggregationStrategyAsPredicateTest.java
@@ -0,0 +1,79 @@
+/**
+ * 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.aggregator;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Predicate;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.processor.aggregate.AggregationStrategy;
+
+/**
+ *
+ */
+public class AggregationStrategyAsPredicateTest extends ContextTestSupport {
+
+ public void testAggregateCompletionAware() throws Exception {
+ MockEndpoint result = getMockEndpoint("mock:aggregated");
+ result.expectedBodiesReceived("A+B+C", "X+Y+ZZZZ");
+ result.message(0).exchangeProperty(Exchange.AGGREGATED_COMPLETED_BY).isEqualTo("predicate");
+ result.message(1).exchangeProperty(Exchange.AGGREGATED_COMPLETED_BY).isEqualTo("predicate");
+
+ template.sendBodyAndHeader("direct:start", "A", "id", 123);
+ template.sendBodyAndHeader("direct:start", "B", "id", 123);
+ template.sendBodyAndHeader("direct:start", "C", "id", 123);
+ template.sendBodyAndHeader("direct:start", "X", "id", 123);
+ template.sendBodyAndHeader("direct:start", "Y", "id", 123);
+ template.sendBodyAndHeader("direct:start", "ZZZZ", "id", 123);
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .aggregate(header("id"), new MyCompletionStrategy())
+ .to("mock:aggregated");
+ }
+ };
+ }
+
+ private final class MyCompletionStrategy implements AggregationStrategy, Predicate {
+
+ @Override
+ public Exchange aggregate(Exchange oldExchange, Exchange newExchange) {
+ if (oldExchange == null) {
+ return newExchange;
+ }
+
+ String body = oldExchange.getIn().getBody(String.class) + "+"
+ + newExchange.getIn().getBody(String.class);
+ oldExchange.getIn().setBody(body);
+ return oldExchange;
+ }
+
+ @Override
+ public boolean matches(Exchange exchange) {
+ String body = exchange.getIn().getBody(String.class);
+ return body.length() >= 5;
+ }
+ }
+}