added CF config marker interface

application/src/main/java/org/thingsboard/server/actors/calculatedField/CalculatedFieldManagerMessageProcessor.java

@@ -27,7 +27,7 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.ProfileEntityIdInfo;
 import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
-import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -482,7 +482,9 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
 
     private void scheduleDynamicArgumentsRefreshTaskForCfIfNeeded(CalculatedFieldCtx cfCtx) {
         CalculatedField cf = cfCtx.getCalculatedField();
-        CalculatedFieldConfiguration cfConfig = cf.getConfiguration();
+        if (!(cf.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration cfConfig)) {
+            return;
+        }
         if (!cfConfig.isScheduledUpdateEnabled()) {
             return;
         }

application/src/main/java/org/thingsboard/server/controller/CalculatedFieldController.java

@@ -44,6 +44,7 @@ import org.thingsboard.script.api.tbel.TbelInvokeService;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.EventInfo;
 import org.thingsboard.server.common.data.cf.CalculatedField;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.event.EventType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
@@ -212,7 +213,8 @@ public class CalculatedFieldController extends BaseController {
             @RequestBody JsonNode inputParams) {
         String expression = inputParams.get("expression").asText();
         Map<String, TbelCfArg> arguments = Objects.requireNonNullElse(
-                JacksonUtil.convertValue(inputParams.get("arguments"), new TypeReference<>() {}),
+                JacksonUtil.convertValue(inputParams.get("arguments"), new TypeReference<>() {
+                }),
                 Collections.emptyMap()
         );
 
@@ -278,18 +280,20 @@ public class CalculatedFieldController extends BaseController {
     }
 
     private void checkReferencedEntities(CalculatedFieldConfiguration calculatedFieldConfig) throws ThingsboardException {
-        List<EntityId> referencedEntityIds = calculatedFieldConfig.getReferencedEntities();
+        if (calculatedFieldConfig instanceof ArgumentsBasedCalculatedFieldConfiguration config) {
-        for (EntityId referencedEntityId : referencedEntityIds) {
+            List<EntityId> referencedEntityIds = config.getReferencedEntities();
-            EntityType entityType = referencedEntityId.getEntityType();
+            for (EntityId referencedEntityId : referencedEntityIds) {
-            switch (entityType) {
+                EntityType entityType = referencedEntityId.getEntityType();
-                case TENANT -> {
+                switch (entityType) {
-                    return;
+                    case TENANT -> {
+                        return;
+                    }
+                    case CUSTOMER, ASSET, DEVICE -> checkEntityId(referencedEntityId, Operation.READ);
+                    default ->
+                            throw new IllegalArgumentException("Calculated fields do not support '" + entityType + "' for referenced entities.");
                 }
-                case CUSTOMER, ASSET, DEVICE -> checkEntityId(referencedEntityId, Operation.READ);
-                default -> throw new IllegalArgumentException("Calculated fields do not support '" + entityType + "' for referenced entities.");
             }
         }
-
     }
 
 }

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

@@ -25,7 +25,7 @@ import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Argument;
 import org.thingsboard.server.common.data.cf.configuration.ArgumentType;
-import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.Output;
 import org.thingsboard.server.common.data.cf.configuration.ReferencedEntityKey;
 import org.thingsboard.server.common.data.cf.configuration.SimpleCalculatedFieldConfiguration;
@@ -83,26 +83,29 @@ public class CalculatedFieldCtx {
         this.tenantId = calculatedField.getTenantId();
         this.entityId = calculatedField.getEntityId();
         this.cfType = calculatedField.getType();
-        CalculatedFieldConfiguration configuration = calculatedField.getConfiguration();
+        this.arguments = new HashMap<>();
-        this.arguments = configuration.getArguments();
         this.mainEntityArguments = new HashMap<>();
         this.linkedEntityArguments = new HashMap<>();
-        for (Map.Entry<String, Argument> entry : arguments.entrySet()) {
+        this.argNames = new ArrayList<>();
-            var refId = entry.getValue().getRefEntityId();
+        if (calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration configuration) {
-            var refKey = entry.getValue().getRefEntityKey();
+            this.arguments.putAll(configuration.getArguments());
-            if (refId == null && entry.getValue().hasDynamicSource()) {
+            for (Map.Entry<String, Argument> entry : arguments.entrySet()) {
-                continue;
+                var refId = entry.getValue().getRefEntityId();
-            }
+                var refKey = entry.getValue().getRefEntityKey();
-            if (refId == null || refId.equals(calculatedField.getEntityId())) {
+                if (refId == null && entry.getValue().hasDynamicSource()) {
-                mainEntityArguments.put(refKey, entry.getKey());
+                    continue;
-            } else {
+                }
-                linkedEntityArguments.computeIfAbsent(refId, key -> new HashMap<>()).put(refKey, entry.getKey());
+                if (refId == null || refId.equals(calculatedField.getEntityId())) {
+                    mainEntityArguments.put(refKey, entry.getKey());
+                } else {
+                    linkedEntityArguments.computeIfAbsent(refId, key -> new HashMap<>()).put(refKey, entry.getKey());
+                }
             }
+            this.argNames.addAll(arguments.keySet());
+            this.output = configuration.getOutput();
+            this.expression = configuration.getExpression();
+            this.useLatestTs = CalculatedFieldType.SIMPLE.equals(calculatedField.getType()) && ((SimpleCalculatedFieldConfiguration) configuration).isUseLatestTs();
         }
-        this.argNames = new ArrayList<>(arguments.keySet());
-        this.output = configuration.getOutput();
-        this.expression = configuration.getExpression();
-        this.useLatestTs = CalculatedFieldType.SIMPLE.equals(calculatedField.getType()) && ((SimpleCalculatedFieldConfiguration) configuration).isUseLatestTs();
         this.tbelInvokeService = tbelInvokeService;
         this.relationService = relationService;
 
@@ -316,11 +319,13 @@ public class CalculatedFieldCtx {
     }
 
     public boolean hasSchedulingConfigChanges(CalculatedFieldCtx other) {
-        CalculatedFieldConfiguration thisConfig = calculatedField.getConfiguration();
+        if (calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration thisConfig
-        CalculatedFieldConfiguration otherConfig = other.calculatedField.getConfiguration();
+                && other.calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration otherConfig) {
-        boolean refreshTriggerChanged = thisConfig.isScheduledUpdateEnabled() != otherConfig.isScheduledUpdateEnabled();
+            boolean refreshTriggerChanged = thisConfig.isScheduledUpdateEnabled() != otherConfig.isScheduledUpdateEnabled();
-        boolean refreshIntervalChanged = thisConfig.getScheduledUpdateIntervalSec() != otherConfig.getScheduledUpdateIntervalSec();
+            boolean refreshIntervalChanged = thisConfig.getScheduledUpdateIntervalSec() != otherConfig.getScheduledUpdateIntervalSec();
-        return refreshTriggerChanged || refreshIntervalChanged;
+            return refreshTriggerChanged || refreshIntervalChanged;
+        }
+        return false;
     }
 
     public String getSizeExceedsLimitMessage() {

application/src/main/java/org/thingsboard/server/service/sync/ie/exporting/impl/DefaultEntityExportService.java

@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.ExportableEntity;
 import org.thingsboard.server.common.data.HasVersion;
 import org.thingsboard.server.common.data.cf.CalculatedField;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
@@ -153,11 +154,13 @@ public class DefaultEntityExportService<I extends EntityId, E extends Exportable
         List<CalculatedField> calculatedFields = calculatedFieldService.findCalculatedFieldsByEntityId(ctx.getTenantId(), entityId);
         calculatedFields.forEach(calculatedField -> {
             calculatedField.setEntityId(getExternalIdOrElseInternal(ctx, entityId));
-            calculatedField.getConfiguration().getArguments().values().forEach(argument -> {
+            if (calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration configuration) {
-                if (argument.getRefEntityId() != null) {
+                configuration.getArguments().values().forEach(argument -> {
-                    argument.setRefEntityId(getExternalIdOrElseInternal(ctx, argument.getRefEntityId()));
+                    if (argument.getRefEntityId() != null) {
-                }
+                        argument.setRefEntityId(getExternalIdOrElseInternal(ctx, argument.getRefEntityId()));
-            });
+                    }
+                });
+            }
         });
         return calculatedFields;
     }

application/src/main/java/org/thingsboard/server/service/sync/ie/importing/impl/BaseEntityImportService.java

@@ -35,6 +35,7 @@ import org.thingsboard.server.common.data.HasVersion;
 import org.thingsboard.server.common.data.User;
 import org.thingsboard.server.common.data.audit.ActionType;
 import org.thingsboard.server.common.data.cf.CalculatedField;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
@@ -321,11 +322,13 @@ public abstract class BaseEntityImportService<I extends EntityId, E extends Expo
                 .peek(calculatedField -> {
                     calculatedField.setTenantId(ctx.getTenantId());
                     calculatedField.setEntityId(savedEntity.getId());
-                    calculatedField.getConfiguration().getArguments().values().forEach(argument -> {
+                    if (calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration configuration) {
-                        if (argument.getRefEntityId() != null) {
+                        configuration.getArguments().values().forEach(argument -> {
-                            argument.setRefEntityId(idProvider.getInternalId(argument.getRefEntityId(), ctx.isFinalImportAttempt()));
+                            if (argument.getRefEntityId() != null) {
-                        }
+                                argument.setRefEntityId(idProvider.getInternalId(argument.getRefEntityId(), ctx.isFinalImportAttempt()));
-                    });
+                            }
+                        });
+                    }
                 }).toList();
 
         for (CalculatedField existingField : existing) {

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ArgumentsBasedCalculatedFieldConfiguration.java

@@ -0,0 +1,31 @@
+package org.thingsboard.server.common.data.cf.configuration;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.Map;
+
+public interface ArgumentsBasedCalculatedFieldConfiguration extends CalculatedFieldConfiguration {
+
+    Map<String, Argument> getArguments();
+
+    String getExpression();
+
+    void setExpression(String expression);
+
+    Output getOutput();
+
+    void validate();
+
+    @JsonIgnore
+    default boolean isScheduledUpdateEnabled() {
+        return false;
+    }
+
+    default void setScheduledUpdateIntervalSec(int scheduledUpdateIntervalSec) {
+    }
+
+    default int getScheduledUpdateIntervalSec() {
+        return 0;
+    }
+
+}

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/BaseCalculatedFieldConfiguration.java

@@ -27,7 +27,7 @@ import java.util.Objects;
 import java.util.stream.Collectors;
 
 @Data
-public abstract class BaseCalculatedFieldConfiguration implements CalculatedFieldConfiguration {
+public abstract class BaseCalculatedFieldConfiguration implements ArgumentsBasedCalculatedFieldConfiguration {
 
     protected Map<String, Argument> arguments;
     protected String expression;

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java

@@ -25,8 +25,8 @@ import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 
+import java.util.Collections;
 import java.util.List;
-import java.util.Map;
 
 @JsonTypeInfo(
         use = JsonTypeInfo.Id.NAME,
@@ -44,33 +44,13 @@ public interface CalculatedFieldConfiguration {
     @JsonIgnore
     CalculatedFieldType getType();
 
-    Map<String, Argument> getArguments();
-
-    String getExpression();
-
-    void setExpression(String expression);
-
-    Output getOutput();
-
     @JsonIgnore
-    List<EntityId> getReferencedEntities();
+    default List<EntityId> getReferencedEntities() {
-
+        return Collections.emptyList();
-    List<CalculatedFieldLink> buildCalculatedFieldLinks(TenantId tenantId, EntityId cfEntityId, CalculatedFieldId calculatedFieldId);
+    }
 
     CalculatedFieldLink buildCalculatedFieldLink(TenantId tenantId, EntityId referencedEntityId, CalculatedFieldId calculatedFieldId);
 
-    void validate();
+    List<CalculatedFieldLink> buildCalculatedFieldLinks(TenantId tenantId, EntityId cfEntityId, CalculatedFieldId calculatedFieldId);
-
-    @JsonIgnore
-    default boolean isScheduledUpdateEnabled() {
-        return false;
-    }
-
-    default void setScheduledUpdateIntervalSec(int scheduledUpdateIntervalSec) {
-    }
-
-    default int getScheduledUpdateIntervalSec() {
-        return 0;
-    }
 
 }

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/GeofencingCalculatedFieldConfiguration.java

@@ -27,7 +27,7 @@ import java.util.stream.Collectors;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class GeofencingCalculatedFieldConfiguration extends BaseCalculatedFieldConfiguration implements CalculatedFieldConfiguration {
+public class GeofencingCalculatedFieldConfiguration extends BaseCalculatedFieldConfiguration implements ArgumentsBasedCalculatedFieldConfiguration {
 
     public static final String ENTITY_ID_LATITUDE_ARGUMENT_KEY = "latitude";
     public static final String ENTITY_ID_LONGITUDE_ARGUMENT_KEY = "longitude";

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/ScriptCalculatedFieldConfiguration.java

@@ -21,7 +21,7 @@ import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class ScriptCalculatedFieldConfiguration extends BaseCalculatedFieldConfiguration implements CalculatedFieldConfiguration {
+public class ScriptCalculatedFieldConfiguration extends BaseCalculatedFieldConfiguration implements ArgumentsBasedCalculatedFieldConfiguration {
 
     @Override
     public CalculatedFieldType getType() {

common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/SimpleCalculatedFieldConfiguration.java

@@ -21,7 +21,7 @@ import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 
 @Data
 @EqualsAndHashCode(callSuper = true)
-public class SimpleCalculatedFieldConfiguration extends BaseCalculatedFieldConfiguration implements CalculatedFieldConfiguration {
+public class SimpleCalculatedFieldConfiguration extends BaseCalculatedFieldConfiguration implements ArgumentsBasedCalculatedFieldConfiguration {
 
     private boolean useLatestTs;
 

dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java

@@ -21,6 +21,7 @@ import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
 import org.thingsboard.server.common.data.id.CalculatedFieldLinkId;
@@ -93,14 +94,15 @@ public class BaseCalculatedFieldService extends AbstractEntityService implements
     }
 
     private void updatedSchedulingConfiguration(CalculatedField calculatedField) {
-        CalculatedFieldConfiguration configuration = calculatedField.getConfiguration();
+        if (calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration configuration) {
-        if (!configuration.isScheduledUpdateEnabled()) {
+            if (!configuration.isScheduledUpdateEnabled()) {
-            return;
+                return;
+            }
+            int tenantProfileMinAllowedValue = tbTenantProfileCache.get(calculatedField.getTenantId())
+                    .getDefaultProfileConfiguration()
+                    .getMinAllowedScheduledUpdateIntervalInSecForCF();
+            configuration.setScheduledUpdateIntervalSec(Math.max(configuration.getScheduledUpdateIntervalSec(), tenantProfileMinAllowedValue));
         }
-        int tenantProfileMinAllowedValue = tbTenantProfileCache.get(calculatedField.getTenantId())
-                .getDefaultProfileConfiguration()
-                .getMinAllowedScheduledUpdateIntervalInSecForCF();
-        configuration.setScheduledUpdateIntervalSec(Math.max(configuration.getScheduledUpdateIntervalSec(), tenantProfileMinAllowedValue));
     }
 
     @Override

dao/src/main/java/org/thingsboard/server/dao/service/validator/CalculatedFieldDataValidator.java

@@ -19,7 +19,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
-import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
+import org.thingsboard.server.common.data.cf.configuration.ArgumentsBasedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.tenant.profile.DefaultTenantProfileConfiguration;
@@ -72,23 +72,25 @@ public class CalculatedFieldDataValidator extends DataValidator<CalculatedField>
         }
         if (CalculatedFieldType.GEOFENCING.equals(calculatedField.getType()) && maxArgumentsPerCF < 3) {
             throw new DataValidationException("Geofencing calculated field requires at least 3 arguments, but the system limit is " +
-                                              maxArgumentsPerCF + ". Contact your administrator to increase the limit."
+                    maxArgumentsPerCF + ". Contact your administrator to increase the limit."
             );
         }
-        if (calculatedField.getConfiguration().getArguments().size() > maxArgumentsPerCF) {
+        if (calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration configuration
+                && configuration.getArguments().size() > maxArgumentsPerCF) {
             throw new DataValidationException("Calculated field arguments limit reached!");
         }
     }
 
     private void validateCalculatedFieldConfiguration(CalculatedField calculatedField) {
-        CalculatedFieldConfiguration configuration = calculatedField.getConfiguration();
+        if (calculatedField.getConfiguration() instanceof ArgumentsBasedCalculatedFieldConfiguration configuration) {
-        if (configuration.getArguments().containsKey("ctx")) {
+            if (configuration.getArguments().containsKey("ctx")) {
-            throw new DataValidationException("Argument name 'ctx' is reserved and cannot be used.");
+                throw new DataValidationException("Argument name 'ctx' is reserved and cannot be used.");
-        }
+            }
-        try {
+            try {
-            configuration.validate();
+                configuration.validate();
-        } catch (IllegalArgumentException e) {
+            } catch (IllegalArgumentException e) {
-            throw new DataValidationException(e.getMessage(), e);
+                throw new DataValidationException(e.getMessage(), e);
+            }
         }
     }