This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/master by this push:
new 7a682cc CAMEL-10126: Aggregate - Has name clash for some options
7a682cc is described below
commit 7a682ccf01593c21811a013aae62912a9f2899d9
Author: Claus Ibsen <[email protected]>
AuthorDate: Wed Jul 31 14:24:47 2019 +0200
CAMEL-10126: Aggregate - Has name clash for some options
---
MIGRATION.md | 15 +++++++++++++++
.../aggregator/SpringAggregateControllerTest.xml | 4 ++--
.../SpringAggregateExpressionSizeFallbackTest.xml | 4 ++--
.../aggregator/SpringAggregateExpressionSizeTest.xml | 4 ++--
.../SpringAggregateExpressionTimeoutFallbackTest.xml | 4 ++--
.../SpringAggregateExpressionTimeoutPerGroupTest.xml | 4 ++--
.../aggregator/SpringAggregateExpressionTimeoutTest.xml | 4 ++--
...gregateGroupedExchangeCompletionExpressionSizeTest.xml | 4 ++--
.../java/org/apache/camel/model/AggregateDefinition.java | 4 ++--
9 files changed, 31 insertions(+), 16 deletions(-)
diff --git a/MIGRATION.md b/MIGRATION.md
index 79ca9a2..8ae321d 100644
--- a/MIGRATION.md
+++ b/MIGRATION.md
@@ -139,6 +139,21 @@ To
And the same for `<setProperty>`.
+### <aggregate> EIP in XML DSL
+
+The aggregte EIP have renamed the expressions (not the attributes) for setting
correlation size/timeout to avoid a name clash, so migrate:
+
+ <completionSize>
+ <header>mySize</header>
+ </completionSize>
+To
+
+ <completionSizeExpression>
+ <header>mySize</header>
+ </completionSizeExpression>
+
+And the same for `<completionTimeout`.
+
#### camel-cdi
Support for multiple CamelContext's has been removed, and therefore
`@ContextName` has been removed. Instead use standard CDI annotations such as
`@Named` and `@ApplicationScoped`.
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.xml
index d29f887..0ddac7d 100644
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.xml
+++
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateControllerTest.xml
@@ -31,9 +31,9 @@
<correlationExpression>
<simple>header.id</simple>
</correlationExpression>
- <completionSize>
+ <completionSizeExpression>
<constant>10</constant>
- </completionSize>
+ </completionSizeExpression>
<to uri="mock:aggregated"/>
</aggregate>
</route>
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.xml
index 9b3b7b5..d478591 100644
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.xml
+++
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeFallbackTest.xml
@@ -32,9 +32,9 @@
<correlationExpression>
<simple>header.id</simple>
</correlationExpression>
- <completionSize>
+ <completionSizeExpression>
<header>mySize</header>
- </completionSize>
+ </completionSizeExpression>
<to uri="mock:aggregated"/>
</aggregate>
</route>
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.xml
index c2686bb..f65845b 100644
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.xml
+++
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionSizeTest.xml
@@ -32,9 +32,9 @@
<correlationExpression>
<simple>header.id</simple>
</correlationExpression>
- <completionSize>
+ <completionSizeExpression>
<header>mySize</header>
- </completionSize>
+ </completionSizeExpression>
<to uri="mock:aggregated"/>
</aggregate>
</route>
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml
index 8685927..7970194 100644
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml
+++
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutFallbackTest.xml
@@ -32,9 +32,9 @@
<correlationExpression>
<simple>${header.id}</simple>
</correlationExpression>
- <completionTimeout>
+ <completionTimeoutExpression>
<header>timeout</header>
- </completionTimeout>
+ </completionTimeoutExpression>
<to uri="mock:aggregated"/>
</aggregate>
</route>
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.xml
index 3a48c01..d9c4797 100644
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.xml
+++
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutPerGroupTest.xml
@@ -32,9 +32,9 @@
<correlationExpression>
<simple>${header.id}</simple>
</correlationExpression>
- <completionTimeout>
+ <completionTimeoutExpression>
<header>timeout</header>
- </completionTimeout>
+ </completionTimeoutExpression>
<to uri="mock:aggregated"/>
</aggregate>
</route>
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.xml
index 034a0dc..199985b 100644
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.xml
+++
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateExpressionTimeoutTest.xml
@@ -32,9 +32,9 @@
<correlationExpression>
<simple>header.id</simple>
</correlationExpression>
- <completionTimeout>
+ <completionTimeoutExpression>
<header>timeout</header>
- </completionTimeout>
+ </completionTimeoutExpression>
<to uri="mock:aggregated"/>
</aggregate>
</route>
diff --git
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.xml
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.xml
index cc3910c..0ca793f 100644
---
a/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.xml
+++
b/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/aggregator/SpringAggregateGroupedExchangeCompletionExpressionSizeTest.xml
@@ -31,9 +31,9 @@
<correlationExpression>
<constant>true</constant>
</correlationExpression>
- <completionSize>
+ <completionSizeExpression>
<header>size</header>
- </completionSize>
+ </completionSizeExpression>
<to uri="mock:result"/>
</aggregate>
</route>
diff --git
a/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
b/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
index 3eff2d2..2023bb3 100644
---
a/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
+++
b/core/camel-core/src/main/java/org/apache/camel/model/AggregateDefinition.java
@@ -54,9 +54,9 @@ public class AggregateDefinition extends
ProcessorDefinition<AggregateDefinition
private ExpressionSubElementDefinition correlationExpression;
@XmlElement(name = "completionPredicate") @AsPredicate
private ExpressionSubElementDefinition completionPredicate;
- @XmlElement(name = "completionTimeout")
+ @XmlElement(name = "completionTimeoutExpression")
private ExpressionSubElementDefinition completionTimeoutExpression;
- @XmlElement(name = "completionSize")
+ @XmlElement(name = "completionSizeExpression")
private ExpressionSubElementDefinition completionSizeExpression;
@XmlElement(name = "optimisticLockRetryPolicy")
private OptimisticLockRetryPolicyDefinition
optimisticLockRetryPolicyDefinition;
