configuration updates + tests

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

@@ -15,6 +15,8 @@
  */
 package org.thingsboard.server.common.data.cf.configuration;
 
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.StringUtils;
@@ -30,7 +32,9 @@ public class PropagationCalculatedFieldConfiguration extends BaseCalculatedField
 
     public static final String PROPAGATION_CONFIG_ARGUMENT = "propagationCtx";
 
+    @NotNull
     private EntitySearchDirection direction;
+    @NotBlank
     private String relationType;
 
     private boolean applyExpressionToResolvedArguments;
@@ -44,20 +48,14 @@ public class PropagationCalculatedFieldConfiguration extends BaseCalculatedField
     public void validate() {
         baseCalculatedFieldRestriction();
         propagationRestriction();
-        if (direction == null) {
-            throw new IllegalArgumentException("Propagation calculated field direction must be specified!");
-        }
-        if (StringUtils.isBlank(relationType)) {
-            throw new IllegalArgumentException("Propagation calculated field relation type must be specified!");
-        }
         if (!applyExpressionToResolvedArguments) {
             arguments.forEach((name, argument) -> {
                 if (argument.getRefEntityKey() == null) {
                     throw new IllegalArgumentException("Argument: '" + name + "' doesn't have reference entity key configured!");
                 }
                 if (argument.getRefEntityKey().getType() == ArgumentType.TS_ROLLING) {
-                    throw new IllegalArgumentException("Argument type: 'Time series rolling' detected for argument: '" + name + "'! " +
+                    throw new IllegalArgumentException("Argument type: 'Time series rolling' detected for argument: '" + name + "'. " +
-                                                       "Only 'Attribute' or 'Latest telemetry' arguments are allowed for in 'Arguments only' propagation mode!");
+                                                       "Only 'Attribute' or 'Latest telemetry' arguments are allowed for 'Arguments only' propagation mode!");
                 }
             });
         } else if (StringUtils.isBlank(expression)) {

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

@@ -15,10 +15,13 @@
  */
 package org.thingsboard.server.common.data.cf.configuration;
 
+import jakarta.validation.constraints.PositiveOrZero;
+
 public interface ScheduledUpdateSupportedCalculatedFieldConfiguration extends CalculatedFieldConfiguration {
 
     boolean isScheduledUpdateEnabled();
 
+    @PositiveOrZero
     int getScheduledUpdateInterval();
 
     void setScheduledUpdateInterval(int interval);

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

@@ -16,8 +16,8 @@
 package org.thingsboard.server.common.data.cf.configuration.geofencing;
 
 
+import jakarta.validation.constraints.NotBlank;
 import lombok.Data;
-import org.thingsboard.server.common.data.StringUtils;
 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.ReferencedEntityKey;
@@ -30,18 +30,11 @@ public class EntityCoordinates {
     public static final String ENTITY_ID_LATITUDE_ARGUMENT_KEY = "latitude";
     public static final String ENTITY_ID_LONGITUDE_ARGUMENT_KEY = "longitude";
 
+    @NotBlank
     private final String latitudeKeyName;
+    @NotBlank
     private final String longitudeKeyName;
 
-    public void validate() {
-        if (StringUtils.isBlank(latitudeKeyName)) {
-            throw new IllegalArgumentException("Entity coordinates latitude key name must be specified!");
-        }
-        if (StringUtils.isBlank(longitudeKeyName)) {
-            throw new IllegalArgumentException("Entity coordinates longitude key name must be specified!");
-        }
-    }
-
     public Map<String, Argument> toArguments() {
         return Map.of(
                 ENTITY_ID_LATITUDE_ARGUMENT_KEY, toArgument(latitudeKeyName),

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

@@ -16,6 +16,8 @@
 package org.thingsboard.server.common.data.cf.configuration.geofencing;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.thingsboard.server.common.data.cf.CalculatedFieldType;
 import org.thingsboard.server.common.data.cf.configuration.Argument;
@@ -32,7 +34,12 @@ import java.util.Objects;
 @Data
 public class GeofencingCalculatedFieldConfiguration implements ArgumentsBasedCalculatedFieldConfiguration, ScheduledUpdateSupportedCalculatedFieldConfiguration {
 
+    @Valid
+    @NotNull
     private EntityCoordinates entityCoordinates;
+
+    @Valid
+    @NotNull
     private Map<String, ZoneGroupConfiguration> zoneGroups;
 
     private boolean scheduledUpdateEnabled;
@@ -66,13 +73,6 @@ public class GeofencingCalculatedFieldConfiguration implements ArgumentsBasedCal
 
     @Override
     public void validate() {
-        if (entityCoordinates == null) {
-            throw new IllegalArgumentException("Geofencing calculated field entity coordinates must be specified!");
-        }
-        entityCoordinates.validate();
-        if (zoneGroups == null || zoneGroups.isEmpty()) {
-            throw new IllegalArgumentException("Geofencing calculated field must contain at least one geofencing zone group defined!");
-        }
         zoneGroups.forEach((key, value) -> value.validate(key));
     }
 

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

@@ -17,6 +17,8 @@ package org.thingsboard.server.common.data.cf.configuration.geofencing;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import org.springframework.lang.Nullable;
 import org.thingsboard.server.common.data.AttributeScope;
@@ -36,8 +38,10 @@ public class ZoneGroupConfiguration {
     private EntityId refEntityId;
     private CfArgumentDynamicSourceConfiguration refDynamicSourceConfiguration;
 
+    @NotBlank
     private final String perimeterKeyName;
 
+    @NotNull
     private final GeofencingReportStrategy reportStrategy;
     private final boolean createRelationsWithMatchedZones;
 
@@ -48,12 +52,6 @@ public class ZoneGroupConfiguration {
         if (EntityCoordinates.ENTITY_ID_LATITUDE_ARGUMENT_KEY.equals(name) || EntityCoordinates.ENTITY_ID_LONGITUDE_ARGUMENT_KEY.equals(name)) {
             throw new IllegalArgumentException("Name '" + name + "' is reserved and cannot be used for zone group!");
         }
-        if (StringUtils.isBlank(perimeterKeyName)) {
-            throw new IllegalArgumentException("Perimeter key name must be specified for '" + name + "' zone group!");
-        }
-        if (reportStrategy == null) {
-            throw new IllegalArgumentException("Report strategy must be specified for '" + name + "' zone group!");
-        }
         if (refDynamicSourceConfiguration != null) {
             refDynamicSourceConfiguration.validate();
         }

common/data/src/test/java/org/thingsboard/server/common/data/cf/configuration/PropagationCalculatedFieldConfigurationTest.java

@@ -0,0 +1,116 @@
+/**
+ * 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.cf.configuration;
+
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.junit.jupiter.MockitoExtension;
+import org.thingsboard.server.common.data.cf.CalculatedFieldType;
+import org.thingsboard.server.common.data.relation.EntityRelation;
+import org.thingsboard.server.common.data.relation.EntitySearchDirection;
+
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+import static org.thingsboard.server.common.data.cf.configuration.PropagationCalculatedFieldConfiguration.PROPAGATION_CONFIG_ARGUMENT;
+
+@ExtendWith(MockitoExtension.class)
+public class PropagationCalculatedFieldConfigurationTest {
+
+    @Test
+    void typeShouldBePropagation() {
+        var cfg = new PropagationCalculatedFieldConfiguration();
+        assertThat(cfg.getType()).isEqualTo(CalculatedFieldType.PROPAGATION);
+    }
+
+    @Test
+    void validateShouldThrowWhenUsedReservedPropagationArgumentName() {
+        var cfg = new PropagationCalculatedFieldConfiguration();
+        cfg.setArguments(Map.of(PROPAGATION_CONFIG_ARGUMENT, new Argument()));
+        assertThatThrownBy(cfg::validate)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Argument name '" + PROPAGATION_CONFIG_ARGUMENT + "' is reserved and cannot be used.");
+    }
+
+    @Test
+    void validateShouldThrowWhenUsedReservedCtxArgumentName() {
+        var cfg = new PropagationCalculatedFieldConfiguration();
+        cfg.setArguments(Map.of("ctx", new Argument()));
+        assertThatThrownBy(cfg::validate)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Argument name 'ctx' is reserved and cannot be used.");
+    }
+
+    @Test
+    void validateShouldThrowWhenReferencedEntityKeyIsNotSet() {
+        var cfg = new PropagationCalculatedFieldConfiguration();
+        Argument argument = new Argument();
+        cfg.setArguments(Map.of("someArgumentName", argument));
+        assertThatThrownBy(cfg::validate)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Argument: 'someArgumentName' doesn't have reference entity key configured!");
+    }
+
+    @Test
+    void validateShouldThrowWhenReferencedEntityKeyTypeIsTsRolling() {
+        var cfg = new PropagationCalculatedFieldConfiguration();
+        ReferencedEntityKey referencedEntityKey = new ReferencedEntityKey("someKey", ArgumentType.TS_ROLLING, null);
+        Argument argument = new Argument();
+        argument.setRefEntityKey(referencedEntityKey);
+        cfg.setArguments(Map.of("someArgumentName", argument));
+        assertThatThrownBy(cfg::validate)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Argument type: 'Time series rolling' detected for argument: 'someArgumentName'. " +
+                            "Only 'Attribute' or 'Latest telemetry' arguments are allowed for 'Arguments only' propagation mode!");
+    }
+
+    @Test
+    void validateShouldThrowWhenExpressionIsNotSet() {
+        var cfg = new PropagationCalculatedFieldConfiguration();
+        cfg.setArguments(Map.of("someArgumentName", new Argument()));
+        cfg.setApplyExpressionToResolvedArguments(true);
+        assertThatThrownBy(cfg::validate)
+                .isInstanceOf(IllegalArgumentException.class)
+                .hasMessage("Expression must be specified for 'Expression result' propagation mode!");
+    }
+
+    @Test
+    void validateToPropagationArgumentMethodCallReturnCorrectArgument() {
+        var cfg = new PropagationCalculatedFieldConfiguration();
+        cfg.setDirection(EntitySearchDirection.TO);
+        cfg.setRelationType(EntityRelation.CONTAINS_TYPE);
+
+        Argument propagationArgument = cfg.toPropagationArgument();
+        assertThat(propagationArgument).isNotNull();
+        assertThat(propagationArgument.getRefEntityId()).isNull();
+        assertThat(propagationArgument.getRefEntityKey()).isNull();
+        assertThat(propagationArgument.getDefaultValue()).isNull();
+        assertThat(propagationArgument.getTimeWindow()).isNull();
+        assertThat(propagationArgument.getLimit()).isNull();
+
+        assertThat(propagationArgument.getRefDynamicSourceConfiguration())
+                .isNotNull()
+                .isInstanceOf(RelationPathQueryDynamicSourceConfiguration.class);
+        var refDynamicSourceConfiguration = (RelationPathQueryDynamicSourceConfiguration) propagationArgument.getRefDynamicSourceConfiguration();
+        assertThat(refDynamicSourceConfiguration.getLevels()).isNotEmpty().hasSize(1);
+
+        var relationPathLevel = refDynamicSourceConfiguration.getLevels().get(0);
+        assertThat(relationPathLevel.direction()).isEqualTo(EntitySearchDirection.TO);
+        assertThat(relationPathLevel.relationType()).isEqualTo(EntityRelation.CONTAINS_TYPE);
+    }
+
+}

common/data/src/test/java/org/thingsboard/server/common/data/cf/configuration/ScheduledUpdateSupportedCalculatedFieldConfigurationTest.java

@@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy;
 public class ScheduledUpdateSupportedCalculatedFieldConfigurationTest {
 
     @Test
-    void validateShouldThrowWhenScheduledUpdateIntervalIsSetButTimeUnitIsNotSupported() {
+    void validateDoesNotThrowAnyExceptionWhenScheduledUpdateIntervalIsGreaterThanMinAllowedIntervalInTenantProfile() {
         int scheduledUpdateInterval = 60;
         int minAllowedInterval = scheduledUpdateInterval - 1;
 

common/data/src/test/java/org/thingsboard/server/common/data/cf/configuration/geofencing/EntityCoordinatesTest.java

@@ -16,47 +16,16 @@
 package org.thingsboard.server.common.data.cf.configuration.geofencing;
 
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.NullAndEmptySource;
-import org.junit.jupiter.params.provider.ValueSource;
 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.ReferencedEntityKey;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LATITUDE_ARGUMENT_KEY;
 import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LONGITUDE_ARGUMENT_KEY;
 
 public class EntityCoordinatesTest {
 
-    @ParameterizedTest
-    @ValueSource(strings = "  ")
-    @NullAndEmptySource
-    void validateShouldThrowWhenLatitudeCoordinateIsNullEmptyOrBlank(String latitudeKey) {
-        var entityCoordinates = new EntityCoordinates(latitudeKey, "longitude");
-        assertThatThrownBy(entityCoordinates::validate)
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessage("Entity coordinates latitude key name must be specified!");
-    }
-
-    @ParameterizedTest
-    @ValueSource(strings = "  ")
-    @NullAndEmptySource
-    void validateShouldThrowWhenLongitudeCoordinateIsNullEmptyOrBlank(String longitudeKey) {
-        var entityCoordinates = new EntityCoordinates("latitude", longitudeKey);
-        assertThatThrownBy(entityCoordinates::validate)
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessage("Entity coordinates longitude key name must be specified!");
-    }
-
-    @Test
-    void validateShouldPassOnMinimalValidConfig() {
-        var entityCoordinates = new EntityCoordinates("latitude", "longitude");
-        assertThatCode(entityCoordinates::validate).doesNotThrowAnyException();
-    }
-
     @Test
     void validateToArgumentsMethodCallWithoutRefEntityId() {
         var entityCoordinates = new EntityCoordinates("xPos", "yPos");

common/data/src/test/java/org/thingsboard/server/common/data/cf/configuration/geofencing/GeofencingCalculatedFieldConfigurationTest.java

@@ -28,7 +28,6 @@ import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatCode;
-import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.thingsboard.server.common.data.cf.configuration.geofencing.EntityCoordinates.ENTITY_ID_LATITUDE_ARGUMENT_KEY;
@@ -44,28 +43,7 @@ public class GeofencingCalculatedFieldConfigurationTest {
     }
 
     @Test
-    void validateShouldThrowWhenEntityCoordinatesNull() {
+    void validateShouldCallValidateOnZoneGroups() {
-        var cfg = new GeofencingCalculatedFieldConfiguration();
-        cfg.setEntityCoordinates(null);
-
-        assertThatThrownBy(cfg::validate)
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessage("Geofencing calculated field entity coordinates must be specified!");
-    }
-
-    @Test
-    void validateShouldThrowWhenZoneGroupsNull() {
-        var cfg = new GeofencingCalculatedFieldConfiguration();
-        cfg.setEntityCoordinates(new EntityCoordinates(ENTITY_ID_LATITUDE_ARGUMENT_KEY, ENTITY_ID_LONGITUDE_ARGUMENT_KEY));
-        cfg.setZoneGroups(null);
-
-        assertThatThrownBy(cfg::validate)
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessage("Geofencing calculated field must contain at least one geofencing zone group defined!");
-    }
-
-    @Test
-    void validateShouldCallValidateOnEntityCoordinatesAndZoneGroups() {
         var cfg = new GeofencingCalculatedFieldConfiguration();
         EntityCoordinates entityCoordinatesMock = mock(EntityCoordinates.class);
         cfg.setEntityCoordinates(entityCoordinatesMock);
@@ -73,13 +51,11 @@ public class GeofencingCalculatedFieldConfigurationTest {
         cfg.setZoneGroups(Map.of("someGroupName", zoneGroupConfiguration));
 
         cfg.validate();
-
-        verify(entityCoordinatesMock).validate();
         verify(zoneGroupConfiguration).validate("someGroupName");
     }
 
     @Test
-    void validateShouldCallValidateOnEntityCoordinatesAndZoneGroupsWithoutAnyExceptions() {
+    void validateShouldCallValidateOnZoneGroupsWithoutAnyExceptions() {
         var cfg = new GeofencingCalculatedFieldConfiguration();
         EntityCoordinates entityCoordinatesMock = mock(EntityCoordinates.class);
         cfg.setEntityCoordinates(entityCoordinatesMock);
@@ -93,7 +69,6 @@ public class GeofencingCalculatedFieldConfigurationTest {
 
         assertThatCode(cfg::validate).doesNotThrowAnyException();
 
-        verify(entityCoordinatesMock).validate();
         verify(zoneGroupConfigurationA).validate(zoneGroupAName);
         verify(zoneGroupConfigurationB).validate(zoneGroupBName);
     }

common/data/src/test/java/org/thingsboard/server/common/data/cf/configuration/geofencing/ZoneGroupConfigurationTest.java

@@ -45,24 +45,6 @@ public class ZoneGroupConfigurationTest {
                 .hasMessage("Name '" + name + "' is reserved and cannot be used for zone group!");
     }
 
-    @ParameterizedTest
-    @ValueSource(strings = "  ")
-    @NullAndEmptySource
-    void validateShouldThrowWhenPerimeterKeyNameIsNullEmptyOrBlank(String perimeterKeyName) {
-        var zoneGroupConfiguration = new ZoneGroupConfiguration(perimeterKeyName, REPORT_TRANSITION_EVENTS_AND_PRESENCE_STATUS, false);
-        assertThatThrownBy(() -> zoneGroupConfiguration.validate("allowedZonesGroup"))
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessage("Perimeter key name must be specified for 'allowedZonesGroup' zone group!");
-    }
-
-    @Test
-    void validateShouldThrowWhenReportStrategyIsNull() {
-        var zoneGroupConfiguration = new ZoneGroupConfiguration("perimeter", null, false);
-        assertThatThrownBy(() -> zoneGroupConfiguration.validate("allowedZonesGroup"))
-                .isInstanceOf(IllegalArgumentException.class)
-                .hasMessage("Report strategy must be specified for 'allowedZonesGroup' zone group!");
-    }
-
     @ParameterizedTest
     @ValueSource(strings = "  ")
     @NullAndEmptySource