From e300cc61268c217aafbc6068d73167eee0117034 Mon Sep 17 00:00:00 2001 From: IrynaMatveieva Date: Mon, 5 Jan 2026 11:00:03 +0200 Subject: [PATCH] exclude argument from debug event if empty --- .../org/thingsboard/server/actors/ActorSystemContext.java | 2 +- .../server/service/cf/ctx/state/BaseCalculatedFieldState.java | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java b/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java index 9848ac2fe6..a05a91434a 100644 --- a/application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java +++ b/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) { diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java index 0f648600a5..b4b396b526 100644 --- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/BaseCalculatedFieldState.java +++ b/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())) + ); } }