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 2021/05/10 08:53:58 UTC

[camel] 01/03: CAMEL-16596: ScriptingLanguage SPI.

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

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

commit 71f67a0968661a1ba2ab8e0e4abc003be4b24025
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Mon May 10 10:20:56 2021 +0200

    CAMEL-16596: ScriptingLanguage SPI.
---
 .../apache/camel/language/ognl/OgnlLanguage.java   | 26 +++++++++++-
 .../org/apache/camel/language/ognl/MyUser.java}    | 32 +++++++--------
 .../language/ognl/OgnlScriptingLanguageTest.java   | 48 ++++++++++++++++++++++
 .../camel-ognl/src/test/resources/myuser.txt       |  1 +
 4 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
index 0911d31..d6ac77f 100644
--- a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
+++ b/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
@@ -16,8 +16,14 @@
  */
 package org.apache.camel.language.ognl;
 
+import java.util.Map;
+
+import ognl.Ognl;
+import ognl.OgnlContext;
 import org.apache.camel.Expression;
+import org.apache.camel.ExpressionIllegalSyntaxException;
 import org.apache.camel.Predicate;
+import org.apache.camel.spi.ScriptingLanguage;
 import org.apache.camel.spi.annotations.Language;
 import org.apache.camel.support.LanguageSupport;
 
@@ -25,7 +31,7 @@ import org.apache.camel.support.LanguageSupport;
  * An <a href="http://www.ognl.org/">OGNL</a> {@link org.apache.camel.spi.Language} plugin
  */
 @Language("ognl")
-public class OgnlLanguage extends LanguageSupport {
+public class OgnlLanguage extends LanguageSupport implements ScriptingLanguage {
 
     @Override
     public Predicate createPredicate(String expression) {
@@ -38,4 +44,22 @@ public class OgnlLanguage extends LanguageSupport {
         expression = loadResource(expression);
         return new OgnlExpression(this, expression, Object.class);
     }
+
+    @Override
+    public <T> T evaluate(String script, Map<String, Object> bindings, Class<T> resultType) {
+        script = loadResource(script);
+        try {
+            Object compiled = Ognl.parseExpression(script);
+            OgnlContext oglContext = new OgnlContext();
+            if (bindings != null && !bindings.isEmpty()) {
+                oglContext.setValues(bindings);
+            }
+            // setup the class resolver from camel
+            oglContext.setClassResolver(new CamelClassResolver(getCamelContext().getClassResolver()));
+            Object value = Ognl.getValue(compiled, oglContext);
+            return getCamelContext().getTypeConverter().convertTo(resultType, value);
+        } catch (Exception e) {
+            throw new ExpressionIllegalSyntaxException(script, e);
+        }
+    }
 }
diff --git a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/MyUser.java
similarity index 54%
copy from components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
copy to components/camel-ognl/src/test/java/org/apache/camel/language/ognl/MyUser.java
index 0911d31..146a0d8 100644
--- a/components/camel-ognl/src/main/java/org/apache/camel/language/ognl/OgnlLanguage.java
+++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/MyUser.java
@@ -16,26 +16,24 @@
  */
 package org.apache.camel.language.ognl;
 
-import org.apache.camel.Expression;
-import org.apache.camel.Predicate;
-import org.apache.camel.spi.annotations.Language;
-import org.apache.camel.support.LanguageSupport;
+public class MyUser {
 
-/**
- * An <a href="http://www.ognl.org/">OGNL</a> {@link org.apache.camel.spi.Language} plugin
- */
-@Language("ognl")
-public class OgnlLanguage extends LanguageSupport {
+    private String name;
+    private int age;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
 
-    @Override
-    public Predicate createPredicate(String expression) {
-        expression = loadResource(expression);
-        return new OgnlExpression(this, expression, Boolean.class);
+    public int getAge() {
+        return age;
     }
 
-    @Override
-    public Expression createExpression(String expression) {
-        expression = loadResource(expression);
-        return new OgnlExpression(this, expression, Object.class);
+    public void setAge(int age) {
+        this.age = age;
     }
 }
diff --git a/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlScriptingLanguageTest.java b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlScriptingLanguageTest.java
new file mode 100644
index 0000000..2568744
--- /dev/null
+++ b/components/camel-ognl/src/test/java/org/apache/camel/language/ognl/OgnlScriptingLanguageTest.java
@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.language.ognl;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.camel.spi.Language;
+import org.apache.camel.spi.ScriptingLanguage;
+import org.apache.camel.test.junit5.CamelTestSupport;
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+public class OgnlScriptingLanguageTest extends CamelTestSupport {
+
+    @Test
+    public void testScripting() throws Exception {
+        Language lan = context.resolveLanguage("ognl");
+        Assertions.assertTrue(lan instanceof ScriptingLanguage);
+
+        ScriptingLanguage slan = (ScriptingLanguage) lan;
+        int num = slan.evaluate("2 * 3", null, int.class);
+        Assertions.assertEquals(6, num);
+
+        MyUser user = new MyUser();
+        user.setAge(33);
+        user.setName("Scott");
+        Map<String, Object> bindings = new LinkedHashMap<>();
+        bindings.put("user", user);
+        String out = slan.evaluate("resource:classpath:myuser.txt", bindings, String.class);
+        Assertions.assertEquals("Hello Scott you are 33 years old", out);
+    }
+
+}
diff --git a/components/camel-ognl/src/test/resources/myuser.txt b/components/camel-ognl/src/test/resources/myuser.txt
new file mode 100644
index 0000000..a43df2f
--- /dev/null
+++ b/components/camel-ognl/src/test/resources/myuser.txt
@@ -0,0 +1 @@
+"Hello " + user.name + " you are " + user.age + " years old"
\ No newline at end of file