dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MVEL improvements

Browse Source
This commit is contained in:
Andrii Shvaika 2022-10-20 17:05:53 +03:00
parent 609107468c
commit 3f729a8ca0
5 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
View File

@ -444,8 +444,8 @@ class DefaultTbContext implements TbContext {
return mainCtx.getExternalCallExecutorService(); return mainCtx.getExternalCallExecutorService();
} }
@Deprecated
@Override @Override
@Deprecated
public ScriptEngine createJsScriptEngine(String script, String... argNames) { public ScriptEngine createJsScriptEngine(String script, String... argNames) {
return new RuleNodeJsScriptEngine(getTenantId(), mainCtx.getJsInvokeService(), script, argNames); return new RuleNodeJsScriptEngine(getTenantId(), mainCtx.getJsInvokeService(), script, argNames);
} }

3
common/script/script-api/src/main/java/org/thingsboard/script/api/ScriptInvokeService.java
View File

@ -18,6 +18,7 @@ package org.thingsboard.script.api;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import org.thingsboard.server.common.data.id.CustomerId; import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.script.ScriptLanguage;
import java.util.UUID; import java.util.UUID;
@ -29,4 +30,6 @@ public interface ScriptInvokeService {
ListenableFuture<Void> release(UUID scriptId); ListenableFuture<Void> release(UUID scriptId);
ScriptLanguage getLanguage();
} }

7
common/script/script-api/src/main/java/org/thingsboard/script/api/js/JsInvokeService.java
View File

@ -16,6 +16,13 @@
package org.thingsboard.script.api.js; package org.thingsboard.script.api.js;
import org.thingsboard.script.api.ScriptInvokeService; import org.thingsboard.script.api.ScriptInvokeService;
import org.thingsboard.server.common.data.script.ScriptLanguage;
public interface JsInvokeService extends ScriptInvokeService { public interface JsInvokeService extends ScriptInvokeService {
@Override
default ScriptLanguage getLanguage() {
return ScriptLanguage.JS;
}
} }

7
common/script/script-api/src/main/java/org/thingsboard/script/api/mvel/MvelInvokeService.java
View File

@ -16,6 +16,13 @@
package org.thingsboard.script.api.mvel; package org.thingsboard.script.api.mvel;
import org.thingsboard.script.api.ScriptInvokeService; import org.thingsboard.script.api.ScriptInvokeService;
import org.thingsboard.server.common.data.script.ScriptLanguage;
public interface MvelInvokeService extends ScriptInvokeService { public interface MvelInvokeService extends ScriptInvokeService {
@Override
default ScriptLanguage getLanguage() {
return ScriptLanguage.MVEL;
}
} }

1
rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
View File

@ -268,6 +268,7 @@ public interface TbContext {
* <p> Use {@link #createScriptEngine} instead. * <p> Use {@link #createScriptEngine} instead.
* *
*/ */
@Deprecated
ScriptEngine createJsScriptEngine(String script, String... argNames); ScriptEngine createJsScriptEngine(String script, String... argNames);
ScriptEngine createScriptEngine(ScriptLanguage scriptLang, String script, String... argNames); ScriptEngine createScriptEngine(ScriptLanguage scriptLang, String script, String... argNames);