tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Cleanup script engine classes

pull/13692/head
Dmytro Skarzhynets 1 year ago
parent
69964a2413
commit
2055dc83be
No known key found for this signature in database GPG Key ID: 2B51652F224037DF
3 changed files with 123 additions and 155 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 100
      application/src/main/java/org/thingsboard/server/service/script/RuleNodeJsScriptEngine.java
  2. 66
      application/src/main/java/org/thingsboard/server/service/script/RuleNodeScriptEngine.java
  3. 112
      application/src/main/java/org/thingsboard/server/service/script/RuleNodeTbelScriptEngine.java

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

@ -17,18 +17,16 @@ package org.thingsboard.server.service.script;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import lombok.extern.slf4j.Slf4j;
import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.script.api.RuleNodeScriptFactory; import org.thingsboard.script.api.RuleNodeScriptFactory;
import org.thingsboard.script.api.TbScriptException;
import org.thingsboard.script.api.js.JsInvokeService; import org.thingsboard.script.api.js.JsInvokeService;
import org.thingsboard.server.common.data.StringUtils; import org.thingsboard.server.common.data.StringUtils;
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;
import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.common.msg.TbMsgMetaData;
import javax.script.ScriptException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashSet; import java.util.HashSet;
@ -36,8 +34,6 @@ import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Set; import java.util.Set;
@Slf4j
public class RuleNodeJsScriptEngine extends RuleNodeScriptEngine<JsInvokeService, JsonNode> { public class RuleNodeJsScriptEngine extends RuleNodeScriptEngine<JsInvokeService, JsonNode> {
public RuleNodeJsScriptEngine(TenantId tenantId, JsInvokeService scriptInvokeService, String script, String... argNames) { public RuleNodeJsScriptEngine(TenantId tenantId, JsInvokeService scriptInvokeService, String script, String... argNames) {
@ -45,87 +41,81 @@ public class RuleNodeJsScriptEngine extends RuleNodeScriptEngine<JsInvokeService
} }
@Override @Override
public ListenableFuture<JsonNode> executeJsonAsync(TbMsg msg) { protected Object[] prepareArgs(TbMsg msg) {
return executeScriptAsync(msg); String[] args = new String[3];
if (msg.getData() != null) {
args[0] = msg.getData();
} else {
args[0] = "";
}
args[1] = JacksonUtil.toString(msg.getMetaData().getData());
args[2] = msg.getType();
return args;
} }
@Override @Override
protected ListenableFuture<List<TbMsg>> executeUpdateTransform(TbMsg msg, JsonNode json) { protected List<TbMsg> executeUpdateTransform(TbMsg msg, JsonNode json) {
if (json.isObject()) { if (json.isObject()) {
return Futures.immediateFuture(Collections.singletonList(unbindMsg(json, msg))); return Collections.singletonList(unbindMsg(json, msg));
} else if (json.isArray()) { } else if (json.isArray()) {
List<TbMsg> res = new ArrayList<>(json.size()); List<TbMsg> res = new ArrayList<>(json.size());
json.forEach(jsonObject -> res.add(unbindMsg(jsonObject, msg))); json.forEach(jsonObject -> res.add(unbindMsg(jsonObject, msg)));
return Futures.immediateFuture(res); return res;
} }
log.warn("Wrong result type: {}", json.getNodeType()); throw wrongResultType(json);
return Futures.immediateFailedFuture(new ScriptException("Wrong result type: " + json.getNodeType()));
} }
@Override @Override
protected ListenableFuture<TbMsg> executeGenerateTransform(TbMsg prevMsg, JsonNode result) { protected TbMsg executeGenerateTransform(TbMsg prevMsg, JsonNode result) {
if (!result.isObject()) { if (!result.isObject()) {
log.warn("Wrong result type: {}", result.getNodeType()); throw wrongResultType(result);
Futures.immediateFailedFuture(new ScriptException("Wrong result type: " + result.getNodeType()));
}
return Futures.immediateFuture(unbindMsg(result, prevMsg));
}
@Override
protected JsonNode convertResult(Object result) {
return JacksonUtil.toJsonNode(result != null ? result.toString() : null);
}
@Override
protected ListenableFuture<String> executeToStringTransform(JsonNode result) {
if (result.isTextual()) {
return Futures.immediateFuture(result.asText());
} }
log.warn("Wrong result type: {}", result.getNodeType()); return unbindMsg(result, prevMsg);
return Futures.immediateFailedFuture(new ScriptException("Wrong result type: " + result.getNodeType()));
} }
@Override @Override
protected ListenableFuture<Boolean> executeFilterTransform(JsonNode json) { protected boolean executeFilterTransform(JsonNode json) {
if (json.isBoolean()) { if (json.isBoolean()) {
return Futures.immediateFuture(json.asBoolean()); return json.asBoolean();
} }
log.warn("Wrong result type: {}", json.getNodeType()); throw wrongResultType(json);
return Futures.immediateFailedFuture(new ScriptException("Wrong result type: " + json.getNodeType()));
} }
@Override @Override
protected ListenableFuture<Set<String>> executeSwitchTransform(JsonNode result) { protected Set<String> executeSwitchTransform(JsonNode result) {
if (result.isTextual()) { if (result.isTextual()) {
return Futures.immediateFuture(Collections.singleton(result.asText())); return Collections.singleton(result.asText());
} }
if (result.isArray()) { if (result.isArray()) {
Set<String> nextStates = new HashSet<>(); Set<String> nextStates = new HashSet<>();
for (JsonNode val : result) { for (JsonNode val : result) {
if (!val.isTextual()) { if (!val.isTextual()) {
log.warn("Wrong result type: {}", val.getNodeType()); throw wrongResultType(val);
return Futures.immediateFailedFuture(new ScriptException("Wrong result type: " + val.getNodeType()));
} else { } else {
nextStates.add(val.asText()); nextStates.add(val.asText());
} }
} }
return Futures.immediateFuture(nextStates); return nextStates;
} }
log.warn("Wrong result type: {}", result.getNodeType()); throw wrongResultType(result);
return Futures.immediateFailedFuture(new ScriptException("Wrong result type: " + result.getNodeType()));
} }
@Override @Override
protected Object[] prepareArgs(TbMsg msg) { public ListenableFuture<JsonNode> executeJsonAsync(TbMsg msg) {
String[] args = new String[3]; return executeScriptAsync(msg);
if (msg.getData() != null) { }
args[0] = msg.getData();
} else { @Override
args[0] = ""; protected String executeToStringTransform(JsonNode result) {
if (result.isTextual()) {
return result.asText();
} }
args[1] = JacksonUtil.toString(msg.getMetaData().getData()); throw wrongResultType(result);
args[2] = msg.getType(); }
return args;
@Override
protected JsonNode convertResult(Object result) {
return JacksonUtil.toJsonNode(result != null ? result.toString() : null);
} }
private static TbMsg unbindMsg(JsonNode msgData, TbMsg msg) { private static TbMsg unbindMsg(JsonNode msgData, TbMsg msg) {
@ -138,19 +128,23 @@ public class RuleNodeJsScriptEngine extends RuleNodeScriptEngine<JsInvokeService
} }
if (msgData.has(RuleNodeScriptFactory.METADATA)) { if (msgData.has(RuleNodeScriptFactory.METADATA)) {
JsonNode msgMetadata = msgData.get(RuleNodeScriptFactory.METADATA); JsonNode msgMetadata = msgData.get(RuleNodeScriptFactory.METADATA);
metadata = JacksonUtil.convertValue(msgMetadata, new TypeReference<>() { metadata = JacksonUtil.convertValue(msgMetadata, new TypeReference<>() {});
});
} }
if (msgData.has(RuleNodeScriptFactory.MSG_TYPE)) { if (msgData.has(RuleNodeScriptFactory.MSG_TYPE)) {
messageType = msgData.get(RuleNodeScriptFactory.MSG_TYPE).asText(); messageType = msgData.get(RuleNodeScriptFactory.MSG_TYPE).asText();
} }
String newData = data != null ? data : msg.getData(); String newData = data != null ? data : msg.getData();
TbMsgMetaData newMetadata = metadata != null ? new TbMsgMetaData(metadata) : msg.getMetaData().copy(); TbMsgMetaData newMetadata = metadata != null ? new TbMsgMetaData(metadata) : msg.getMetaData().copy();
String newMessageType = !StringUtils.isEmpty(messageType) ? messageType : msg.getType(); String newMessageType = StringUtils.isNotEmpty(messageType) ? messageType : msg.getType();
return msg.transform() return msg.transform()
.type(newMessageType) .type(newMessageType)
.metaData(newMetadata) .metaData(newMetadata)
.data(newData) .data(newData)
.build(); .build();
} }
private TbScriptException wrongResultType(JsonNode result) {
return new TbScriptException(scriptId, TbScriptException.ErrorCode.RUNTIME, null, new ClassCastException("Wrong result type: " + result.getNodeType()));
}
} }

