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 2020/10/21 19:38:12 UTC
[camel] branch master updated: CAMEL-15732: camel-core - Untangle
reifier from impl and builder
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 eb7d358 CAMEL-15732: camel-core - Untangle reifier from impl and builder
eb7d358 is described below
commit eb7d358e8029bcc1288d36fb7dd8d84a478078e8
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Wed Oct 21 21:24:37 2020 +0200
CAMEL-15732: camel-core - Untangle reifier from impl and builder
---
.../src/main/java/org/apache/camel/reifier/SetHeaderReifier.java | 3 +--
.../src/main/java/org/apache/camel/reifier/SetPropertyReifier.java | 3 +--
.../src/main/java/org/apache/camel/reifier/WireTapReifier.java | 3 +--
3 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
index fb57b18..a890503 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetHeaderReifier.java
@@ -19,7 +19,6 @@ package org.apache.camel.reifier;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SetHeaderDefinition;
import org.apache.camel.processor.SetHeaderProcessor;
@@ -35,7 +34,7 @@ public class SetHeaderReifier extends ExpressionReifier<SetHeaderDefinition> {
public Processor createProcessor() throws Exception {
ObjectHelper.notNull(definition.getName(), "headerName");
Expression expr = createExpression(definition.getExpression());
- Expression nameExpr = ExpressionBuilder.simpleExpression(parseString(definition.getName()));
+ Expression nameExpr = camelContext.resolveLanguage("simple").createExpression(parseString(definition.getName()));
nameExpr.init(camelContext);
return new SetHeaderProcessor(nameExpr, expr);
}
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
index d2c6a0d..bd852e0 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/SetPropertyReifier.java
@@ -19,7 +19,6 @@ package org.apache.camel.reifier;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SetPropertyDefinition;
import org.apache.camel.processor.SetPropertyProcessor;
@@ -35,7 +34,7 @@ public class SetPropertyReifier extends ExpressionReifier<SetPropertyDefinition>
public Processor createProcessor() throws Exception {
ObjectHelper.notNull(definition.getName(), "propertyName", this);
Expression expr = createExpression(definition.getExpression());
- Expression nameExpr = ExpressionBuilder.simpleExpression(parseString(definition.getName()));
+ Expression nameExpr = camelContext.resolveLanguage("simple").createExpression(parseString(definition.getName()));
nameExpr.init(camelContext);
return new SetPropertyProcessor(nameExpr, expr);
}
diff --git a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java
index 093c54e..6cb3e7c 100644
--- a/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java
+++ b/core/camel-core-engine/src/main/java/org/apache/camel/reifier/WireTapReifier.java
@@ -22,7 +22,6 @@ import org.apache.camel.ExchangePattern;
import org.apache.camel.Expression;
import org.apache.camel.Processor;
import org.apache.camel.Route;
-import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.model.ProcessorDefinition;
import org.apache.camel.model.SetHeaderDefinition;
import org.apache.camel.model.WireTapDefinition;
@@ -97,7 +96,7 @@ public class WireTapReifier extends ToDynamicReifier<WireTapDefinition<?>> {
if (parseBoolean(definition.getDynamicUri(), true)) {
return super.createExpression(uri);
} else {
- return ExpressionBuilder.constantExpression(uri);
+ return camelContext.resolveLanguage("constant").createExpression(uri);
}
}