Browse Source

exclude argument from debug event if empty

pull/14726/head
IrynaMatveieva 5 months ago
parent
commit
e300cc6126
  1. 2
      application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
  2. 4
      application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java

2
application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java

@ -846,7 +846,7 @@ public class ActorSystemContext {
if (tbMsgType != null) {
eventBuilder.msgType(tbMsgType);
}
if (arguments != null) {
if (arguments != null && !arguments.isEmpty()) {
eventBuilder.arguments(JacksonUtil.toString(arguments));
}
if (result != null) {

4
application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java

@ -201,7 +201,9 @@ public abstract class BaseCalculatedFieldState implements CalculatedFieldState,
@Override
public JsonNode getArgumentsJson() {
return JacksonUtil.valueToTree(arguments.entrySet().stream()
.collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().jsonValue())));
.filter(entry -> !entry.getValue().isEmpty())
.collect(Collectors.toMap(Map.Entry::getKey, e -> e.getValue().jsonValue()))
);
}
}

Loading…
Cancel
Save