mirror of
https://gitee.com/dromara/liteFlow.git
synced 2026-05-14 04:02:09 +08:00
feature #IASS9Z 新的java脚本插件,支持java8~java17的所有语法特性
This commit is contained in:
@@ -8,7 +8,8 @@ import com.yomahub.liteflow.script.ScriptExecutor;
|
||||
import com.yomahub.liteflow.script.exception.ScriptLoadException;
|
||||
import com.yomahub.liteflow.util.CopyOnWriteHashMap;
|
||||
import org.noear.liquor.eval.CodeSpec;
|
||||
import org.noear.liquor.eval.ScriptEvaluator;
|
||||
import org.noear.liquor.eval.ParamSpec;
|
||||
import org.noear.liquor.eval.Scripts;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
@@ -17,12 +18,8 @@ import java.util.Map;
|
||||
public class JavaxExecutor extends ScriptExecutor {
|
||||
private final Map<String, CodeSpec> compiledScriptMap = new CopyOnWriteHashMap<>();
|
||||
|
||||
private ScriptEvaluator scriptEvaluator;
|
||||
|
||||
@Override
|
||||
public ScriptExecutor init() {
|
||||
scriptEvaluator = new ScriptEvaluator();
|
||||
scriptEvaluator.setPrintable(true);
|
||||
return this;
|
||||
}
|
||||
|
||||
@@ -54,7 +51,7 @@ public class JavaxExecutor extends ScriptExecutor {
|
||||
throw new ScriptLoadException(errorMsg);
|
||||
}
|
||||
CodeSpec codeSpec = compiledScriptMap.get(wrap.getNodeId());
|
||||
return scriptEvaluator.eval(codeSpec, wrap);
|
||||
return Scripts.eval(codeSpec, wrap);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -71,8 +68,8 @@ public class JavaxExecutor extends ScriptExecutor {
|
||||
public Object compile(String script) throws Exception {
|
||||
CodeSpec codeSpec = new CodeSpec(convertScript(script))
|
||||
.returnType(Object.class)
|
||||
.parameters(new String[] {"_meta"}, new Class[] {ScriptExecuteWrap.class});
|
||||
scriptEvaluator.compile(codeSpec);
|
||||
.parameters(new ParamSpec("_meta", ScriptExecuteWrap.class));
|
||||
Scripts.compile(codeSpec);
|
||||
return codeSpec;
|
||||
}
|
||||
|
||||
|
||||
4
pom.xml
4
pom.xml
@@ -39,7 +39,7 @@
|
||||
</scm>
|
||||
|
||||
<properties>
|
||||
<revision>2.12.3</revision>
|
||||
<revision>2.12.4</revision>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
|
||||
<maven.compiler.source>8</maven.compiler.source>
|
||||
@@ -77,7 +77,7 @@
|
||||
<redisson.version>3.21.0</redisson.version>
|
||||
<janino.version>3.1.12</janino.version>
|
||||
<kotlin.version>1.9.23</kotlin.version>
|
||||
<liquor.version>1.2.7-SNAPSHOT</liquor.version>
|
||||
<liquor.version>1.3.1</liquor.version>
|
||||
</properties>
|
||||
|
||||
<dependencyManagement>
|
||||
|
||||
Reference in New Issue
Block a user