Remove redundant persistence of CF links

# Conflicts:
#	application/src/main/data/upgrade/basic/schema_update.sql
#	common/dao-api/src/main/java/org/thingsboard/server/dao/cf/CalculatedFieldService.java
#	common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/BaseCalculatedFieldConfiguration.java
#	common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/CalculatedFieldConfiguration.java
#	common/data/src/main/java/org/thingsboard/server/common/data/cf/configuration/geofencing/GeofencingCalculatedFieldConfiguration.java
#	dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java
#	dao/src/test/java/org/thingsboard/server/dao/service/CalculatedFieldServiceTest.java

application/src/main/data/upgrade/basic/schema_update.sql

@@ -69,3 +69,10 @@ ALTER TABLE calculated_field DROP CONSTRAINT IF EXISTS calculated_field_unq_key;
 ALTER TABLE calculated_field ADD CONSTRAINT calculated_field_unq_key UNIQUE (entity_id, type, name);
 
 -- CALCULATED FIELD UNIQUE CONSTRAINT UPDATE END
+
+-- REMOVAL OF CALCULATED FIELD LINKS PERSISTENCE START
+
+DROP TABLE IF EXISTS calculated_field_link;
+ANALYZE calculated_field;
+
+-- REMOVAL OF CALCULATED FIELD LINKS PERSISTENCE END

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

@@ -611,7 +611,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
         var proto = msg.getProto();
         List<CalculatedFieldEntityCtxId> result = new ArrayList<>();
         for (var link : getCalculatedFieldLinksByEntityId(entityId)) {
-            CalculatedFieldCtx ctx = calculatedFields.get(link.getCalculatedFieldId());
+            CalculatedFieldCtx ctx = calculatedFields.get(link.calculatedFieldId());
             if (ctx.linkMatches(entityId, proto)) {
                 result.add(ctx.toCalculatedFieldEntityCtxId());
             }
@@ -738,13 +738,13 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
 
     private void addLinks(CalculatedField newCf) {
         var newLinks = newCf.getConfiguration().buildCalculatedFieldLinks(tenantId, newCf.getEntityId(), newCf.getId());
-        newLinks.forEach(link -> entityIdCalculatedFieldLinks.computeIfAbsent(link.getEntityId(), id -> new CopyOnWriteArrayList<>()).add(link));
+        newLinks.forEach(link -> entityIdCalculatedFieldLinks.computeIfAbsent(link.entityId(), id -> new CopyOnWriteArrayList<>()).add(link));
     }
 
     private void deleteLinks(CalculatedFieldCtx cfCtx) {
         var oldCf = cfCtx.getCalculatedField();
         var oldLinks = oldCf.getConfiguration().buildCalculatedFieldLinks(tenantId, oldCf.getEntityId(), oldCf.getId());
-        oldLinks.forEach(link -> entityIdCalculatedFieldLinks.computeIfAbsent(link.getEntityId(), id -> new CopyOnWriteArrayList<>()).remove(link));
+        oldLinks.forEach(link -> entityIdCalculatedFieldLinks.computeIfAbsent(link.entityId(), id -> new CopyOnWriteArrayList<>()).remove(link));
     }
 
     public void onPartitionChange(CalculatedFieldPartitionChangeMsg msg) {
@@ -757,15 +757,11 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
             log.trace("Processing calculated field record: {}", cf);
             try {
                 initCalculatedField(cf);
+                initCalculatedFieldLinks(cf);
             } catch (CalculatedFieldException e) {
                 log.error("Failed to process calculated field record: {}", cf, e);
             }
         });
-        PageDataIterable<CalculatedFieldLink> cfls = new PageDataIterable<>(pageLink -> cfDaoService.findAllCalculatedFieldLinksByTenantId(tenantId, pageLink), cfSettings.getInitTenantFetchPackSize());
-        cfls.forEach(link -> {
-            log.trace("Processing calculated field link record: {}", link);
-            initCalculatedFieldLink(link);
-        });
     }
 
     private void initCalculatedField(CalculatedField cf) throws CalculatedFieldException {
@@ -782,10 +778,13 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
         }
     }
 
