From ef9ad6751c7e3d371cd462bfec6bf0605e179572 Mon Sep 17 00:00:00 2001
From: dshvaika <dshvaika@thingsboard.io>
Date: Tue, 12 Aug 2025 13:34:17 +0300
Subject: [PATCH] Fixes after self-review before create WIP PR

---
 .../CalculatedFieldEntityMessageProcessor.java            | 2 +-
 application/src/main/resources/logback.xml                | 3 ++-
 .../CfArgumentDynamicSourceConfiguration.java             | 8 --------
 .../RelationQueryDynamicSourceConfiguration.java          | 2 --
 common/proto/src/main/proto/queue.proto                   | 2 +-
 5 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java b/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java
index 8b62c5b6ba..74474e8a6d 100644
--- a/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java
+++ b/application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldEntityMessageProcessor.java
@@ -302,8 +302,8 @@ public class CalculatedFieldEntityMessageProcessor extends AbstractContextAwareM
             state = stateFuture.get(1, TimeUnit.MINUTES);
             state.checkStateSize(new CalculatedFieldEntityCtxId(tenantId, ctx.getCfId(), entityId), ctx.getMaxStateSize());
             states.put(ctx.getCfId(), state);
-            return state;
         }
+        return state;
     }
 
     private void processStateIfReady(CalculatedFieldCtx ctx, List<CalculatedFieldId> cfIdList, CalculatedFieldState state, UUID tbMsgId, TbMsgType tbMsgType, TbCallback callback) throws CalculatedFieldException {
diff --git a/application/src/main/resources/logback.xml b/application/src/main/resources/logback.xml
index 5478d65d93..f5a8d47df1 100644
--- a/application/src/main/resources/logback.xml
+++ b/application/src/main/resources/logback.xml
@@ -56,7 +56,8 @@
     <!-- Device actor message processor debug -->
     <!--    <logger name="org.thingsboard.server.actors.device.DeviceActorMessageProcessor" level="DEBUG" />-->
 
-    <logger name="org.thingsboard.server.actors.calculatedField" level="TRACE" />
+    <!-- CF actors message processors trace -->
+    <!--    <logger name="org.thingsboard.server.actors.calculatedField" level="TRACE" />-->
     <logger name="com.microsoft.azure.servicebus.primitives.CoreMessageReceiver" level="OFF" />
 
     <root level="INFO">
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CfArgumentDynamicSourceConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CfArgumentDynamicSourceConfiguration.java
index 7af6283536..3fe432917b 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CfArgumentDynamicSourceConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CfArgumentDynamicSourceConfiguration.java
@@ -19,8 +19,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonSubTypes;
 import com.fasterxml.jackson.annotation.JsonTypeInfo;
-import org.thingsboard.server.common.data.id.EntityId;
-import org.thingsboard.server.common.data.relation.EntityRelationsQuery;
 
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
@@ -38,10 +36,4 @@ public interface CfArgumentDynamicSourceConfiguration {
 
     default void validate() {}
 
-    @JsonIgnore
-    boolean isSimpleRelation();
-
-    @JsonIgnore
-    EntityRelationsQuery toEntityRelationsQuery(EntityId rootEntityId);
-
 }
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationQueryDynamicSourceConfiguration.java b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationQueryDynamicSourceConfiguration.java
index a75b7994ba..fdf8815591 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationQueryDynamicSourceConfiguration.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/RelationQueryDynamicSourceConfiguration.java
@@ -55,12 +55,10 @@ public class RelationQueryDynamicSourceConfiguration implements CfArgumentDynami
         }
     }
 
-    @Override
     public boolean isSimpleRelation() {
         return maxLevel == 1 && CollectionsUtil.isEmpty(entityTypes);
     }
 
-    @Override
     public EntityRelationsQuery toEntityRelationsQuery(EntityId rootEntityId) {
         if (isSimpleRelation()) {
             throw new IllegalArgumentException("Entity relations query can't be created for a simple relation!");
diff --git a/common/proto/src/main/proto/queue.proto b/common/proto/src/main/proto/queue.proto
index 10ffb10793..2b6e0701d5 100644
--- a/common/proto/src/main/proto/queue.proto
+++ b/common/proto/src/main/proto/queue.proto
@@ -910,7 +910,7 @@ message GeofencingZoneProto {
 
 message GeofencingArgumentProto {
   string argName = 1;
-  repeated GeofencingZoneProto zones = 4;
+  repeated GeofencingZoneProto zones = 2;
 }
 
 message CalculatedFieldStateProto {