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

js-script-engine-api: fixed CE merge

Browse Source
This commit is contained in:
Sergey Matvienko 2021-06-17 14:12:33 +03:00
parent b397dfb518
commit 966b0923e7
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/main/java/org/thingsboard/server/service/script/RuleNodeJsScriptEngine.java
View File

@ -23,6 +23,7 @@ import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.MoreExecutors;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsg;

2
rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/ScriptEngine.java
View File

@ -28,8 +28,6 @@ public interface ScriptEngine {
ListenableFuture<TbMsg> executeGenerateAsync(TbMsg prevMsg); ListenableFuture<TbMsg> executeGenerateAsync(TbMsg prevMsg);
boolean executeFilter(TbMsg msg) throws ScriptException;
ListenableFuture<Boolean> executeFilterAsync(TbMsg msg); ListenableFuture<Boolean> executeFilterAsync(TbMsg msg);
ListenableFuture<Set<String>> executeSwitchAsync(TbMsg msg); ListenableFuture<Set<String>> executeSwitchAsync(TbMsg msg);