You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by lb...@apache.org on 2021/02/20 22:23:39 UTC
[camel] branch master updated (e723596 -> 8b55d3c)
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git.
from e723596 Adding myself to committer list.
new faf9603 core(model): make ExpressionNode implementing HasExpressionType
new 81d6c2a core(model): do not create an HeaderExpression for default contructor
new 8b55d3c core(model): make ResequenceDefinition implementing HasExpressionType
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../main/java/org/apache/camel/model/ExpressionNode.java | 12 +++++++++++-
.../java/org/apache/camel/model/ResequenceDefinition.java | 14 +++++++++++++-
.../java/org/apache/camel/model/RoutingSlipDefinition.java | 2 +-
3 files changed, 25 insertions(+), 3 deletions(-)
[camel] 03/03: core(model): make ResequenceDefinition implementing
HasExpressionType
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 8b55d3c47e17c4199bef47d9e9e77c11e6b957bd
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Sat Feb 20 13:14:48 2021 +0100
core(model): make ResequenceDefinition implementing HasExpressionType
---
.../java/org/apache/camel/model/ResequenceDefinition.java | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java
index b21ef7b..370812f 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ResequenceDefinition.java
@@ -42,7 +42,7 @@ import org.apache.camel.util.TimeUtils;
@Metadata(label = "eip,routing")
@XmlRootElement(name = "resequence")
@XmlAccessorType(XmlAccessType.FIELD)
-public class ResequenceDefinition extends OutputDefinition<ResequenceDefinition> {
+public class ResequenceDefinition extends OutputDefinition<ResequenceDefinition> implements HasExpressionType {
@Metadata(required = false)
@XmlElements({
@XmlElement(name = "batch-config", type = BatchResequencerConfig.class),
@@ -356,4 +356,16 @@ public class ResequenceDefinition extends OutputDefinition<ResequenceDefinition>
setExpression(new ExpressionDefinition(expression));
}
+ @Override
+ public ExpressionDefinition getExpressionType() {
+ return getExpression();
+ }
+
+ /**
+ * Expression to use for re-ordering the messages, such as a header with a sequence number
+ */
+ @Override
+ public void setExpressionType(ExpressionDefinition expressionType) {
+ setExpression(expressionType);
+ }
}
[camel] 02/03: core(model): do not create an HeaderExpression for
default contructor
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 81d6c2a49ee29bd772901b8f6d2b46e24532011a
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Sat Feb 20 13:12:19 2021 +0100
core(model): do not create an HeaderExpression for default contructor
---
.../src/main/java/org/apache/camel/model/RoutingSlipDefinition.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
index c821196..b6fa63d 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/RoutingSlipDefinition.java
@@ -49,7 +49,7 @@ public class RoutingSlipDefinition<Type extends ProcessorDefinition<Type>> exten
private String cacheSize;
public RoutingSlipDefinition() {
- this((String) null, DEFAULT_DELIMITER);
+ setUriDelimiter(uriDelimiter);
}
public RoutingSlipDefinition(String headerName) {
[camel] 01/03: core(model): make ExpressionNode implementing
HasExpressionType
Posted by lb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lburgazzoli pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit faf9603ae0ec1289419bdf36803f42159efb7d96
Author: Luca Burgazzoli <lb...@gmail.com>
AuthorDate: Sat Feb 20 13:08:49 2021 +0100
core(model): make ExpressionNode implementing HasExpressionType
---
.../src/main/java/org/apache/camel/model/ExpressionNode.java | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNode.java b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNode.java
index caca8c7..d52127c 100644
--- a/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNode.java
+++ b/core/camel-core-model/src/main/java/org/apache/camel/model/ExpressionNode.java
@@ -38,7 +38,7 @@ import org.apache.camel.model.language.ExpressionDefinition;
*/
@XmlAccessorType(XmlAccessType.FIELD)
@XmlTransient
-public abstract class ExpressionNode extends ProcessorDefinition<ExpressionNode> {
+public abstract class ExpressionNode extends ProcessorDefinition<ExpressionNode> implements HasExpressionType {
@XmlElementRef
private ExpressionDefinition expression;
@@ -81,6 +81,16 @@ public abstract class ExpressionNode extends ProcessorDefinition<ExpressionNode>
}
@Override
+ public ExpressionDefinition getExpressionType() {
+ return getExpression();
+ }
+
+ @Override
+ public void setExpressionType(ExpressionDefinition expressionType) {
+ setExpression(expressionType);
+ }
+
+ @Override
public String getLabel() {
if (getExpression() == null) {
return "";