66
application/src/main/java/org/thingsboard/server/service/script/RuleNodeScriptEngine.java
View File

@ -17,7 +17,6 @@ package org.thingsboard.server.service.script;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.thingsboard.rule.engine.api.ScriptEngine; import org.thingsboard.rule.engine.api.ScriptEngine;
import org.thingsboard.script.api.ScriptInvokeService; import org.thingsboard.script.api.ScriptInvokeService;
@ -27,25 +26,26 @@ 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.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsg;
import javax.script.ScriptException;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.UUID; import java.util.UUID;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
@Slf4j @Slf4j
public abstract class RuleNodeScriptEngine<T extends ScriptInvokeService, R> implements ScriptEngine { public abstract class RuleNodeScriptEngine<T extends ScriptInvokeService, R> implements ScriptEngine {
private final T scriptInvokeService; private final T scriptInvokeService;
private final UUID scriptId; protected final UUID scriptId;
private final TenantId tenantId; private final TenantId tenantId;
public RuleNodeScriptEngine(TenantId tenantId, T scriptInvokeService, String script, String... argNames) { public RuleNodeScriptEngine(TenantId tenantId, T scriptInvokeService, String script, String... argNames) {
this.tenantId = tenantId; this.tenantId = tenantId;
this.scriptInvokeService = scriptInvokeService; this.scriptInvokeService = scriptInvokeService;
try { try {
this.scriptId = this.scriptInvokeService.eval(tenantId, ScriptType.RULE_NODE_SCRIPT, script, argNames).get(); scriptId = this.scriptInvokeService.eval(tenantId, ScriptType.RULE_NODE_SCRIPT, script, argNames).get();
} catch (Exception e) { } catch (Exception e) {
Throwable t = e; Throwable t = e;
if (e instanceof ExecutionException) { if (e instanceof ExecutionException) {
@ -63,73 +63,53 @@ public abstract class RuleNodeScriptEngine<T extends ScriptInvokeService, R> imp
@Override @Override
public ListenableFuture<List<TbMsg>> executeUpdateAsync(TbMsg msg) { public ListenableFuture<List<TbMsg>> executeUpdateAsync(TbMsg msg) {
ListenableFuture<R> result = executeScriptAsync(msg); ListenableFuture<R> result = executeScriptAsync(msg);
return Futures.transformAsync(result, return Futures.transform(result, json -> executeUpdateTransform(msg, json), directExecutor());
json -> executeUpdateTransform(msg, json),
MoreExecutors.directExecutor());
} }
protected abstract ListenableFuture<List<TbMsg>> executeUpdateTransform(TbMsg msg, R result); protected abstract List<TbMsg> executeUpdateTransform(TbMsg msg, R result);
@Override @Override
public ListenableFuture<TbMsg> executeGenerateAsync(TbMsg prevMsg) { public ListenableFuture<TbMsg> executeGenerateAsync(TbMsg prevMsg) {
return Futures.transformAsync(executeScriptAsync(prevMsg), return Futures.transform(executeScriptAsync(prevMsg), result -> executeGenerateTransform(prevMsg, result), directExecutor());
result -> executeGenerateTransform(prevMsg, result),
MoreExecutors.directExecutor());
} }
protected abstract ListenableFuture<TbMsg> executeGenerateTransform(TbMsg prevMsg, R result); protected abstract TbMsg executeGenerateTransform(TbMsg prevMsg, R result);
@Override
public ListenableFuture<String> executeToStringAsync(TbMsg msg) {
return Futures.transformAsync(executeScriptAsync(msg), this::executeToStringTransform, MoreExecutors.directExecutor());
}
@Override @Override
public ListenableFuture<Boolean> executeFilterAsync(TbMsg msg) { public ListenableFuture<Boolean> executeFilterAsync(TbMsg msg) {
return Futures.transformAsync(executeScriptAsync(msg), return Futures.transform(executeScriptAsync(msg), this::executeFilterTransform, directExecutor());
this::executeFilterTransform,
MoreExecutors.directExecutor());
} }
protected abstract ListenableFuture<String> executeToStringTransform(R result); protected abstract boolean executeFilterTransform(R result);
protected abstract ListenableFuture<Boolean> executeFilterTransform(R result); @Override
public ListenableFuture<Set<String>> executeSwitchAsync(TbMsg msg) {
return Futures.transform(executeScriptAsync(msg), this::executeSwitchTransform, directExecutor()); // usually runs on a callbackExecutor
}
protected abstract ListenableFuture<Set<String>> executeSwitchTransform(R result); protected abstract Set<String> executeSwitchTransform(R result);
@Override @Override
public ListenableFuture<Set<String>> executeSwitchAsync(TbMsg msg) { public ListenableFuture<String> executeToStringAsync(TbMsg msg) {
return Futures.transformAsync(executeScriptAsync(msg), return Futures.transform(executeScriptAsync(msg), this::executeToStringTransform, directExecutor());
this::executeSwitchTransform,
MoreExecutors.directExecutor()); //usually runs in a callbackExecutor
} }
protected abstract String executeToStringTransform(R result);
ListenableFuture<R> executeScriptAsync(TbMsg msg) { ListenableFuture<R> executeScriptAsync(TbMsg msg) {
log.trace("execute script async, msg {}", msg); log.trace("execute script async, msg {}", msg);
Object[] inArgs = prepareArgs(msg); Object[] inArgs = prepareArgs(msg);
return executeScriptAsync(msg.getCustomerId(), inArgs[0], inArgs[1], inArgs[2]); return executeScriptAsync(msg.getCustomerId(), inArgs[0], inArgs[1], inArgs[2]);
} }
ListenableFuture<R> executeScriptAsync(CustomerId customerId, Object... args) { private ListenableFuture<R> executeScriptAsync(CustomerId customerId, Object... args) {
return Futures.transformAsync(scriptInvokeService.invokeScript(tenantId, customerId, this.scriptId, args), return Futures.transform(scriptInvokeService.invokeScript(tenantId, customerId, scriptId, args), this::convertResult, directExecutor());
o -> {
try {
return Futures.immediateFuture(convertResult(o));
} catch (Exception e) {
if (e.getCause() instanceof ScriptException) {
return Futures.immediateFailedFuture(e.getCause());
} else if (e.getCause() instanceof RuntimeException) {
return Futures.immediateFailedFuture(new ScriptException(e.getCause().getMessage()));
} else {
return Futures.immediateFailedFuture(new ScriptException(e));
}
}
}, MoreExecutors.directExecutor());
} }
public void destroy() { public void destroy() {
scriptInvokeService.release(this.scriptId); scriptInvokeService.release(scriptId);
} }
protected abstract R convertResult(Object result); protected abstract R convertResult(Object result);
} }

112
application/src/main/java/org/thingsboard/server/service/script/RuleNodeTbelScriptEngine.java
View File

@ -19,17 +19,15 @@ import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.util.concurrent.Futures; import com.google.common.util.concurrent.Futures;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors;
import lombok.extern.slf4j.Slf4j;
import org.thingsboard.common.util.JacksonUtil; import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.script.api.RuleNodeScriptFactory; import org.thingsboard.script.api.RuleNodeScriptFactory;
import org.thingsboard.script.api.TbScriptException;
import org.thingsboard.script.api.tbel.TbelInvokeService; import org.thingsboard.script.api.tbel.TbelInvokeService;
import org.thingsboard.server.common.data.StringUtils; import org.thingsboard.server.common.data.StringUtils;
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;
import org.thingsboard.server.common.msg.TbMsgMetaData; import org.thingsboard.server.common.msg.TbMsgMetaData;
import javax.script.ScriptException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
@ -40,8 +38,8 @@ import java.util.Map;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import static com.google.common.util.concurrent.MoreExecutors.directExecutor;
@Slf4j
public class RuleNodeTbelScriptEngine extends RuleNodeScriptEngine<TbelInvokeService, Object> { public class RuleNodeTbelScriptEngine extends RuleNodeScriptEngine<TbelInvokeService, Object> {
public RuleNodeTbelScriptEngine(TenantId tenantId, TbelInvokeService scriptInvokeService, String script, String... argNames) { public RuleNodeTbelScriptEngine(TenantId tenantId, TbelInvokeService scriptInvokeService, String script, String... argNames) {
@ -49,70 +47,74 @@ public class RuleNodeTbelScriptEngine extends RuleNodeScriptEngine<TbelInvokeSer
} }
@Override @Override
protected ListenableFuture<Boolean> executeFilterTransform(Object result) { protected Object[] prepareArgs(TbMsg msg) {
if (result instanceof Boolean) { Object[] args = new Object[3];
return Futures.immediateFuture((Boolean) result); if (msg.getData() != null) {
args[0] = JacksonUtil.fromString(msg.getData(), Object.class);
} else {
args[0] = new HashMap<>();
} }
return wrongResultType(result); args[1] = new HashMap<>(msg.getMetaData().getData());
args[2] = msg.getType();
return args;
} }
@Override @Override
protected ListenableFuture<List<TbMsg>> executeUpdateTransform(TbMsg msg, Object result) { protected List<TbMsg> executeUpdateTransform(TbMsg msg, Object result) {
if (result instanceof Map) { if (result instanceof Map msgData) {
return Futures.immediateFuture(Collections.singletonList(unbindMsg((Map) result, msg))); return Collections.singletonList(unbindMsg(msgData, msg));
} else if (result instanceof Collection) { } else if (result instanceof Collection resultCollection) {
List<TbMsg> res = new ArrayList<>(); List<TbMsg> res = new ArrayList<>(resultCollection.size());
for (Object resObject : (Collection) result) { for (Object resObject : resultCollection) {
if (resObject instanceof Map) { if (resObject instanceof Map msgData) {
res.add(unbindMsg((Map) resObject, msg)); res.add(unbindMsg(msgData, msg));
} else { } else {
return wrongResultType(resObject); throw wrongResultType(resObject);
} }
} }
return Futures.immediateFuture(res); return res;
} }
return wrongResultType(result); throw wrongResultType(result);
} }
@Override @Override
protected ListenableFuture<TbMsg> executeGenerateTransform(TbMsg prevMsg, Object result) { protected TbMsg executeGenerateTransform(TbMsg prevMsg, Object result) {
if (result instanceof Map) { if (result instanceof Map msgData) {
return Futures.immediateFuture(unbindMsg((Map) result, prevMsg)); return unbindMsg(msgData, prevMsg);
} }
return wrongResultType(result); throw wrongResultType(result);
} }
@Override @Override
protected ListenableFuture<String> executeToStringTransform(Object result) { protected boolean executeFilterTransform(Object result) {
if (result instanceof String) { if (result instanceof Boolean b) {
return Futures.immediateFuture((String) result); return b;
} else {
return Futures.immediateFuture(JacksonUtil.toString(result));
} }
throw wrongResultType(result);
} }
@Override @Override
protected ListenableFuture<Set<String>> executeSwitchTransform(Object result) { protected Set<String> executeSwitchTransform(Object result) {
if (result instanceof String) { if (result instanceof String str) {
return Futures.immediateFuture(Collections.singleton((String) result)); return Collections.singleton(str);
} else if (result instanceof Collection) { }
Set<String> res = new HashSet<>(); if (result instanceof Collection<?> resultCollection) {
for (Object resObject : (Collection) result) { Set<String> res = new HashSet<>(resultCollection.size());
if (resObject instanceof String) { for (Object resObject : resultCollection) {
res.add((String) resObject); if (resObject instanceof String str) {
res.add(str);
} else { } else {
return wrongResultType(resObject); throw wrongResultType(resObject);
} }
} }
return Futures.immediateFuture(res); return res;
} }
return wrongResultType(result); throw wrongResultType(result);
} }
@Override @Override
public ListenableFuture<JsonNode> executeJsonAsync(TbMsg msg) { public ListenableFuture<JsonNode> executeJsonAsync(TbMsg msg) {
return Futures.transform(executeScriptAsync(msg), JacksonUtil::valueToTree, MoreExecutors.directExecutor()); return Futures.transform(executeScriptAsync(msg), JacksonUtil::valueToTree, directExecutor());
} }
@Override @Override
@ -121,16 +123,8 @@ public class RuleNodeTbelScriptEngine extends RuleNodeScriptEngine<TbelInvokeSer
} }
@Override @Override
protected Object[] prepareArgs(TbMsg msg) { protected String executeToStringTransform(Object result) {
Object[] args = new Object[3]; return result instanceof String str ? str : JacksonUtil.toString(result);
if (msg.getData() != null) {
args[0] = JacksonUtil.fromString(msg.getData(), Object.class);
} else {
args[0] = new HashMap<>();
}
args[1] = new HashMap<>(msg.getMetaData().getData());
args[2] = msg.getType();
return args;
} }
private static TbMsg unbindMsg(Map msgData, TbMsg msg) { private static TbMsg unbindMsg(Map msgData, TbMsg msg) {
@ -142,12 +136,12 @@ public class RuleNodeTbelScriptEngine extends RuleNodeScriptEngine<TbelInvokeSer
} }
if (msgData.containsKey(RuleNodeScriptFactory.METADATA)) { if (msgData.containsKey(RuleNodeScriptFactory.METADATA)) {
Object msgMetadataObj = msgData.get(RuleNodeScriptFactory.METADATA); Object msgMetadataObj = msgData.get(RuleNodeScriptFactory.METADATA);
if (msgMetadataObj instanceof Map) { if (msgMetadataObj instanceof Map<?, ?> msgMetadataObjAsMap) {
metadata = ((Map<?, ?>) msgMetadataObj).entrySet().stream().filter(e -> e.getValue() != null) metadata = msgMetadataObjAsMap.entrySet().stream()
.filter(e -> e.getValue() != null)
.collect(Collectors.toMap(e -> e.getKey().toString(), e -> e.getValue().toString())); .collect(Collectors.toMap(e -> e.getKey().toString(), e -> e.getValue().toString()));
} else { } else {
metadata = JacksonUtil.convertValue(msgMetadataObj, new TypeReference<>() { metadata = JacksonUtil.convertValue(msgMetadataObj, new TypeReference<>() {});
});
} }
} }
if (msgData.containsKey(RuleNodeScriptFactory.MSG_TYPE)) { if (msgData.containsKey(RuleNodeScriptFactory.MSG_TYPE)) {
@ -155,7 +149,7 @@ public class RuleNodeTbelScriptEngine extends RuleNodeScriptEngine<TbelInvokeSer
} }
String newData = data != null ? data : msg.getData(); String newData = data != null ? data : msg.getData();
TbMsgMetaData newMetadata = metadata != null ? new TbMsgMetaData(metadata) : msg.getMetaData().copy(); TbMsgMetaData newMetadata = metadata != null ? new TbMsgMetaData(metadata) : msg.getMetaData().copy();
String newMessageType = !StringUtils.isEmpty(messageType) ? messageType : msg.getType(); String newMessageType = StringUtils.isNotEmpty(messageType) ? messageType : msg.getType();
return msg.transform() return msg.transform()
.type(newMessageType) .type(newMessageType)
.metaData(newMetadata) .metaData(newMetadata)
@ -163,13 +157,13 @@ public class RuleNodeTbelScriptEngine extends RuleNodeScriptEngine<TbelInvokeSer
.build(); .build();
} }
private static <T> ListenableFuture<T> wrongResultType(Object result) { private TbScriptException wrongResultType(Object result) {
String className = toClassName(result); String className = toClassName(result);
log.warn("Wrong result type: {}", className); return new TbScriptException(scriptId, TbScriptException.ErrorCode.RUNTIME, null, new ClassCastException("Wrong result type: " + className));
return Futures.immediateFailedFuture(new ScriptException("Wrong result type: " + className));
} }
private static String toClassName(Object result) { private static String toClassName(Object result) {
return result != null ? result.getClass().getSimpleName() : "null"; return result != null ? result.getClass().getSimpleName() : "null";
} }
} }

Write Preview
Loading…
Cancel
Save