[camel] branch master updated: Okay we gotta use the specific languages here as the xml dsl will output it as generic language instead of header/consntant etc.

[da...@apache.org]

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 d9a8a7a  Okay we gotta use the specific languages here as the xml dsl will output it as generic language instead of header/consntant etc.
d9a8a7a is described below

commit d9a8a7ac83d2ea2ac4df7e4870077e828ef7f556
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Thu Jan 31 09:34:52 2019 +0100

    Okay we gotta use the specific languages here as the xml dsl will output it as generic language instead of header/consntant etc.
---
 .../camel/builder/ExpressionClauseSupport.java     | 34 +++++++++++++++-------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
index 6d1aec6..b6a972d 100644
--- a/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
+++ b/camel-core/src/main/java/org/apache/camel/builder/ExpressionClauseSupport.java
@@ -21,11 +21,21 @@ import java.util.Map;
 import org.apache.camel.CamelContext;
 import org.apache.camel.Expression;
 import org.apache.camel.builder.xml.Namespaces;
+import org.apache.camel.model.language.ConstantExpression;
+import org.apache.camel.model.language.ExchangePropertyExpression;
 import org.apache.camel.model.language.ExpressionDefinition;
+import org.apache.camel.model.language.GroovyExpression;
+import org.apache.camel.model.language.HeaderExpression;
+import org.apache.camel.model.language.JavaScriptExpression;
 import org.apache.camel.model.language.JsonPathExpression;
 import org.apache.camel.model.language.LanguageExpression;
 import org.apache.camel.model.language.MethodCallExpression;
+import org.apache.camel.model.language.MvelExpression;
+import org.apache.camel.model.language.OgnlExpression;
+import org.apache.camel.model.language.RefExpression;
 import org.apache.camel.model.language.SimpleExpression;
+import org.apache.camel.model.language.SpELExpression;
+import org.apache.camel.model.language.TerserExpression;
 import org.apache.camel.model.language.TokenizerExpression;
 import org.apache.camel.model.language.XMLTokenizerExpression;
 import org.apache.camel.model.language.XPathExpression;
@@ -67,7 +77,11 @@ public class ExpressionClauseSupport<T> {
      * do not use this if you want dynamic values during routing.
      */
     public T constant(Object value) {
-        return expression(ExpressionBuilder.constantExpression(value));
+        if (value instanceof String) {
+            return expression(new ConstantExpression((String) value));
+        } else {
+            return expression(ExpressionBuilder.constantExpression(value));
+        }
     }
 
     /**
@@ -124,7 +138,7 @@ public class ExpressionClauseSupport<T> {
      * An expression of an inbound message header of the given name
      */
     public T header(String name) {
-        return expression(new LanguageExpression("header", name));
+        return expression(new HeaderExpression(name));
     }
 
     /**
@@ -166,7 +180,7 @@ public class ExpressionClauseSupport<T> {
      * An expression of an exchange property of the given name
      */
     public T exchangeProperty(String name) {
-        return expression(ExpressionBuilder.exchangePropertyExpression(name));
+        return expression(new ExchangePropertyExpression(name));
     }
 
     /**
@@ -268,7 +282,7 @@ public class ExpressionClauseSupport<T> {
      * @return the builder to continue processing the DSL
      */
     public T groovy(String text) {
-        return expression(new LanguageExpression("groovy", text));
+        return expression(new GroovyExpression(text));
     }
 
     /**
@@ -282,7 +296,7 @@ public class ExpressionClauseSupport<T> {
      */
     @Deprecated
     public T javaScript(String text) {
-        return expression(new LanguageExpression("js", text));
+        return expression(new JavaScriptExpression(text));
     }
 
     /**
@@ -468,7 +482,7 @@ public class ExpressionClauseSupport<T> {
      * @return the builder to continue processing the DSL
      */
     public T ognl(String text) {
-        return expression(new LanguageExpression("ognl", text));
+        return expression(new OgnlExpression(text));
     }
 
     /**
@@ -479,7 +493,7 @@ public class ExpressionClauseSupport<T> {
      * @return the builder to continue processing the DSL
      */
     public T mvel(String text) {
-        return expression(new LanguageExpression("mvel", text));
+        return expression(new MvelExpression(text));
     }
 
     /**
@@ -490,7 +504,7 @@ public class ExpressionClauseSupport<T> {
      * @return the builder to continue processing the DSL
      */
     public T ref(String ref) {
-        return expression(new LanguageExpression("ref", ref));
+        return expression(new RefExpression(ref));
     }
 
     /**
@@ -501,7 +515,7 @@ public class ExpressionClauseSupport<T> {
      * @return the builder to continue processing the DSL
      */
     public T spel(String text) {
-        return expression(new LanguageExpression("spel", text));
+        return expression(new SpELExpression(text));
     }
 
     /**
@@ -538,7 +552,7 @@ public class ExpressionClauseSupport<T> {
      * @return the builder to continue processing the DSL
      */
     public T terser(String text) {
-        return expression(new LanguageExpression("terser", text));
+        return expression(new TerserExpression(text));
     }
 
     /**