diff --git a/liteflow-script-plugin/liteflow-script-graaljs/pom.xml b/liteflow-script-plugin/liteflow-script-graaljs/pom.xml
new file mode 100644
index 000000000..4698945ca
--- /dev/null
+++ b/liteflow-script-plugin/liteflow-script-graaljs/pom.xml
@@ -0,0 +1,27 @@
+
+
+
+ liteflow-script-plugin
+ com.yomahub
+ ${revision}
+ ../pom.xml
+
+ 4.0.0
+
+ liteflow-script-graaljs
+
+
+
+ com.yomahub
+ liteflow-core
+ ${revision}
+ provided
+
+
+ org.graalvm.js
+ js
+
+
+
\ No newline at end of file
diff --git a/liteflow-script-plugin/liteflow-script-graaljs/src/main/java/com/yomahub/liteflow/script/graaljs/GraalJavaScriptExecutor.java b/liteflow-script-plugin/liteflow-script-graaljs/src/main/java/com/yomahub/liteflow/script/graaljs/GraalJavaScriptExecutor.java
new file mode 100644
index 000000000..28bf96b3c
--- /dev/null
+++ b/liteflow-script-plugin/liteflow-script-graaljs/src/main/java/com/yomahub/liteflow/script/graaljs/GraalJavaScriptExecutor.java
@@ -0,0 +1,105 @@
+package com.yomahub.liteflow.script.graaljs;
+
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import com.yomahub.liteflow.script.ScriptBeanManager;
+import com.yomahub.liteflow.script.ScriptExecuteWrap;
+import com.yomahub.liteflow.script.ScriptExecutor;
+import com.yomahub.liteflow.script.exception.ScriptLoadException;
+import com.yomahub.liteflow.slot.DataBus;
+import com.yomahub.liteflow.slot.Slot;
+import com.yomahub.liteflow.util.CopyOnWriteHashMap;
+import org.graalvm.polyglot.Context;
+import org.graalvm.polyglot.Value;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.util.Map;
+
+/**
+ * GraalVM JavaScript脚本语言的执行器实现
+ * @author zendwang
+ * @since 2.9.4
+ */
+public class GraalJavaScriptExecutor implements ScriptExecutor {
+
+ private final Logger log = LoggerFactory.getLogger(this.getClass());
+
+ private final Map scriptMap = new CopyOnWriteHashMap<>();
+
+ @Override
+ public ScriptExecutor init() {
+ return this;
+ }
+
+ @Override
+ public void load(String nodeId, String script) {
+ try{
+ String wrapScript = StrUtil.format("function process(){{}} process();",script);
+ scriptMap.put(nodeId, wrapScript);
+ }catch (Exception e){
+ String errorMsg = StrUtil.format("script loading error for node[{}], error msg:{}", nodeId, e.getMessage());
+ throw new ScriptLoadException(errorMsg);
+ }
+ }
+
+ @Override
+ public Object execute(ScriptExecuteWrap wrap) throws Exception{
+ try{
+ if (!scriptMap.containsKey(wrap.getNodeId())){
+ String errorMsg = StrUtil.format("script for node[{}] is not loaded", wrap.getNodeId());
+ throw new ScriptLoadException(errorMsg);
+ }
+
+ Context context = Context.newBuilder().allowAllAccess(true).build();
+ Value bindings = context.getBindings("js");
+ //往脚本语言绑定表里循环增加绑定上下文的key
+ //key的规则为自定义上下文的simpleName
+ //比如你的自定义上下文为AbcContext,那么key就为:abcContext
+ //这里不统一放一个map的原因是考虑到有些用户会调用上下文里的方法,而不是参数,所以脚本语言的绑定表里也是放多个上下文
+ DataBus.getContextBeanList(wrap.getSlotIndex()).forEach(o -> {
+ String key = StrUtil.lowerFirst(o.getClass().getSimpleName());
+ bindings.putMember(key, o);
+ });
+
+ //把wrap对象转换成元数据map
+ Map metaMap = BeanUtil.beanToMap(wrap);
+
+ //在元数据里放入主Chain的流程参数
+ Slot slot = DataBus.getSlot(wrap.getSlotIndex());
+ metaMap.put("requestData", slot.getRequestData());
+
+ //如果有隐式流程,则放入隐式流程的流程参数
+ Object subRequestData = slot.getChainReqData(wrap.getCurrChainName());
+ if (ObjectUtil.isNotNull(subRequestData)){
+ metaMap.put("subRequestData", subRequestData);
+ }
+
+ //往脚本上下文里放入元数据
+ bindings.putMember("_meta", metaMap);
+
+ //放入用户自己定义的bean
+ ScriptBeanManager.getScriptBeanMap().entrySet().stream().forEach( e ->{
+ bindings.putMember(e.getKey(), e.getValue());
+ });
+ Value value = context.eval("js", scriptMap.get(wrap.getNodeId()));
+ if (value.isBoolean()) {
+ return value.asBoolean();
+ } else if (value.isNumber()) {
+ return value.asInt();
+ } else if (value.isString()) {
+ return value.asString();
+ }
+ return value;
+ }catch (Exception e){
+ log.error(e.getMessage(), e);
+ throw e;
+ }
+ }
+
+ @Override
+ public void cleanCache() {
+ scriptMap.clear();
+ }
+}
diff --git a/liteflow-script-plugin/liteflow-script-graaljs/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor b/liteflow-script-plugin/liteflow-script-graaljs/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor
new file mode 100644
index 000000000..48c917566
--- /dev/null
+++ b/liteflow-script-plugin/liteflow-script-graaljs/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor
@@ -0,0 +1,2 @@
+# JavaScript的实现
+com.yomahub.liteflow.script.graaljs.GraalJavaScriptExecutor
\ No newline at end of file
diff --git a/liteflow-script-plugin/liteflow-script-javascript/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor b/liteflow-script-plugin/liteflow-script-javascript/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor
index c331aee2e..48c917566 100644
--- a/liteflow-script-plugin/liteflow-script-javascript/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor
+++ b/liteflow-script-plugin/liteflow-script-javascript/src/main/resources/META-INF/services/com.yomahub.liteflow.script.ScriptExecutor
@@ -1,2 +1,2 @@
# JavaScript的实现
-com.yomahub.liteflow.script.javascript.JavaScriptExecutor
\ No newline at end of file
+com.yomahub.liteflow.script.graaljs.GraalJavaScriptExecutor
\ No newline at end of file
diff --git a/liteflow-script-plugin/pom.xml b/liteflow-script-plugin/pom.xml
index 7ca6966e9..9377c8b40 100644
--- a/liteflow-script-plugin/pom.xml
+++ b/liteflow-script-plugin/pom.xml
@@ -18,6 +18,7 @@
liteflow-script-qlexpress
liteflow-script-groovy
liteflow-script-javascript
+ liteflow-script-graaljs
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/pom.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/pom.xml
similarity index 69%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/pom.xml
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/pom.xml
index 522969ec4..6c40c3931 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/pom.xml
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/pom.xml
@@ -10,7 +10,7 @@
4.0.0
- liteflow-testcase-el-script-graalvm-springboot
+ liteflow-testcase-el-script-graaljs-springboot
@@ -20,7 +20,7 @@
com.yomahub
- liteflow-script-javascript
+ liteflow-script-graaljs
${revision}
test
@@ -29,16 +29,7 @@
spring-boot-starter-test
-
- org.graalvm.js
- js-scriptengine
- 20.2.0
-
-
- org.graalvm.js
- js
- 20.2.0
-
+
\ No newline at end of file
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/BaseTest.java
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/LiteflowXmlScriptJsCommonELTest.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/LiteflowXmlScriptCommonELTest.java
similarity index 71%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/LiteflowXmlScriptJsCommonELTest.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/LiteflowXmlScriptCommonELTest.java
index b10bf871c..3a707b098 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/LiteflowXmlScriptJsCommonELTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/LiteflowXmlScriptCommonELTest.java
@@ -1,4 +1,4 @@
-package com.yomahub.liteflow.test.script.javascript.common;
+package com.yomahub.liteflow.test.script.graaljs.common;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.flow.LiteflowResponse;
@@ -17,16 +17,16 @@ import javax.annotation.Resource;
/**
- * 测试springboot下的groovy脚本组件,基于xml配置
- * @author Bryan.Zhang
- * @since 2.6.0
+ * 测试springboot下的graaljs脚本组件,基于xml配置
+ * @author zendwang
+ * @since 2.9.4
*/
@RunWith(SpringRunner.class)
@TestPropertySource(value = "classpath:/common/application.properties")
-@SpringBootTest(classes = LiteflowXmlScriptJsCommonELTest.class)
+@SpringBootTest(classes = LiteflowXmlScriptCommonELTest.class)
@EnableAutoConfiguration
-@ComponentScan({"com.yomahub.liteflow.test.script.javascript.common.cmp"})
-public class LiteflowXmlScriptJsCommonELTest extends BaseTest {
+@ComponentScan({"com.yomahub.liteflow.test.script.graaljs.common.cmp"})
+public class LiteflowXmlScriptCommonELTest extends BaseTest {
@Resource
private FlowExecutor flowExecutor;
@@ -37,6 +37,6 @@ public class LiteflowXmlScriptJsCommonELTest extends BaseTest {
LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
DefaultContext context = response.getFirstContextBean();
Assert.assertTrue(response.isSuccess());
- Assert.assertEquals(Double.valueOf(11), context.getData("s1"));
+ Assert.assertEquals(Integer.valueOf(11), context.getData("s1"));
}
}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/cmp/ACmp.java
similarity index 87%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/ACmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/cmp/ACmp.java
index a49955685..59f2657b9 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/ACmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/cmp/ACmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.graalvm.common.cmp;
+package com.yomahub.liteflow.test.script.graaljs.common.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/cmp/BCmp.java
similarity index 87%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/BCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/cmp/BCmp.java
index 6a5570667..b319d0e99 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/BCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/cmp/BCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.graalvm.common.cmp;
+package com.yomahub.liteflow.test.script.graaljs.common.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/cmp/CCmp.java
similarity index 87%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/CCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/cmp/CCmp.java
index bd6eb3fa0..618cd8beb 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/CCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/common/cmp/CCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.graalvm.common.cmp;
+package com.yomahub.liteflow.test.script.graaljs.common.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/LiteFlowXmlScriptIfelseJsELTest.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/LiteFlowXmlScriptIfelseJsELTest.java
similarity index 95%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/LiteFlowXmlScriptIfelseJsELTest.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/LiteFlowXmlScriptIfelseJsELTest.java
index abdd26b50..c9b9c67f5 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/LiteFlowXmlScriptIfelseJsELTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/LiteFlowXmlScriptIfelseJsELTest.java
@@ -1,4 +1,4 @@
-package com.yomahub.liteflow.test.script.javascript.ifelse;
+package com.yomahub.liteflow.test.script.graaljs.ifelse;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.flow.LiteflowResponse;
@@ -18,7 +18,7 @@ import javax.annotation.Resource;
@TestPropertySource(value = "classpath:/ifelse/application.properties")
@SpringBootTest(classes = LiteFlowXmlScriptIfelseJsELTest.class)
@EnableAutoConfiguration
-@ComponentScan({"com.yomahub.liteflow.test.script.javascript.ifelse.cmp"})
+@ComponentScan({"com.yomahub.liteflow.test.script.graaljs.ifelse.cmp"})
public class LiteFlowXmlScriptIfelseJsELTest extends BaseTest {
@Resource
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/ACmp.java
similarity index 86%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/ACmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/ACmp.java
index 9cd41a1cf..b8560f3f3 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/ACmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/ACmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.ifelse.cmp;
+package com.yomahub.liteflow.test.script.graaljs.ifelse.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/BCmp.java
similarity index 86%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/BCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/BCmp.java
index 67196ecce..685366e64 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/BCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/BCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.common.cmp;
+package com.yomahub.liteflow.test.script.graaljs.ifelse.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/CCmp.java
similarity index 86%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/CCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/CCmp.java
index ca9a0da81..2d6513f5a 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/CCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/CCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.common.cmp;
+package com.yomahub.liteflow.test.script.graaljs.ifelse.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/DCmp.java
similarity index 90%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/DCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/DCmp.java
index ca2f93ead..728f131e3 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/cmp/DCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/ifelse/cmp/DCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.graalvm.common.cmp;
+package com.yomahub.liteflow.test.script.graaljs.ifelse.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/LiteFlowXmlScriptLoopJsELTest.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/LiteFlowXmlScriptLoopJsELTest.java
similarity index 94%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/LiteFlowXmlScriptLoopJsELTest.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/LiteFlowXmlScriptLoopJsELTest.java
index 172414d38..1b8e4a636 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/LiteFlowXmlScriptLoopJsELTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/LiteFlowXmlScriptLoopJsELTest.java
@@ -1,4 +1,4 @@
-package com.yomahub.liteflow.test.script.javascript.loop;
+package com.yomahub.liteflow.test.script.graaljs.loop;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.flow.LiteflowResponse;
@@ -18,7 +18,7 @@ import javax.annotation.Resource;
@TestPropertySource(value = "classpath:/loop/application.properties")
@SpringBootTest(classes = LiteFlowXmlScriptLoopJsELTest.class)
@EnableAutoConfiguration
-@ComponentScan({"com.yomahub.liteflow.test.script.javascript.loop.cmp"})
+@ComponentScan({"com.yomahub.liteflow.test.script.graaljs.loop.cmp"})
public class LiteFlowXmlScriptLoopJsELTest extends BaseTest {
@Resource
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/ACmp.java
similarity index 86%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/ACmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/ACmp.java
index e0f62fcae..caaea63df 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/ACmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/ACmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.loop.cmp;
+package com.yomahub.liteflow.test.script.graaljs.loop.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/BCmp.java
similarity index 86%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/BCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/BCmp.java
index b373dd6fd..547f1737f 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/BCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/BCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.loop.cmp;
+package com.yomahub.liteflow.test.script.graaljs.loop.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/CCmp.java
similarity index 86%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/CCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/CCmp.java
index bed25390c..489128f08 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/CCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/CCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.loop.cmp;
+package com.yomahub.liteflow.test.script.graaljs.loop.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/DCmp.java
similarity index 91%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/DCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/DCmp.java
index 08b4d0592..711ef67e9 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/loop/cmp/DCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/loop/cmp/DCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.loop.cmp;
+package com.yomahub.liteflow.test.script.graaljs.loop.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import com.yomahub.liteflow.slot.DefaultContext;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/LiteflowXmlScriptJsRefreshELTest.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/LiteflowXmlScriptJsRefreshELTest.java
similarity index 88%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/LiteflowXmlScriptJsRefreshELTest.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/LiteflowXmlScriptJsRefreshELTest.java
index 4846a57f8..c93055c92 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/LiteflowXmlScriptJsRefreshELTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/LiteflowXmlScriptJsRefreshELTest.java
@@ -1,11 +1,10 @@
-package com.yomahub.liteflow.test.script.javascript.refresh;
+package com.yomahub.liteflow.test.script.graaljs.refresh;
import cn.hutool.core.io.resource.ResourceUtil;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.enums.FlowParserTypeEnum;
import com.yomahub.liteflow.flow.FlowBus;
import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.slot.DefaultContext;
import com.yomahub.liteflow.test.BaseTest;
import org.junit.Assert;
import org.junit.Test;
@@ -20,15 +19,15 @@ import javax.annotation.Resource;
/**
- * 测试springboot下的groovy脚本组件,基于xml配置
- * @author Bryan.Zhang
- * @since 2.6.0
+ * 测试springboot下的graaljs脚本组件,基于xml配置
+ * @author zendwang
+ * @since 2.9.4
*/
@RunWith(SpringRunner.class)
@TestPropertySource(value = "classpath:/refresh/application.properties")
@SpringBootTest(classes = LiteflowXmlScriptJsRefreshELTest.class)
@EnableAutoConfiguration
-@ComponentScan({"com.yomahub.liteflow.test.script.javascript.refresh.cmp"})
+@ComponentScan({"com.yomahub.liteflow.test.script.graaljs.refresh.cmp"})
public class LiteflowXmlScriptJsRefreshELTest extends BaseTest {
@Resource
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/ACmp.java
similarity index 86%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/ACmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/ACmp.java
index c746d2bca..a66aa35f1 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/ACmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/ACmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.common.cmp;
+package com.yomahub.liteflow.test.script.graaljs.refresh.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/BCmp.java
similarity index 86%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/BCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/BCmp.java
index fbc739190..28b761692 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/BCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/BCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.ifelse.cmp;
+package com.yomahub.liteflow.test.script.graaljs.refresh.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/CCmp.java
similarity index 86%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/CCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/CCmp.java
index d15d15379..eb3900d40 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/CCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/CCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.ifelse.cmp;
+package com.yomahub.liteflow.test.script.graaljs.refresh.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/DCmp.java
similarity index 89%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/DCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/DCmp.java
index 05541c698..b8213fc2f 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/common/cmp/DCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/refresh/cmp/DCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.common.cmp;
+package com.yomahub.liteflow.test.script.graaljs.refresh.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/LiteFlowScriptScriptbeanJsELTest.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/LiteFlowScriptScriptbeanJsELTest.java
similarity index 88%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/LiteFlowScriptScriptbeanJsELTest.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/LiteFlowScriptScriptbeanJsELTest.java
index 3177177ef..008deed15 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/LiteFlowScriptScriptbeanJsELTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/LiteFlowScriptScriptbeanJsELTest.java
@@ -1,4 +1,4 @@
-package com.yomahub.liteflow.test.script.javascript.scriptbean;
+package com.yomahub.liteflow.test.script.graaljs.scriptbean;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.flow.LiteflowResponse;
@@ -19,7 +19,7 @@ import javax.annotation.Resource;
@TestPropertySource(value = "classpath:/scriptbean/application.properties")
@SpringBootTest(classes = LiteFlowScriptScriptbeanJsELTest.class)
@EnableAutoConfiguration
-@ComponentScan({"com.yomahub.liteflow.test.script.javascript.scriptbean.cmp","com.yomahub.liteflow.test.script.javascript.scriptbean.bean"})
+@ComponentScan({"com.yomahub.liteflow.test.script.graaljs.scriptbean.cmp", "com.yomahub.liteflow.test.script.graaljs.scriptbean.bean"})
public class LiteFlowScriptScriptbeanJsELTest extends BaseTest {
@Resource
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/bean/DemoBean1.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/bean/DemoBean1.java
similarity index 85%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/bean/DemoBean1.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/bean/DemoBean1.java
index 7cd387e7a..77625ac01 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/bean/DemoBean1.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/bean/DemoBean1.java
@@ -1,4 +1,4 @@
-package com.yomahub.liteflow.test.script.javascript.scriptbean.bean;
+package com.yomahub.liteflow.test.script.graaljs.scriptbean.bean;
import com.yomahub.liteflow.script.ScriptBean;
import org.springframework.stereotype.Component;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/bean/DemoBean2.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/bean/DemoBean2.java
similarity index 71%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/bean/DemoBean2.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/bean/DemoBean2.java
index 253b52210..94f52aa83 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/bean/DemoBean2.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/bean/DemoBean2.java
@@ -1,4 +1,4 @@
-package com.yomahub.liteflow.test.script.javascript.scriptbean.bean;
+package com.yomahub.liteflow.test.script.graaljs.scriptbean.bean;
import org.springframework.stereotype.Component;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/cmp/ACmp.java
similarity index 85%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/cmp/ACmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/cmp/ACmp.java
index d709d953f..47efb9b48 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/cmp/ACmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/cmp/ACmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.scriptbean.cmp;
+package com.yomahub.liteflow.test.script.graaljs.scriptbean.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/cmp/BCmp.java
similarity index 85%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/cmp/BCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/cmp/BCmp.java
index bff941bae..3717820a3 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/cmp/BCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/cmp/BCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.scriptbean.cmp;
+package com.yomahub.liteflow.test.script.graaljs.scriptbean.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/cmp/CCmp.java
similarity index 85%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/cmp/CCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/cmp/CCmp.java
index a6cc80f5f..9357c6202 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/scriptbean/cmp/CCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/scriptbean/cmp/CCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.scriptbean.cmp;
+package com.yomahub.liteflow.test.script.graaljs.scriptbean.cmp;
import com.yomahub.liteflow.core.NodeComponent;
import org.springframework.stereotype.Component;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/LiteflowXmlScriptJsSwitchELTest.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/LiteflowXmlScriptJsSwitchELTest.java
similarity index 83%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/LiteflowXmlScriptJsSwitchELTest.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/LiteflowXmlScriptJsSwitchELTest.java
index 940463427..e4a1c3ae2 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/LiteflowXmlScriptJsSwitchELTest.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/LiteflowXmlScriptJsSwitchELTest.java
@@ -1,4 +1,4 @@
-package com.yomahub.liteflow.test.script.javascript.sw;
+package com.yomahub.liteflow.test.script.graaljs.sw;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.flow.LiteflowResponse;
@@ -16,15 +16,15 @@ import javax.annotation.Resource;
/**
- * 测试springboot下的groovy脚本组件,基于xml配置
- * @author Bryan.Zhang
- * @since 2.6.0
+ * 测试springboot下的graaljs脚本组件,基于xml配置
+ * @author zendwang
+ * @since 2.9.4
*/
@RunWith(SpringRunner.class)
@TestPropertySource(value = "classpath:/sw/application.properties")
@SpringBootTest(classes = LiteflowXmlScriptJsSwitchELTest.class)
@EnableAutoConfiguration
-@ComponentScan({"com.yomahub.liteflow.test.script.javascript.sw.cmp"})
+@ComponentScan({"com.yomahub.liteflow.test.script.graaljs.sw.cmp"})
public class LiteflowXmlScriptJsSwitchELTest extends BaseTest {
@Resource
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/ACmp.java
similarity index 87%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/ACmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/ACmp.java
index a5a7bfa3d..493ac5646 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/ACmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/ACmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.sw.cmp;
+package com.yomahub.liteflow.test.script.graaljs.sw.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/BCmp.java
similarity index 87%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/BCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/BCmp.java
index 829581090..56429c094 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/BCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/BCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.sw.cmp;
+package com.yomahub.liteflow.test.script.graaljs.sw.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/CCmp.java
similarity index 87%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/CCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/CCmp.java
index ad15fcc6b..9b8418a4a 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/CCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/CCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.sw.cmp;
+package com.yomahub.liteflow.test.script.graaljs.sw.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/DCmp.java
similarity index 90%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/DCmp.java
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/DCmp.java
index 5bcb60474..2624d7879 100644
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/sw/cmp/DCmp.java
+++ b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/java/com/yomahub/liteflow/test/script/graaljs/sw/cmp/DCmp.java
@@ -5,7 +5,7 @@
* @email weenyc31@163.com
* @Date 2020/4/1
*/
-package com.yomahub.liteflow.test.script.javascript.sw.cmp;
+package com.yomahub.liteflow.test.script.graaljs.sw.cmp;
import com.yomahub.liteflow.annotation.LiteflowComponent;
import com.yomahub.liteflow.core.NodeComponent;
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/common/application.properties b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/common/application.properties
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/common/application.properties
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/common/application.properties
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/common/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/common/flow.xml
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/common/flow.xml
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/common/flow.xml
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/ifelse/application.properties b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/ifelse/application.properties
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/ifelse/application.properties
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/ifelse/application.properties
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/ifelse/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/ifelse/flow.xml
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/ifelse/flow.xml
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/ifelse/flow.xml
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/loop/application.properties b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/loop/application.properties
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/loop/application.properties
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/loop/application.properties
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/loop/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/loop/flow.xml
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/loop/flow.xml
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/loop/flow.xml
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/refresh/application.properties b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/refresh/application.properties
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/refresh/application.properties
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/refresh/application.properties
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/refresh/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/refresh/flow.xml
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/refresh/flow.xml
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/refresh/flow.xml
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/refresh/flow_update.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/refresh/flow_update.xml
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/refresh/flow_update.xml
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/refresh/flow_update.xml
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/scriptbean/application.properties b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/scriptbean/application.properties
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/scriptbean/application.properties
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/scriptbean/application.properties
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/scriptbean/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/scriptbean/flow.xml
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/scriptbean/flow.xml
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/scriptbean/flow.xml
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/sw/application.properties b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/sw/application.properties
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/sw/application.properties
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/sw/application.properties
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/sw/flow.xml b/liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/sw/flow.xml
similarity index 100%
rename from liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/resources/sw/flow.xml
rename to liteflow-testcase-el/liteflow-testcase-el-script-graaljs-springboot/src/test/resources/sw/flow.xml
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/LiteflowXmlScriptJsCommonELTest.java b/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/LiteflowXmlScriptJsCommonELTest.java
deleted file mode 100644
index a0bba42ee..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/graalvm/common/LiteflowXmlScriptJsCommonELTest.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package com.yomahub.liteflow.test.script.graalvm.common;
-
-import com.yomahub.liteflow.core.FlowExecutor;
-import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.slot.DefaultContext;
-import com.yomahub.liteflow.test.BaseTest;
-import org.graalvm.polyglot.Context;
-import org.junit.Assert;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
-
-
-/**
- * 测试springboot下的groovy脚本组件,基于xml配置
- * @author Bryan.Zhang
- * @since 2.6.0
- */
-@RunWith(SpringRunner.class)
-@TestPropertySource(value = "classpath:/common/application.properties")
-@SpringBootTest(classes = LiteflowXmlScriptJsCommonELTest.class)
-@EnableAutoConfiguration
-@ComponentScan({"com.yomahub.liteflow.test.script.graalvm.common.cmp"})
-public class LiteflowXmlScriptJsCommonELTest extends BaseTest {
-
-// @Resource
-// private FlowExecutor flowExecutor;
-//
-// //测试普通脚本节点
-// @Test
-// public void testCommon1() {
-// LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
-// DefaultContext context = response.getFirstContextBean();
-// Assert.assertTrue(response.isSuccess());
-// Assert.assertEquals(Double.valueOf(11), context.getData("s1"));
-// }
-
- /**
- * polyglot 模式
- */
- @Test
- public void method1() {
- System.out.println("Hello Java!");
- try (Context context = Context.newBuilder().allowAllAccess(true).build()) {
- context.eval("js", "print('Hello JavaScript!');");
- context.eval("js", "let user = {name:\"dalong\",age:333}; print(JSON.stringify(user))");
- java.math.BigDecimal v = context.eval("js",
- "var BigDecimal = Java.type('java.math.BigDecimal');" +
- "BigDecimal.valueOf(10).pow(20)")
- .asHostObject();
- System.out.println(v.toString());
- }
- }
-
- /**
- * 一种是基于ScriptEngineManager模式
- * @throws ScriptException
- * @throws NoSuchMethodException
- */
- @Test
- public void method2() throws ScriptException, NoSuchMethodException {
- // 注意此处可以直接使用js,因为js-scriptengine 的spi 注册的时候会自动处理了内置的nashorn
- ScriptEngine eng = new ScriptEngineManager().getEngineByName("js");
- eng.eval("let user = {name:\"dalong\",age:333}; print(JSON.stringify(user))");
- }
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/DCmp.java
deleted file mode 100644
index b97e293ad..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/ifelse/cmp/DCmp.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Title: liteflow
- * Description: 轻量级的组件式流程框架
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.script.javascript.ifelse.cmp;
-
-import com.yomahub.liteflow.annotation.LiteflowComponent;
-import com.yomahub.liteflow.core.NodeComponent;
-import com.yomahub.liteflow.slot.DefaultContext;
-
-@LiteflowComponent("d")
-public class DCmp extends NodeComponent {
-
- @Override
- public void process() {
- DefaultContext context = this.getFirstContextBean();
- context.setData("count",198);
- System.out.println("DCmp executed!");
- }
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/ACmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/ACmp.java
deleted file mode 100644
index 97bf04cb9..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/ACmp.java
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Title: liteflow
- * Description: 轻量级的组件式流程框架
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.script.javascript.refresh.cmp;
-
-import com.yomahub.liteflow.annotation.LiteflowComponent;
-import com.yomahub.liteflow.core.NodeComponent;
-
-@LiteflowComponent("a")
-public class ACmp extends NodeComponent {
-
- @Override
- public void process() {
- System.out.println("ACmp executed!");
- }
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/BCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/BCmp.java
deleted file mode 100644
index 2058dca83..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/BCmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Title: liteflow
- * Description: 轻量级的组件式流程框架
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.script.javascript.refresh.cmp;
-
-import com.yomahub.liteflow.annotation.LiteflowComponent;
-import com.yomahub.liteflow.core.NodeComponent;
-
-@LiteflowComponent("b")
-public class BCmp extends NodeComponent {
-
- @Override
- public void process() {
- System.out.println("BCmp executed!");
- }
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/CCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/CCmp.java
deleted file mode 100644
index 79f62c735..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/CCmp.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Title: liteflow
- * Description: 轻量级的组件式流程框架
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.script.javascript.refresh.cmp;
-
-import com.yomahub.liteflow.annotation.LiteflowComponent;
-import com.yomahub.liteflow.core.NodeComponent;
-
-@LiteflowComponent("c")
-public class CCmp extends NodeComponent {
-
- @Override
- public void process() {
- System.out.println("CCmp executed!");
- }
-
-}
diff --git a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/DCmp.java b/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/DCmp.java
deleted file mode 100644
index 9b25b2184..000000000
--- a/liteflow-testcase-el/liteflow-testcase-el-script-graalvm-springboot/src/test/java/com/yomahub/liteflow/test/script/javascript/refresh/cmp/DCmp.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * Title: liteflow
- * Description: 轻量级的组件式流程框架
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.script.javascript.refresh.cmp;
-
-import com.yomahub.liteflow.annotation.LiteflowComponent;
-import com.yomahub.liteflow.core.NodeComponent;
-import com.yomahub.liteflow.slot.DefaultContext;
-
-@LiteflowComponent("d")
-public class DCmp extends NodeComponent {
-
- @Override
- public void process() {
- DefaultContext context = this.getFirstContextBean();
- context.setData("count",198);
- System.out.println("DCmp executed!");
- }
-
-}
diff --git a/liteflow-testcase-el/pom.xml b/liteflow-testcase-el/pom.xml
index 10ca869ee..3c05f7f32 100644
--- a/liteflow-testcase-el/pom.xml
+++ b/liteflow-testcase-el/pom.xml
@@ -23,7 +23,7 @@
liteflow-testcase-el-script-groovy-springboot
liteflow-testcase-el-script-qlexpress-springboot
liteflow-testcase-el-script-javascript-springboot
- liteflow-testcase-el-script-graalvm-springboot
+ liteflow-testcase-el-script-graaljs-springboot
liteflow-testcase-el-zk-springboot
liteflow-testcase-el-sql-springboot
liteflow-testcase-el-nacos-springboot
diff --git a/pom.xml b/pom.xml
index cb75f1236..06fbdc249 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
1.4.4
3.3.0
3.0.8
+ 20.2.0
1.11.13
1.8.13
1.2.3
@@ -213,6 +214,11 @@
byte-buddy
${bytebuddy.version}
+
+ org.graalvm.js
+ js
+ ${graalvm.version}
+
commons-beanutils
commons-beanutils