[camel] 03/14: CAMEL-13380: camel-core - Move cloud out into camel-cloud component. Woprk in progress

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davsclaus pushed a commit to branch cloud2
in repository https://gitbox.apache.org/repos/asf/camel.git

commit 4b9d061edd739f423366874e671eeac8d73d3e86
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Fri Apr 5 15:20:45 2019 +0200

    CAMEL-13380: camel-core - Move cloud out into camel-cloud component. Woprk in progress
---
 .../org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
index 9d0b4a1..11d3940 100644
--- a/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
+++ b/core/camel-cloud/src/main/java/org/apache/camel/impl/cloud/DefaultServiceCallProcessor.java
@@ -27,8 +27,8 @@ import org.apache.camel.Message;
 import org.apache.camel.cloud.ServiceCallConstants;
 import org.apache.camel.cloud.ServiceDefinition;
 import org.apache.camel.cloud.ServiceLoadBalancer;
-import org.apache.camel.language.simple.SimpleLanguage;
 import org.apache.camel.processor.SendDynamicProcessor;
+import org.apache.camel.spi.Language;
 import org.apache.camel.support.AsyncProcessorSupport;
 import org.apache.camel.support.service.ServiceHelper;
 import org.apache.camel.util.ObjectHelper;
@@ -204,9 +204,8 @@ public class DefaultServiceCallProcessor extends AsyncProcessorSupport {
      * @param exchange the exchange
      * @return the computed expression
      */
-    private String applySimpleLanguage(String expression, Exchange exchange) {
-        return SimpleLanguage.hasSimpleFunction(expression)
-            ? SimpleLanguage.simple(expression).evaluate(exchange, String.class)
-            : expression;
+    private static String applySimpleLanguage(String expression, Exchange exchange) {
+        Language simple = exchange.getContext().resolveLanguage("simple");
+        return simple.createExpression(expression).evaluate(exchange, String.class);
     }
 }