-    private void initCalculatedFieldLink(CalculatedFieldLink link) {
+    private void initCalculatedFieldLinks(CalculatedField cf) {
-        // We use copy on write lists to safely pass the reference to another actor for the iteration.
+        List<CalculatedFieldLink> links = cf.getConfiguration().buildCalculatedFieldLinks(cf.getTenantId(), cf.getEntityId(), cf.getId());
-        // Alternative approach would be to use any list but avoid modifications to the list (change the complete map value instead)
+        for (CalculatedFieldLink link : links) {
-        entityIdCalculatedFieldLinks.computeIfAbsent(link.getEntityId(), id -> new CopyOnWriteArrayList<>()).add(link);
+            // We use copy on write lists to safely pass the reference to another actor for the iteration.
+            // Alternative approach would be to use any list but avoid modifications to the list (change the complete map value instead)
+            entityIdCalculatedFieldLinks.computeIfAbsent(link.entityId(), id -> new CopyOnWriteArrayList<>()).add(link);
+        }
     }
 
     private void initEntitiesCache() {

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

@@ -63,10 +63,10 @@ import org.thingsboard.server.service.security.permission.Operation;
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
 import static org.thingsboard.server.controller.ControllerConstants.CF_TEXT_SEARCH_DESCRIPTION;
@@ -287,7 +287,7 @@ public class CalculatedFieldController extends BaseController {
     }
 
     private void checkReferencedEntities(CalculatedFieldConfiguration calculatedFieldConfig) throws ThingsboardException {
-        List<EntityId> referencedEntityIds = calculatedFieldConfig.getReferencedEntities();
+        Set<EntityId> referencedEntityIds = calculatedFieldConfig.getReferencedEntities();
         for (EntityId referencedEntityId : referencedEntityIds) {
             EntityType entityType = referencedEntityId.getEntityType();
             switch (entityType) {

application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCache.java

@@ -82,19 +82,17 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
         cfs.forEach(cf -> {
             if (cf != null) {
                 calculatedFields.putIfAbsent(cf.getId(), cf);
+                List<CalculatedFieldLink> links = cf.getConfiguration().buildCalculatedFieldLinks(cf.getTenantId(), cf.getEntityId(), cf.getId());
+                calculatedFieldLinks.put(cf.getId(), new CopyOnWriteArrayList<>(links));
             }
         });
         calculatedFields.values().forEach(cf -> {
             entityIdCalculatedFields.computeIfAbsent(cf.getEntityId(), id -> new CopyOnWriteArrayList<>()).add(cf);
         });
-        PageDataIterable<CalculatedFieldLink> cfls = new PageDataIterable<>(calculatedFieldService::findAllCalculatedFieldLinks, initFetchPackSize);
-        cfls.forEach(link -> {
-            calculatedFieldLinks.computeIfAbsent(link.getCalculatedFieldId(), id -> new CopyOnWriteArrayList<>()).add(link);
-        });
         calculatedFieldLinks.values().stream()
                 .flatMap(List::stream)
                 .forEach(link ->
-                        entityIdCalculatedFieldLinks.computeIfAbsent(link.getEntityId(), id -> new CopyOnWriteArrayList<>()).add(link)
+                        entityIdCalculatedFieldLinks.computeIfAbsent(link.entityId(), id -> new CopyOnWriteArrayList<>()).add(link)
                 );
     }
 
@@ -226,7 +224,7 @@ public class DefaultCalculatedFieldCache implements CalculatedFieldCache {
         log.debug("[{}] evict calculated field links from cache: {}", calculatedFieldId, oldCalculatedField);
         calculatedFieldsCtx.remove(calculatedFieldId);
         log.debug("[{}] evict calculated field ctx from cache: {}", calculatedFieldId, oldCalculatedField);
-        entityIdCalculatedFieldLinks.forEach((entityId, calculatedFieldLinks) -> calculatedFieldLinks.removeIf(link -> link.getCalculatedFieldId().equals(calculatedFieldId)));
+        entityIdCalculatedFieldLinks.forEach((entityId, calculatedFieldLinks) -> calculatedFieldLinks.removeIf(link -> link.calculatedFieldId().equals(calculatedFieldId)));
         log.debug("[{}] evict calculated field links from cached links by entity id: {}", calculatedFieldId, oldCalculatedField);
     }
 

application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldQueueService.java

@@ -172,7 +172,7 @@ public class DefaultCalculatedFieldQueueService implements CalculatedFieldQueueS
 
         List<CalculatedFieldLink> links = calculatedFieldCache.getCalculatedFieldLinksByEntityId(entityId);
         for (CalculatedFieldLink link : links) {
-            CalculatedFieldCtx ctx = calculatedFieldCache.getCalculatedFieldCtx(link.getCalculatedFieldId());
+            CalculatedFieldCtx ctx = calculatedFieldCache.getCalculatedFieldCtx(link.calculatedFieldId());
             if (ctx != null && linkedEntityFilter.test(ctx)) {
                 return true;
             }

common/dao-api/src/main/java/org/thingsboard/server/dao/cf/CalculatedFieldService.java

@@ -16,10 +16,8 @@
 package org.thingsboard.server.dao.cf;
 
 import org.thingsboard.server.common.data.cf.CalculatedField;
-import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
-import org.thingsboard.server.common.data.id.CalculatedFieldLinkId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
@@ -52,18 +50,6 @@ public interface CalculatedFieldService extends EntityDaoService {
 
     int deleteAllCalculatedFieldsByEntityId(TenantId tenantId, EntityId entityId);
 
-    CalculatedFieldLink saveCalculatedFieldLink(TenantId tenantId, CalculatedFieldLink calculatedFieldLink);
-
-    CalculatedFieldLink findCalculatedFieldLinkById(TenantId tenantId, CalculatedFieldLinkId calculatedFieldLinkId);
-
-    List<CalculatedFieldLink> findAllCalculatedFieldLinksById(TenantId tenantId, CalculatedFieldId calculatedFieldId);
-
-    List<CalculatedFieldLink> findAllCalculatedFieldLinksByEntityId(TenantId tenantId, EntityId entityId);
-
-    PageData<CalculatedFieldLink> findAllCalculatedFieldLinksByTenantId(TenantId tenantId, PageLink pageLink);
-
-    PageData<CalculatedFieldLink> findAllCalculatedFieldLinks(PageLink pageLink);
-
     boolean referencedInAnyCalculatedField(TenantId tenantId, EntityId referencedEntityId);
 
 }

common/data/src/main/java/org/thingsboard/server/common/data/EntityType.java

@@ -23,6 +23,7 @@ import java.util.EnumSet;
 import java.util.List;
 
 public enum EntityType {
+
     TENANT(1),
     CUSTOMER(2),
     USER(3, "tb_user"),
@@ -61,7 +62,7 @@ public enum EntityType {
     MOBILE_APP(37),
     MOBILE_APP_BUNDLE(38),
     CALCULATED_FIELD(39),
-    CALCULATED_FIELD_LINK(40),
+    // CALCULATED_FIELD_LINK(40), - was removed in 4.3
     JOB(41),
     ADMIN_SETTINGS(42),
     AI_MODEL(43, "ai_model") {

common/data/src/main/java/org/thingsboard/server/common/data/cf/CalculatedFieldLink.java

@@ -15,52 +15,8 @@
  */
 package org.thingsboard.server.common.data.cf;
 
-import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.BaseData;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
-import org.thingsboard.server.common.data.id.CalculatedFieldLinkId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.TenantId;
 
-@Schema
+public record CalculatedFieldLink(TenantId tenantId, EntityId entityId, CalculatedFieldId calculatedFieldId) {}
-@Data
-@EqualsAndHashCode(callSuper = true)
-public class CalculatedFieldLink extends BaseData<CalculatedFieldLinkId> {
-
-    private static final long serialVersionUID = 6492846246722091530L;
-
-    private TenantId tenantId;
-    private EntityId entityId;
-
-    @Schema(description = "JSON object with the Calculated Field Id. ", accessMode = Schema.AccessMode.READ_ONLY)
-    private CalculatedFieldId calculatedFieldId;
-
-    public CalculatedFieldLink() {
-        super();
-    }
-
-    public CalculatedFieldLink(CalculatedFieldLinkId id) {
-        super(id);
-    }
-
-    public CalculatedFieldLink(TenantId tenantId, EntityId entityId, CalculatedFieldId calculatedFieldId) {
-        this.tenantId = tenantId;
-        this.entityId = entityId;
-        this.calculatedFieldId = calculatedFieldId;
-    }
-
-    @Override
-    public String toString() {
-        return new StringBuilder()
-                .append("CalculatedFieldLink[")
-                .append("tenantId=").append(tenantId)
-                .append(", entityId=").append(entityId)
-                .append(", calculatedFieldId=").append(calculatedFieldId)
-                .append(", createdTime=").append(createdTime)
-                .append(", id=").append(id).append(']')
-                .toString();
-    }
-
-}

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

@@ -19,10 +19,12 @@ import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotEmpty;
 import org.thingsboard.server.common.data.id.EntityId;
 
-import java.util.List;
+import java.util.Collections;
 import java.util.Map;
 import java.util.Objects;
-import java.util.stream.Collectors;
+import java.util.Set;
+
+import static java.util.stream.Collectors.toSet;
 
 public interface ArgumentsBasedCalculatedFieldConfiguration extends CalculatedFieldConfiguration {
 
@@ -30,14 +32,15 @@ public interface ArgumentsBasedCalculatedFieldConfiguration extends CalculatedFi
     @NotEmpty
     Map<String, Argument> getArguments();
 
-    default List<EntityId> getReferencedEntities() {
+    default Set<EntityId> getReferencedEntities() {
-        if (getArguments() == null) {
+        var args = getArguments();
-            return List.of();
+        if (args == null) {
+            return Collections.emptySet();
         }
-        return getArguments().values().stream()
+        return args.values().stream()
                 .map(Argument::getRefEntityId)
                 .filter(Objects::nonNull)
-                .collect(Collectors.toList());
+                .collect(toSet());
     }
 
 }

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

@@ -28,7 +28,9 @@ 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.Set;
 import java.util.stream.Collectors;
 
 @JsonTypeInfo(
@@ -55,16 +57,12 @@ public interface CalculatedFieldConfiguration {
     default void validate() {}
 
     @JsonIgnore
-    default List<EntityId> getReferencedEntities() {
+    default Set<EntityId> getReferencedEntities() {
-        return List.of();
+        return Collections.emptySet();
     }
 
     default CalculatedFieldLink buildCalculatedFieldLink(TenantId tenantId, EntityId referencedEntityId, CalculatedFieldId calculatedFieldId) {
-        CalculatedFieldLink link = new CalculatedFieldLink();
+        return new CalculatedFieldLink(tenantId, referencedEntityId, calculatedFieldId);
-        link.setTenantId(tenantId);
-        link.setEntityId(referencedEntityId);
-        link.setCalculatedFieldId(calculatedFieldId);
-        return link;
     }
 
     default List<CalculatedFieldLink> buildCalculatedFieldLinks(TenantId tenantId, EntityId cfEntityId, CalculatedFieldId calculatedFieldId) {

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

@@ -26,10 +26,13 @@ import org.thingsboard.server.common.data.cf.configuration.Output;
 import org.thingsboard.server.common.data.cf.configuration.ScheduledUpdateSupportedCalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.id.EntityId;
 
+import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.Set;
+
+import static java.util.stream.Collectors.toSet;
 
 @Data
 public class GeofencingCalculatedFieldConfiguration implements ArgumentsBasedCalculatedFieldConfiguration, ScheduledUpdateSupportedCalculatedFieldConfiguration {
@@ -62,8 +65,11 @@ public class GeofencingCalculatedFieldConfiguration implements ArgumentsBasedCal
 
 
     @Override
-    public List<EntityId> getReferencedEntities() {
+    public Set<EntityId> getReferencedEntities() {
-        return zoneGroups == null ? List.of() : zoneGroups.values().stream().map(ZoneGroupConfiguration::getRefEntityId).filter(Objects::nonNull).toList();
+        return zoneGroups == null ? Collections.emptySet() : zoneGroups.values().stream()
+                .map(ZoneGroupConfiguration::getRefEntityId)
+                .filter(Objects::nonNull)
+                .collect(toSet());
     }
 
     @Override

common/data/src/main/java/org/thingsboard/server/common/data/id/CalculatedFieldLinkId.java

@@ -1,45 +0,0 @@
-/**
- * Copyright © 2016-2025 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.common.data.id;
-
-import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
-import io.swagger.v3.oas.annotations.media.Schema;
-import org.thingsboard.server.common.data.EntityType;
-
-import java.util.UUID;
-
-@Schema
-public class CalculatedFieldLinkId extends UUIDBased implements EntityId {
-
-    private static final long serialVersionUID = 1L;
-
-    @JsonCreator
-    public CalculatedFieldLinkId(@JsonProperty("id") UUID id) {
-        super(id);
-    }
-
-    public static CalculatedFieldLinkId fromString(String calculatedFieldLinkId) {
-        return new CalculatedFieldLinkId(UUID.fromString(calculatedFieldLinkId));
-    }
-
-    @Schema(requiredMode = Schema.RequiredMode.REQUIRED, description = "string", example = "CALCULATED_FIELD_LINK", allowableValues = "CALCULATED_FIELD_LINK")
-    @Override
-    public EntityType getEntityType() {
-        return EntityType.CALCULATED_FIELD_LINK;
-    }
-
-}

common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java

@@ -80,7 +80,6 @@ public class EntityIdFactory {
             case DOMAIN -> new DomainId(uuid);
             case MOBILE_APP_BUNDLE -> new MobileAppBundleId(uuid);
             case CALCULATED_FIELD -> new CalculatedFieldId(uuid);
-            case CALCULATED_FIELD_LINK -> new CalculatedFieldLinkId(uuid);
             case JOB -> new JobId(uuid);
             case ADMIN_SETTINGS -> new AdminSettingsId(uuid);
             case AI_MODEL -> new AiModelId(uuid);

common/proto/src/main/proto/queue.proto

@@ -62,7 +62,7 @@ enum EntityTypeProto {
   MOBILE_APP            = 37;
   MOBILE_APP_BUNDLE     = 38;
   CALCULATED_FIELD      = 39;
-  CALCULATED_FIELD_LINK = 40;
+  // CALCULATED_FIELD_LINK = 40; - was removed in 4.3
   JOB                   = 41;
   ADMIN_SETTINGS        = 42;
   AI_MODEL              = 43;

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

@@ -21,11 +21,9 @@ import lombok.extern.slf4j.Slf4j;
 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.CalculatedFieldType;
 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;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.HasId;
 import org.thingsboard.server.common.data.id.TenantId;
@@ -36,7 +34,6 @@ import org.thingsboard.server.dao.eventsourcing.DeleteEntityEvent;
 import org.thingsboard.server.dao.eventsourcing.SaveEntityEvent;
 import org.thingsboard.server.dao.exception.IncorrectParameterException;
 import org.thingsboard.server.dao.service.validator.CalculatedFieldDataValidator;
-import org.thingsboard.server.dao.service.validator.CalculatedFieldLinkDataValidator;
 
 import java.util.EnumSet;
 import java.util.List;
@@ -57,9 +54,7 @@ public class BaseCalculatedFieldService extends AbstractEntityService implements
     public static final String INCORRECT_ENTITY_ID = "Incorrect entityId ";
 
     private final CalculatedFieldDao calculatedFieldDao;
-    private final CalculatedFieldLinkDao calculatedFieldLinkDao;
     private final CalculatedFieldDataValidator calculatedFieldDataValidator;
-    private final CalculatedFieldLinkDataValidator calculatedFieldLinkDataValidator;
 
     @Override
     public CalculatedField save(CalculatedField calculatedField) {
@@ -84,9 +79,13 @@ public class BaseCalculatedFieldService extends AbstractEntityService implements
             log.trace("Executing save calculated field, [{}]", calculatedField);
             updateDebugSettings(tenantId, calculatedField, System.currentTimeMillis());
             CalculatedField savedCalculatedField = calculatedFieldDao.save(tenantId, calculatedField);
-            createOrUpdateCalculatedFieldLink(tenantId, savedCalculatedField);
+            eventPublisher.publishEvent(SaveEntityEvent.builder()
-            eventPublisher.publishEvent(SaveEntityEvent.builder().tenantId(savedCalculatedField.getTenantId()).entityId(savedCalculatedField.getId())
+                    .tenantId(savedCalculatedField.getTenantId())
-                    .entity(savedCalculatedField).oldEntity(oldCalculatedField).created(calculatedField.getId() == null).build());
+                    .entityId(savedCalculatedField.getId())
+                    .entity(savedCalculatedField)
+                    .oldEntity(oldCalculatedField)
+                    .created(calculatedField.getId() == null)
+                    .build());
             return savedCalculatedField;
         } catch (Exception e) {
             checkConstraintViolation(e,
@@ -191,48 +190,6 @@ public class BaseCalculatedFieldService extends AbstractEntityService implements
         return calculatedFields.size();
     }
 
-    @Override
-    public CalculatedFieldLink saveCalculatedFieldLink(TenantId tenantId, CalculatedFieldLink calculatedFieldLink) {
-        calculatedFieldLinkDataValidator.validate(calculatedFieldLink, CalculatedFieldLink::getTenantId);
-        log.trace("Executing save calculated field link, [{}]", calculatedFieldLink);
-        return calculatedFieldLinkDao.save(tenantId, calculatedFieldLink);
-    }
-
-    @Override
-    public CalculatedFieldLink findCalculatedFieldLinkById(TenantId tenantId, CalculatedFieldLinkId calculatedFieldLinkId) {
-        log.trace("Executing findCalculatedFieldLinkById, tenantId [{}], calculatedFieldLinkId [{}]", tenantId, calculatedFieldLinkId);
-        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
-        validateId(calculatedFieldLinkId, id -> "Incorrect calculatedFieldLinkId " + id);
-        return calculatedFieldLinkDao.findById(tenantId, calculatedFieldLinkId.getId());
-    }
-
-    @Override
-    public List<CalculatedFieldLink> findAllCalculatedFieldLinksById(TenantId tenantId, CalculatedFieldId calculatedFieldId) {
-        log.trace("Executing findAllCalculatedFieldLinksById, calculatedFieldId [{}]", calculatedFieldId);
-        return calculatedFieldLinkDao.findCalculatedFieldLinksByCalculatedFieldId(tenantId, calculatedFieldId);
-    }
-
-    @Override
-    public List<CalculatedFieldLink> findAllCalculatedFieldLinksByEntityId(TenantId tenantId, EntityId entityId) {
-        log.trace("Executing findAllCalculatedFieldLinksByEntityId, entityId [{}]", entityId);
-        return calculatedFieldLinkDao.findCalculatedFieldLinksByEntityId(tenantId, entityId);
-    }
-
-    @Override
-    public PageData<CalculatedFieldLink> findAllCalculatedFieldLinksByTenantId(TenantId tenantId, PageLink pageLink) {
-        log.trace("Executing findAllCalculatedFieldLinksByTenantId, tenantId[{}] pageLink [{}]", tenantId, pageLink);
-        validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
-        validatePageLink(pageLink);
-        return calculatedFieldLinkDao.findAllByTenantId(tenantId, pageLink);
-    }
-
-    @Override
-    public PageData<CalculatedFieldLink> findAllCalculatedFieldLinks(PageLink pageLink) {
-        log.trace("Executing findAllCalculatedFieldLinks, pageLink [{}]", pageLink);
-        validatePageLink(pageLink);
-        return calculatedFieldLinkDao.findAll(pageLink);
-    }
-
     @Override
     public boolean referencedInAnyCalculatedField(TenantId tenantId, EntityId referencedEntityId) {
         return calculatedFieldDao.findAllByTenantId(tenantId).stream()
@@ -258,9 +215,4 @@ public class BaseCalculatedFieldService extends AbstractEntityService implements
         return EntityType.CALCULATED_FIELD;
     }
 
-    private void createOrUpdateCalculatedFieldLink(TenantId tenantId, CalculatedField calculatedField) {
-        List<CalculatedFieldLink> links = calculatedField.getConfiguration().buildCalculatedFieldLinks(tenantId, calculatedField.getEntityId(), calculatedField.getId());
-        links.forEach(link -> saveCalculatedFieldLink(tenantId, link));
-    }
-
 }

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

@@ -1,42 +0,0 @@
-/**
- * Copyright © 2016-2025 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.cf;
-
-import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
-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 org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.dao.Dao;
-
-import java.util.List;
-
-public interface CalculatedFieldLinkDao extends Dao<CalculatedFieldLink> {
-
-    List<CalculatedFieldLink> findCalculatedFieldLinksByCalculatedFieldId(TenantId tenantId, CalculatedFieldId calculatedFieldId);
-
-    List<CalculatedFieldLink> findCalculatedFieldLinksByEntityId(TenantId tenantId, EntityId entityId);
-
-    List<CalculatedFieldLink> findCalculatedFieldLinksByTenantId(TenantId tenantId);
-
-    List<CalculatedFieldLink> findAll();
-
-    PageData<CalculatedFieldLink> findAll(PageLink pageLink);
-
-    PageData<CalculatedFieldLink> findAllByTenantId(TenantId tenantId, PageLink pageLink);
-
-}

dao/src/main/java/org/thingsboard/server/dao/entity/DefaultEntityServiceRegistry.java

@@ -43,9 +43,6 @@ public class DefaultEntityServiceRegistry implements EntityServiceRegistry {
             if (EntityType.RULE_CHAIN.equals(entityType)) {
                 entityDaoServicesMap.put(EntityType.RULE_NODE, entityDaoService);
             }
-            if (EntityType.CALCULATED_FIELD.equals(entityType)) {
-                entityDaoServicesMap.put(EntityType.CALCULATED_FIELD_LINK, entityDaoService);
-            }
         });
         log.debug("Initialized EntityServiceRegistry total [{}] entries", entityDaoServicesMap.size());
     }

dao/src/main/java/org/thingsboard/server/dao/model/ModelConstants.java

@@ -26,8 +26,7 @@ import java.util.UUID;
 
 public class ModelConstants {
 
-    private ModelConstants() {
+    private ModelConstants() {}
-    }
 
     public static final UUID NULL_UUID = Uuids.startOf(0);
     public static final TenantId SYSTEM_TENANT = TenantId.fromUUID(ModelConstants.NULL_UUID);
@@ -731,15 +730,6 @@ public class ModelConstants {
     public static final String CALCULATED_FIELD_CONFIGURATION = "configuration";
     public static final String CALCULATED_FIELD_VERSION = "version";
 
-    /**
-     * Calculated field links constants.
-     */
-    public static final String CALCULATED_FIELD_LINK_TABLE_NAME = "calculated_field_link";
-    public static final String CALCULATED_FIELD_LINK_TENANT_ID_COLUMN = TENANT_ID_COLUMN;
-    public static final String CALCULATED_FIELD_LINK_ENTITY_TYPE = ENTITY_TYPE_COLUMN;
-    public static final String CALCULATED_FIELD_LINK_ENTITY_ID = ENTITY_ID_COLUMN;
-    public static final String CALCULATED_FIELD_LINK_CALCULATED_FIELD_ID = "calculated_field_id";
-
     /**
      * Tasks constants.
      */

dao/src/main/java/org/thingsboard/server/dao/model/sql/CalculatedFieldLinkEntity.java

@@ -1,79 +0,0 @@
-/**
- * Copyright © 2016-2025 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.model.sql;
-
-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
-import org.thingsboard.server.common.data.id.CalculatedFieldId;
-import org.thingsboard.server.common.data.id.CalculatedFieldLinkId;
-import org.thingsboard.server.common.data.id.EntityIdFactory;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.model.BaseEntity;
-import org.thingsboard.server.dao.model.BaseSqlEntity;
-
-import java.util.UUID;
-
-import static org.thingsboard.server.dao.model.ModelConstants.CALCULATED_FIELD_LINK_CALCULATED_FIELD_ID;
-import static org.thingsboard.server.dao.model.ModelConstants.CALCULATED_FIELD_LINK_ENTITY_ID;
-import static org.thingsboard.server.dao.model.ModelConstants.CALCULATED_FIELD_LINK_ENTITY_TYPE;
-import static org.thingsboard.server.dao.model.ModelConstants.CALCULATED_FIELD_LINK_TABLE_NAME;
-import static org.thingsboard.server.dao.model.ModelConstants.CALCULATED_FIELD_LINK_TENANT_ID_COLUMN;
-
-@Data
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Table(name = CALCULATED_FIELD_LINK_TABLE_NAME)
-public class CalculatedFieldLinkEntity extends BaseSqlEntity<CalculatedFieldLink> implements BaseEntity<CalculatedFieldLink> {
-
-    @Column(name = CALCULATED_FIELD_LINK_TENANT_ID_COLUMN)
-    private UUID tenantId;
-
-    @Column(name = CALCULATED_FIELD_LINK_ENTITY_TYPE)
-    private String entityType;
-
-    @Column(name = CALCULATED_FIELD_LINK_ENTITY_ID)
-    private UUID entityId;
-
-    @Column(name = CALCULATED_FIELD_LINK_CALCULATED_FIELD_ID)
-    private UUID calculatedFieldId;
-
-    public CalculatedFieldLinkEntity() {
-        super();
-    }
-
-    public CalculatedFieldLinkEntity(CalculatedFieldLink calculatedFieldLink) {
-        super(calculatedFieldLink);
-        this.tenantId = calculatedFieldLink.getTenantId().getId();
-        this.entityType = calculatedFieldLink.getEntityId().getEntityType().name();
-        this.entityId = calculatedFieldLink.getEntityId().getId();
-        this.calculatedFieldId = calculatedFieldLink.getCalculatedFieldId().getId();
-    }
-
-    @Override
-    public CalculatedFieldLink toData() {
-        CalculatedFieldLink calculatedFieldLink = new CalculatedFieldLink(new CalculatedFieldLinkId(id));
-        calculatedFieldLink.setCreatedTime(createdTime);
-        calculatedFieldLink.setTenantId(TenantId.fromUUID(tenantId));
-        calculatedFieldLink.setEntityId(EntityIdFactory.getByTypeAndUuid(entityType, entityId));
-        calculatedFieldLink.setCalculatedFieldId(new CalculatedFieldId(calculatedFieldId));
-        return calculatedFieldLink;
-    }
-
-}

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

@@ -1,41 +0,0 @@
-/**
- * Copyright © 2016-2025 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.service.validator;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.cf.CalculatedFieldLinkDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
-import org.thingsboard.server.dao.service.DataValidator;
-
-@Component
-public class CalculatedFieldLinkDataValidator extends DataValidator<CalculatedFieldLink> {
-
-    @Autowired
-    private CalculatedFieldLinkDao calculatedFieldLinkDao;
-
-    @Override
-    protected CalculatedFieldLink validateUpdate(TenantId tenantId, CalculatedFieldLink calculatedFieldLink) {
-        CalculatedFieldLink old = calculatedFieldLinkDao.findById(calculatedFieldLink.getTenantId(), calculatedFieldLink.getId().getId());
-        if (old == null) {
-            throw new DataValidationException("Can't update non existing calculated field link!");
-        }
-        return old;
-    }
-
-}

dao/src/main/java/org/thingsboard/server/dao/sql/cf/CalculatedFieldLinkRepository.java

@@ -1,36 +0,0 @@
-/**
- * Copyright © 2016-2025 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.sql.cf;
-
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.thingsboard.server.dao.model.sql.CalculatedFieldLinkEntity;
-
-import java.util.List;
-import java.util.UUID;
-
-public interface CalculatedFieldLinkRepository extends JpaRepository<CalculatedFieldLinkEntity, UUID> {
-
-    List<CalculatedFieldLinkEntity> findAllByTenantIdAndCalculatedFieldId(UUID tenantId, UUID calculatedFieldId);
-
-    List<CalculatedFieldLinkEntity> findAllByTenantIdAndEntityId(UUID tenantId, UUID entityId);
-
-    List<CalculatedFieldLinkEntity> findAllByTenantId(UUID tenantId);
-
-    Page<CalculatedFieldLinkEntity> findAllByTenantId(UUID tenantId, Pageable pageable);
-
-}

dao/src/main/java/org/thingsboard/server/dao/sql/cf/DefaultNativeCalculatedFieldRepository.java

@@ -25,12 +25,10 @@ import org.springframework.transaction.support.TransactionTemplate;
 import org.thingsboard.common.util.JacksonUtil;
 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.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.CalculatedFieldConfiguration;
 import org.thingsboard.server.common.data.debug.DebugSettings;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
-import org.thingsboard.server.common.data.id.CalculatedFieldLinkId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.page.PageData;
@@ -49,9 +47,6 @@ public class DefaultNativeCalculatedFieldRepository implements NativeCalculatedF
     private final String CF_COUNT_QUERY = "SELECT count(id) FROM calculated_field;";
     private final String CF_QUERY = "SELECT * FROM calculated_field ORDER BY created_time ASC LIMIT %s OFFSET %s";
 
-    private final String CFL_COUNT_QUERY = "SELECT count(id) FROM calculated_field_link;";
-    private final String CFL_QUERY = "SELECT * FROM calculated_field_link ORDER BY created_time ASC LIMIT %s OFFSET %s";
-
     private final NamedParameterJdbcTemplate jdbcTemplate;
     private final TransactionTemplate transactionTemplate;
 
@@ -103,37 +98,4 @@ public class DefaultNativeCalculatedFieldRepository implements NativeCalculatedF
         });
     }
 
-    @Override
-    public PageData<CalculatedFieldLink> findCalculatedFieldLinks(Pageable pageable) {
-        return transactionTemplate.execute(status -> {
-            long startTs = System.currentTimeMillis();
-            int totalElements = jdbcTemplate.queryForObject(CFL_COUNT_QUERY, Collections.emptyMap(), Integer.class);
-            log.debug("Count query took {} ms", System.currentTimeMillis() - startTs);
-            startTs = System.currentTimeMillis();
-            List<Map<String, Object>> rows = jdbcTemplate.queryForList(String.format(CFL_QUERY, pageable.getPageSize(), pageable.getOffset()), Collections.emptyMap());
-            log.debug("Main query took {} ms", System.currentTimeMillis() - startTs);
-            int totalPages = pageable.getPageSize() > 0 ? (int) Math.ceil((float) totalElements / pageable.getPageSize()) : 1;
-            boolean hasNext = pageable.getPageSize() > 0 && totalElements > pageable.getOffset() + rows.size();
-            var data = rows.stream().map(row -> {
-
-                UUID id = (UUID) row.get("id");
-                long createdTime = (long) row.get("created_time");
-                UUID tenantId = (UUID) row.get("tenant_id");
-                EntityType entityType = EntityType.valueOf((String) row.get("entity_type"));
-                UUID entityId = (UUID) row.get("entity_id");
-                UUID calculatedFieldId = (UUID) row.get("calculated_field_id");
-
-                CalculatedFieldLink calculatedFieldLink = new CalculatedFieldLink();
-                calculatedFieldLink.setId(new CalculatedFieldLinkId(id));
-                calculatedFieldLink.setCreatedTime(createdTime);
-                calculatedFieldLink.setTenantId(new TenantId(tenantId));
-                calculatedFieldLink.setEntityId(EntityIdFactory.getByTypeAndUuid(entityType, entityId));
-                calculatedFieldLink.setCalculatedFieldId(new CalculatedFieldId(calculatedFieldId));
-
-                return calculatedFieldLink;
-            }).collect(Collectors.toList());
-            return new PageData<>(data, totalPages, totalElements, hasNext);
-        });
-    }
-
 }

dao/src/main/java/org/thingsboard/server/dao/sql/cf/JpaCalculatedFieldLinkDao.java

@@ -1,94 +0,0 @@
-/**
- * Copyright © 2016-2025 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.sql.cf;
-
-import lombok.AllArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Component;
-import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
-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 org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.page.PageLink;
-import org.thingsboard.server.dao.DaoUtil;
-import org.thingsboard.server.dao.cf.CalculatedFieldLinkDao;
-import org.thingsboard.server.dao.model.sql.CalculatedFieldLinkEntity;
-import org.thingsboard.server.dao.sql.JpaAbstractDao;
-import org.thingsboard.server.dao.util.SqlDao;
-
-import java.util.List;
-import java.util.UUID;
-
-@Slf4j
-@Component
-@AllArgsConstructor
-@SqlDao
-public class JpaCalculatedFieldLinkDao extends JpaAbstractDao<CalculatedFieldLinkEntity, CalculatedFieldLink> implements CalculatedFieldLinkDao {
-
-    private final CalculatedFieldLinkRepository calculatedFieldLinkRepository;
-    private final NativeCalculatedFieldRepository nativeCalculatedFieldRepository;
-
-    @Override
-    public List<CalculatedFieldLink> findCalculatedFieldLinksByCalculatedFieldId(TenantId tenantId, CalculatedFieldId calculatedFieldId) {
-        return DaoUtil.convertDataList(calculatedFieldLinkRepository.findAllByTenantIdAndCalculatedFieldId(tenantId.getId(), calculatedFieldId.getId()));
-    }
-
-    @Override
-    public List<CalculatedFieldLink> findCalculatedFieldLinksByEntityId(TenantId tenantId, EntityId entityId) {
-        return DaoUtil.convertDataList(calculatedFieldLinkRepository.findAllByTenantIdAndEntityId(tenantId.getId(), entityId.getId()));
-    }
-
-    @Override
-    public List<CalculatedFieldLink> findCalculatedFieldLinksByTenantId(TenantId tenantId) {
-        return DaoUtil.convertDataList(calculatedFieldLinkRepository.findAllByTenantId(tenantId.getId()));
-    }
-
-    @Override
-    public List<CalculatedFieldLink> findAll() {
-        return DaoUtil.convertDataList(calculatedFieldLinkRepository.findAll());
-    }
-
-    @Override
-    public PageData<CalculatedFieldLink> findAll(PageLink pageLink) {
-        log.debug("Try to find calculated field links by pageLink [{}]", pageLink);
-        return nativeCalculatedFieldRepository.findCalculatedFieldLinks(DaoUtil.toPageable(pageLink));
-    }
-
-    @Override
-    public PageData<CalculatedFieldLink> findAllByTenantId(TenantId tenantId, PageLink pageLink) {
-        log.debug("Try to find calculated field links by tenantId [{}], pageLink [{}]", tenantId, pageLink);
-        return DaoUtil.toPageData(calculatedFieldLinkRepository.findAllByTenantId(tenantId.getId(), DaoUtil.toPageable(pageLink)));
-    }
-
-    @Override
-    protected Class<CalculatedFieldLinkEntity> getEntityClass() {
-        return CalculatedFieldLinkEntity.class;
-    }
-
-    @Override
-    protected JpaRepository<CalculatedFieldLinkEntity, UUID> getRepository() {
-        return calculatedFieldLinkRepository;
-    }
-
-    @Override
-    public EntityType getEntityType() {
-        return EntityType.CALCULATED_FIELD_LINK;
-    }
-
-}

dao/src/main/java/org/thingsboard/server/dao/sql/cf/NativeCalculatedFieldRepository.java

@@ -17,13 +17,10 @@ package org.thingsboard.server.dao.sql.cf;
 
 import org.springframework.data.domain.Pageable;
 import org.thingsboard.server.common.data.cf.CalculatedField;
-import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
 import org.thingsboard.server.common.data.page.PageData;
 
 public interface NativeCalculatedFieldRepository {
 
     PageData<CalculatedField> findCalculatedFields(Pageable pageable);
 
-    PageData<CalculatedFieldLink> findCalculatedFieldLinks(Pageable pageable);
-
 }

dao/src/main/resources/sql/schema-entities.sql

@@ -926,16 +926,6 @@ CREATE TABLE IF NOT EXISTS calculated_field (
     CONSTRAINT calculated_field_unq_key UNIQUE (entity_id, type, name)
 );
 
-CREATE TABLE IF NOT EXISTS calculated_field_link (
-    id uuid NOT NULL CONSTRAINT calculated_field_link_pkey PRIMARY KEY,
-    created_time bigint NOT NULL,
-    tenant_id uuid NOT NULL,
-    entity_type VARCHAR(32),
-    entity_id uuid NOT NULL,
-    calculated_field_id uuid NOT NULL,
-    CONSTRAINT fk_calculated_field_id FOREIGN KEY (calculated_field_id) REFERENCES calculated_field(id) ON DELETE CASCADE
-);
-
 CREATE TABLE IF NOT EXISTS cf_debug_event (
     id uuid NOT NULL,
     tenant_id uuid NOT NULL ,

dao/src/test/java/org/thingsboard/server/dao/service/CalculatedFieldServiceTest.java

@@ -15,13 +15,8 @@
  */
 package org.thingsboard.server.dao.service;
 
-import com.google.common.util.concurrent.ListeningExecutorService;
-import com.google.common.util.concurrent.MoreExecutors;
-import org.junit.After;
-import org.junit.Before;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.thingsboard.common.util.ThingsBoardExecutors;
 import org.thingsboard.server.common.data.Device;
 import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
@@ -64,18 +59,6 @@ public class CalculatedFieldServiceTest extends AbstractServiceTest {
     @Autowired
     private TbTenantProfileCache tbTenantProfileCache;
 
-    private ListeningExecutorService executor;
-
-    @Before
-    public void before() {
-        executor = MoreExecutors.listeningDecorator(ThingsBoardExecutors.newWorkStealingPool(8, getClass()));
-    }
-
-    @After
-    public void after() {
-        executor.shutdownNow();
-    }
-
     @Test
     public void testSaveCalculatedField() {
         Device device = createTestDevice();
@@ -144,7 +127,7 @@ public class CalculatedFieldServiceTest extends AbstractServiceTest {
                 .isInstanceOf(DataValidationException.class)
                 .hasCauseInstanceOf(IllegalArgumentException.class)
                 .hasMessageStartingWith("Scheduled update interval is less than configured " +
-                                        "minimum allowed interval in tenant profile: ");
+                        "minimum allowed interval in tenant profile: ");
     }
 
     @Test
@@ -163,7 +146,7 @@ public class CalculatedFieldServiceTest extends AbstractServiceTest {
                 .getMaxRelationLevelPerCfArgument();
 
         // Zone-group argument (ATTRIBUTE)
-        ZoneGroupConfiguration zoneGroupConfiguration = new ZoneGroupConfiguration( "allowed", REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
+        ZoneGroupConfiguration zoneGroupConfiguration = new ZoneGroupConfiguration("allowed", REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
         var dynamicSourceConfiguration = new RelationPathQueryDynamicSourceConfiguration();
 
         List<RelationPathLevel> levels = new ArrayList<>();
@@ -203,7 +186,7 @@ public class CalculatedFieldServiceTest extends AbstractServiceTest {
         cfg.setEntityCoordinates(entityCoordinates);
 
         // Zone-group argument (ATTRIBUTE) — make it DYNAMIC so scheduling is enabled
-        ZoneGroupConfiguration zoneGroupConfiguration = new ZoneGroupConfiguration( "allowed", REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
+        ZoneGroupConfiguration zoneGroupConfiguration = new ZoneGroupConfiguration("allowed", REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
         var dynamicSourceConfiguration = new RelationPathQueryDynamicSourceConfiguration();
         dynamicSourceConfiguration.setLevels(List.of(new RelationPathLevel(EntitySearchDirection.FROM, EntityRelation.CONTAINS_TYPE)));
         zoneGroupConfiguration.setRefDynamicSourceConfiguration(dynamicSourceConfiguration);

dao/src/test/java/org/thingsboard/server/dao/service/EntityServiceRegistryTest.java

@@ -20,7 +20,6 @@ import org.junit.Assert;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.thingsboard.server.common.data.EntityType;
-import org.thingsboard.server.dao.cf.CalculatedFieldService;
 import org.thingsboard.server.dao.entity.EntityDaoService;
 import org.thingsboard.server.dao.entity.EntityServiceRegistry;
 import org.thingsboard.server.dao.rule.RuleChainService;
@@ -45,8 +44,4 @@ public class EntityServiceRegistryTest extends AbstractServiceTest {
         Assert.assertTrue(entityServiceRegistry.getServiceByEntityType(EntityType.RULE_NODE) instanceof RuleChainService);
     }
 
-    @Test
-    public void givenCalculatedFieldLinkEntityType_whenGetServiceByEntityTypeCalled_thenReturnedCalculatedFieldService() {
-        Assert.assertTrue(entityServiceRegistry.getServiceByEntityType(EntityType.CALCULATED_FIELD_LINK) instanceof CalculatedFieldService);
-    }
 }

dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldDataValidatorTest.java

@@ -17,8 +17,8 @@ package org.thingsboard.server.dao.service.validator;
 
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
+import org.springframework.test.context.bean.override.mockito.MockitoSpyBean;
 import org.thingsboard.server.common.data.cf.CalculatedField;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
@@ -38,11 +38,11 @@ public class CalculatedFieldDataValidatorTest {
     private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("7b5229e9-166e-41a9-a257-3b1dafad1b04"));
     private final CalculatedFieldId CALCULATED_FIELD_ID = new CalculatedFieldId(UUID.fromString("060fbe45-fbb2-4549-abf3-f72a6be3cb9f"));
 
-    @MockBean
+    @MockitoBean
     private CalculatedFieldDao calculatedFieldDao;
-    @MockBean
+    @MockitoBean
     private DefaultApiLimitService apiLimitService;
-    @SpyBean
+    @MockitoSpyBean
     private CalculatedFieldDataValidator validator;
 
     @Test

dao/src/test/java/org/thingsboard/server/dao/service/validator/CalculatedFieldLinkDataValidatorTest.java

@@ -1,57 +0,0 @@
-/**
- * Copyright © 2016-2025 The Thingsboard Authors
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.thingsboard.server.dao.service.validator;
-
-import org.junit.jupiter.api.Test;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.boot.test.mock.mockito.MockBean;
-import org.springframework.boot.test.mock.mockito.SpyBean;
-import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
-import org.thingsboard.server.common.data.id.CalculatedFieldId;
-import org.thingsboard.server.common.data.id.CalculatedFieldLinkId;
-import org.thingsboard.server.common.data.id.TenantId;
-import org.thingsboard.server.dao.cf.CalculatedFieldLinkDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
-
-import java.util.UUID;
-
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
-import static org.mockito.BDDMockito.given;
-
-@SpringBootTest(classes = CalculatedFieldLinkDataValidator.class)
-public class CalculatedFieldLinkDataValidatorTest {
-
-    private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("2ba09d99-6143-43dc-b645-381fc0c43ebe"));
-    private final CalculatedFieldLinkId CALCULATED_FIELD_LINK_ID = new CalculatedFieldLinkId(UUID.fromString("a5609ef4-cb42-43ce-9b23-e090a4878d1c"));
-
-    @MockBean
-    private CalculatedFieldLinkDao calculatedFieldLinkDao;
-    @SpyBean
-    private CalculatedFieldLinkDataValidator validator;
-
-    @Test
-    public void testUpdateNonExistingCalculatedField() {
-        CalculatedFieldLink calculatedFieldLink = new CalculatedFieldLink(CALCULATED_FIELD_LINK_ID);
-        calculatedFieldLink.setCalculatedFieldId(new CalculatedFieldId(UUID.fromString("136477af-fd07-4498-b9c9-54fe50e82992")));
-
-        given(calculatedFieldLinkDao.findById(TENANT_ID, CALCULATED_FIELD_LINK_ID.getId())).willReturn(null);
-
-        assertThatThrownBy(() -> validator.validateUpdate(TENANT_ID, calculatedFieldLink))
-                .isInstanceOf(DataValidationException.class)
-                .hasMessage("Can't update non existing calculated field link!");
-    }
-
-}

msa/black-box-tests/src/test/java/org/thingsboard/server/msa/cf/CalculatedFieldTest.java

@@ -17,7 +17,7 @@ package org.thingsboard.server.msa.cf;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.testng.annotations.AfterClass;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -600,7 +600,7 @@ public class CalculatedFieldTest extends AbstractContainerTest {
         CalculatedField calculatedField = new CalculatedField();
         calculatedField.setEntityId(entityId);
         calculatedField.setType(CalculatedFieldType.SIMPLE);
-        calculatedField.setName("C to F" + RandomStringUtils.randomAlphabetic(5));
+        calculatedField.setName("C to F" + RandomStringUtils.insecure().nextAlphabetic(5));
         calculatedField.setDebugSettings(DebugSettings.all());
 
         SimpleCalculatedFieldConfiguration config = new SimpleCalculatedFieldConfiguration();
@@ -624,15 +624,11 @@ public class CalculatedFieldTest extends AbstractContainerTest {
         return testRestClient.postCalculatedField(calculatedField);
     }
 
-    private CalculatedField createScriptCalculatedField() {
-        return createScriptCalculatedField(device.getId(), asset.getId());
-    }
-
     private CalculatedField createScriptCalculatedField(EntityId entityId, EntityId refEntityId) {
         CalculatedField calculatedField = new CalculatedField();
         calculatedField.setEntityId(entityId);
         calculatedField.setType(CalculatedFieldType.SCRIPT);
-        calculatedField.setName("Air density" + RandomStringUtils.randomAlphabetic(5));
+        calculatedField.setName("Air density" + RandomStringUtils.insecure().nextAlphabetic(5));
         calculatedField.setDebugSettings(DebugSettings.all());
 
         ScriptCalculatedFieldConfiguration config = new ScriptCalculatedFieldConfiguration();

rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/util/TenantIdLoader.java

@@ -18,14 +18,12 @@ package org.thingsboard.rule.engine.util;
 import org.thingsboard.rule.engine.api.TbContext;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.HasTenantId;
-import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
 import org.thingsboard.server.common.data.id.AiModelId;
 import org.thingsboard.server.common.data.id.AlarmId;
 import org.thingsboard.server.common.data.id.ApiUsageStateId;
 import org.thingsboard.server.common.data.id.AssetId;
 import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.common.data.id.CalculatedFieldId;
-import org.thingsboard.server.common.data.id.CalculatedFieldLinkId;
 import org.thingsboard.server.common.data.id.CustomerId;
 import org.thingsboard.server.common.data.id.DashboardId;
 import org.thingsboard.server.common.data.id.DeviceId;
@@ -170,14 +168,6 @@ public class TenantIdLoader {
             case CALCULATED_FIELD:
                 tenantEntity = ctx.getCalculatedFieldService().findById(ctxTenantId, new CalculatedFieldId(id));
                 break;
-            case CALCULATED_FIELD_LINK:
-                CalculatedFieldLink calculatedFieldLink = ctx.getCalculatedFieldService().findCalculatedFieldLinkById(ctxTenantId, new CalculatedFieldLinkId(id));
-                if (calculatedFieldLink != null) {
-                    tenantEntity = ctx.getCalculatedFieldService().findById(ctxTenantId, calculatedFieldLink.getCalculatedFieldId());
-                } else {
-                    tenantEntity = null;
-                }
-                break;
             case JOB:
                 tenantEntity = ctx.getJobService().findJobById(ctxTenantId, new JobId(id));
                 break;

rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/TenantIdLoaderTest.java

@@ -29,7 +29,6 @@ import org.thingsboard.rule.engine.api.RuleEngineAssetProfileCache;
 import org.thingsboard.rule.engine.api.RuleEngineDeviceProfileCache;
 import org.thingsboard.rule.engine.api.RuleEngineRpcService;
 import org.thingsboard.rule.engine.api.TbContext;
-import org.thingsboard.server.common.data.AdminSettings;
 import org.thingsboard.server.common.data.ApiUsageState;
 import org.thingsboard.server.common.data.Customer;
 import org.thingsboard.server.common.data.Dashboard;
@@ -46,14 +45,12 @@ import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.asset.Asset;
 import org.thingsboard.server.common.data.asset.AssetProfile;
 import org.thingsboard.server.common.data.cf.CalculatedField;
-import org.thingsboard.server.common.data.cf.CalculatedFieldLink;
 import org.thingsboard.server.common.data.domain.Domain;
 import org.thingsboard.server.common.data.edge.Edge;
 import org.thingsboard.server.common.data.id.AssetProfileId;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
 import org.thingsboard.server.common.data.id.EntityId;
 import org.thingsboard.server.common.data.id.EntityIdFactory;
-import org.thingsboard.server.common.data.id.NotificationId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.id.TenantProfileId;
 import org.thingsboard.server.common.data.job.Job;
@@ -80,6 +77,7 @@ import org.thingsboard.server.dao.device.DeviceService;
 import org.thingsboard.server.dao.domain.DomainService;
 import org.thingsboard.server.dao.edge.EdgeService;
 import org.thingsboard.server.dao.entityview.EntityViewService;
+import org.thingsboard.server.dao.job.JobService;
 import org.thingsboard.server.dao.mobile.MobileAppBundleService;
 import org.thingsboard.server.dao.mobile.MobileAppService;
 import org.thingsboard.server.dao.notification.NotificationRequestService;
@@ -92,7 +90,6 @@ import org.thingsboard.server.dao.queue.QueueService;
 import org.thingsboard.server.dao.queue.QueueStatsService;
 import org.thingsboard.server.dao.resource.ResourceService;
 import org.thingsboard.server.dao.rule.RuleChainService;
-import org.thingsboard.server.dao.job.JobService;
 import org.thingsboard.server.dao.user.UserService;
 import org.thingsboard.server.dao.widget.WidgetTypeService;
 import org.thingsboard.server.dao.widget.WidgetsBundleService;
@@ -422,12 +419,6 @@ public class TenantIdLoaderTest {
                 when(ctx.getCalculatedFieldService()).thenReturn(calculatedFieldService);
                 doReturn(calculatedField).when(calculatedFieldService).findById(eq(tenantId), any());
                 break;
-            case CALCULATED_FIELD_LINK:
-                CalculatedFieldLink calculatedFieldLink = new CalculatedFieldLink();
-                calculatedFieldLink.setTenantId(tenantId);
-                when(ctx.getCalculatedFieldService()).thenReturn(calculatedFieldService);
-                doReturn(calculatedFieldLink).when(calculatedFieldService).findCalculatedFieldLinkById(eq(tenantId), any());
-                break;
             case JOB:
                 Job job = new Job();
                 job.setTenantId(tenantId);