From ab77b5d6b79dca8a3b5b9db7ee94adc325fb6b55 Mon Sep 17 00:00:00 2001
From: VIacheslavKlimov <viacheslavklimov11@gmail.com>
Date: Mon, 22 Sep 2025 17:55:07 +0300
Subject: [PATCH] Improvements for compatibility with PE

---
 .../cf/AbstractCalculatedFieldProcessingService.java       | 5 ++---
 .../server/service/cf/CalculatedFieldCache.java            | 2 ++
 .../server/service/cf/DefaultCalculatedFieldCache.java     | 3 ++-
 .../cf/DefaultCalculatedFieldProcessingService.java        | 7 ++++++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/application/src/main/java/org/thingsboard/server/service/cf/AbstractCalculatedFieldProcessingService.java b/application/src/main/java/org/thingsboard/server/service/cf/AbstractCalculatedFieldProcessingService.java
index b3632e7f26..6ecf7c5974 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/AbstractCalculatedFieldProcessingService.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/AbstractCalculatedFieldProcessingService.java
@@ -60,7 +60,7 @@ import static org.thingsboard.server.utils.CalculatedFieldArgumentUtils.transfor
 
 @Data
 @Slf4j
-public abstract class AbstractCalculatedFieldProcessingService implements CalculatedFieldProcessingService {
+public abstract class AbstractCalculatedFieldProcessingService {
 
     protected final AttributesService attributesService;
     protected final TimeseriesService timeseriesService;
@@ -84,8 +84,7 @@ public abstract class AbstractCalculatedFieldProcessingService implements Calcul
 
     protected abstract String getExecutorNamePrefix();
 
-    @Override
-    public ListenableFuture<Map<String, ArgumentEntry>> fetchArguments(CalculatedFieldCtx ctx, EntityId entityId) {
+    protected ListenableFuture<Map<String, ArgumentEntry>> fetchArguments(CalculatedFieldCtx ctx, EntityId entityId) {
         Map<String, ListenableFuture<ArgumentEntry>> argFutures = switch (ctx.getCalculatedField().getType()) {
             case GEOFENCING -> fetchGeofencingCalculatedFieldArguments(ctx, entityId, false);
             case SIMPLE, SCRIPT, ALARM -> {
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/CalculatedFieldCache.java b/application/src/main/java/org/thingsboard/server/service/cf/CalculatedFieldCache.java
index 5aac75a7c7..8dd3491942 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/CalculatedFieldCache.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/CalculatedFieldCache.java
@@ -45,4 +45,6 @@ public interface CalculatedFieldCache {
 
     void evict(CalculatedFieldId calculatedFieldId);
 
+    EntityId getProfileId(TenantId tenantId, EntityId entityId);
+
 }
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java b/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java
index f40aa503f7..0ef62c3568 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java
@@ -211,7 +211,8 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
         log.debug("[{}] evict calculated field links from cached links by entity id: {}", calculatedFieldId, oldCalculatedField);
     }
 
-    private EntityId getProfileId(TenantId tenantId, EntityId entityId) {
+    @Override
+    public EntityId getProfileId(TenantId tenantId, EntityId entityId) {
         return switch (entityId.getEntityType()) {
             case ASSET -> assetProfileCache.get(tenantId, (AssetId) entityId).getId();
             case DEVICE -> deviceProfileCache.get(tenantId, (DeviceId) entityId).getId();
diff --git a/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java b/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java
index dfc32741c8..f5c39ed288 100644
--- a/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java
+++ b/application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldProcessingService.java
@@ -60,7 +60,7 @@ import static org.thingsboard.server.utils.CalculatedFieldUtils.toProto;
 @TbRuleEngineComponent
 @Service
 @Slf4j
-public class DefaultCalculatedFieldProcessingService extends AbstractCalculatedFieldProcessingService {
+public class DefaultCalculatedFieldProcessingService extends AbstractCalculatedFieldProcessingService implements CalculatedFieldProcessingService {
 
     private final TbClusterService clusterService;
     private final PartitionService partitionService;
@@ -81,6 +81,11 @@ public class DefaultCalculatedFieldProcessingService extends AbstractCalculatedF
         return "calculated-field-callback";
     }
 
+    @Override
+    public ListenableFuture<Map<String, ArgumentEntry>> fetchArguments(CalculatedFieldCtx ctx, EntityId entityId) {
+        return super.fetchArguments(ctx, entityId);
+    }
+
     @Override
     public Map<String, ArgumentEntry> fetchDynamicArgsFromDb(CalculatedFieldCtx ctx, EntityId entityId) {
         // only geofencing calculated fields supports dynamic arguments scheduled updates