From 9b09c6542bdd41bbdcb88bd555dec4a32c12e662 Mon Sep 17 00:00:00 2001
From: IrynaMatveieva <irina.m2004@icloud.com>
Date: Wed, 4 Jun 2025 11:00:36 +0300
Subject: [PATCH] fixed error when json passed as argument

---
 .../cf/ctx/state/SingleValueArgumentEntry.java        | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java
index bfe9eed24f..bdbda2309e 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/ctx/state/SingleValueArgumentEntry.java
@@ -16,9 +16,11 @@
 package org.thingsboard.server.service.cf.ctx.state;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.core.type.TypeReference;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.script.api.tbel.TbelCfArg;
 import org.thingsboard.script.api.tbel.TbelCfSingleValueArg;
 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
@@ -90,7 +92,14 @@ public class SingleValueArgumentEntry implements ArgumentEntry {
 
     @Override
     public TbelCfArg toTbelCfArg() {
-        return new TbelCfSingleValueArg(ts, kvEntryValue.getValue());
+        Object value;
+        try {
+            value = JacksonUtil.readValue(kvEntryValue.getValueAsString(), new TypeReference<>() {
+            });
+        } catch (Exception e) {
+            value = kvEntryValue.getValue();
+        }
+        return new TbelCfSingleValueArg(ts, value);
     }
 
     @Override