propagationEntityIds = proto.getPropagationEntityIdsList().stream().map(ProtoUtils::fromProto).toList();
+ state.getArguments().put(PROPAGATION_CONFIG_ARGUMENT, new PropagationArgumentEntry(propagationEntityIds));
}
case ALARM -> {
AlarmCalculatedFieldState alarmState = (AlarmCalculatedFieldState) state;
diff --git a/application/src/main/java/org/thingsboard/server/utils/LwM2mObjectModelUtils.java b/application/src/main/java/org/thingsboard/server/utils/LwM2mObjectModelUtils.java
index 172a3e8e2d..c72620bb8f 100644
--- a/application/src/main/java/org/thingsboard/server/utils/LwM2mObjectModelUtils.java
+++ b/application/src/main/java/org/thingsboard/server/utils/LwM2mObjectModelUtils.java
@@ -26,7 +26,7 @@ import org.thingsboard.server.common.data.lwm2m.LwM2mInstance;
import org.thingsboard.server.common.data.lwm2m.LwM2mObject;
import org.thingsboard.server.common.data.lwm2m.LwM2mResourceObserve;
import org.thingsboard.server.common.data.util.TbDDFFileParser;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import java.io.ByteArrayInputStream;
import java.io.IOException;
diff --git a/application/src/main/resources/thingsboard.yml b/application/src/main/resources/thingsboard.yml
index 66669a8280..787111c28e 100644
--- a/application/src/main/resources/thingsboard.yml
+++ b/application/src/main/resources/thingsboard.yml
@@ -516,14 +516,14 @@ actors:
response_timeout_ms: "${ACTORS_RPC_RESPONSE_TIMEOUT_MS:30000}"
# Close transport session if RPC delivery timed out. If enabled, RPC will be reverted to the queued state.
# Note:
- # - For MQTT transport:
- # - QoS level 0: This feature does not apply, as no acknowledgment is expected, and therefore no timeout is triggered.
- # - QoS level 1: This feature applies, as an acknowledgment is expected.
- # - QoS level 2: Unsupported.
- # - For CoAP transport:
- # - Confirmable requests: This feature applies, as delivery confirmation is expected.
- # - Non-confirmable requests: This feature does not apply, as no delivery acknowledgment is expected.
- # - For HTTP and SNPM transports: RPC is considered delivered immediately, and there is no logic to await acknowledgment.
+ # - For MQTT transport:
+ #
- QoS level 0: This feature does not apply, as no acknowledgment is expected, and therefore no timeout is triggered.
+ # - QoS level 1: This feature applies, as an acknowledgment is expected.
+ # - QoS level 2: Unsupported.
+ # - For CoAP transport:
+ #
- Confirmable requests: This feature applies, as delivery confirmation is expected.
+ # - Non-confirmable requests: This feature does not apply, as no delivery acknowledgment is expected.
+ # - For HTTP and SNPM transports: RPC is considered delivered immediately, and there is no logic to await acknowledgment.
close_session_on_rpc_delivery_timeout: "${ACTORS_RPC_CLOSE_SESSION_ON_RPC_DELIVERY_TIMEOUT:false}"
statistics:
# Enable/disable actor statistics
@@ -733,13 +733,13 @@ redis:
# if set false will be used pool config build from values of the pool config section
useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
sentinel:
- # name of the master node
+ # Name of the master node
master: "${REDIS_MASTER:}"
- # comma-separated list of "host:port" pairs of sentinels
+ # Comma-separated list of "host:port" pairs of sentinels
sentinels: "${REDIS_SENTINELS:}"
- # password to authenticate with sentinel
+ # Password to authenticate with sentinel
password: "${REDIS_SENTINEL_PASSWORD:}"
- # if set false will be used pool config build from values of the pool config section
+ # If set false will be used pool config build from values of the pool config section
useDefaultPoolConfig: "${REDIS_USE_DEFAULT_POOL_CONFIG:true}"
# db index
db: "${REDIS_DB:0}"
@@ -1039,10 +1039,10 @@ transport:
activity:
# This property specifies the strategy for reporting activity events within each reporting period.
# The accepted values are 'FIRST', 'LAST', 'FIRST_AND_LAST' and 'ALL'.
- # - 'FIRST': Only the first activity event in each reporting period is reported.
- # - 'LAST': Only the last activity event in the reporting period is reported.
- # - 'FIRST_AND_LAST': Both the first and last activity events in the reporting period are reported.
- # - 'ALL': All activity events in the reporting period are reported.
+ # - 'FIRST': Only the first activity event in each reporting period is reported.
+ # - 'LAST': Only the last activity event in the reporting period is reported.
+ # - 'FIRST_AND_LAST': Both the first and last activity events in the reporting period are reported.
+ # - 'ALL': All activity events in the reporting period are reported.
reporting_strategy: "${TB_TRANSPORT_ACTIVITY_REPORTING_STRATEGY:LAST}"
json:
# Cast String data types to Numeric if possible when processing Telemetry/Attributes JSON
@@ -1160,15 +1160,15 @@ transport:
dtls:
# RFC7925_RETRANSMISSION_TIMEOUT_IN_MILLISECONDS = 9000
retransmission_timeout: "${LWM2M_DTLS_RETRANSMISSION_TIMEOUT_MS:9000}"
- # CoAP DTLS connection ID length for LWM2M. RFC 9146, Connection Identifier for DTLS 1.2
- # Default: off
+ # LWM2M DTLS connection ID length for LWM2M. RFC 9146, Connection Identifier for DTLS 1.2
+ # Default: off.
# Control usage of DTLS connection ID length (CID).
- # - 'off' to deactivate it.
- # - 'on' to activate Connection ID support (same as CID 0 or more 0).
- # - A positive value defines generated CID size in bytes.
- # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
- # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
- # - A value that are > 4: MultiNodeConnectionIdGenerator is used
+ # - 'off' to deactivate it.
+ # - 'on' to activate Connection ID support (same as CID 0 or more 0).
+ # - A positive value defines generated CID size in bytes.
+ # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
+ # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
+ # - A value that are > 4: MultiNodeConnectionIdGenerator is used
connection_id_length: "${LWM2M_DTLS_CONNECTION_ID_LENGTH:8}"
server:
# LwM2M Server ID
@@ -1351,14 +1351,14 @@ coap:
# CoAP DTLS bind port
bind_port: "${COAP_DTLS_BIND_PORT:5684}"
# CoAP DTLS connection ID length. RFC 9146, Connection Identifier for DTLS 1.2
- # Default: off
+ # Default: off.
# Control usage of DTLS connection ID length (CID).
- # - 'off' to deactivate it.
- # - 'on' to activate Connection ID support (same as CID 0 or more 0).
- # - A positive value defines generated CID size in bytes.
- # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
- # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
- # - A value that are > 4: MultiNodeConnectionIdGenerator is used
+ # - 'off' to deactivate it.
+ # - 'on' to activate Connection ID support (same as CID 0 or more 0).
+ # - A positive value defines generated CID size in bytes.
+ # - A value of 0 means we accept using CID but will not generate one for foreign peer (enables support but not for incoming traffic).
+ # - A value between 0 and <= 4: SingleNodeConnectionIdGenerator is used
+ # - A value that are > 4: MultiNodeConnectionIdGenerator is used
connection_id_length: "${COAP_DTLS_CONNECTION_ID_LENGTH:8}"
# Specify the MTU (Maximum Transmission Unit).
# Should be used if LAN MTU is not used, e.g. if IP tunnels are used or if the client uses a smaller value than the LAN MTU.
@@ -1375,13 +1375,13 @@ coap:
# In order to negotiate smaller maximum fragment lengths,
# clients MAY include an extension of type "max_fragment_length" in the (extended) client hello.
# The "extension_data" field of this extension SHALL contain:
- # enum {
+ # enum {
# 2^9(1) == 512,
# 2^10(2) == 1024,
# 2^11(3) == 2048,
# 2^12(4) == 4096,
# (255)
- # } MaxFragmentLength;
+ # } MaxFragmentLength;
# TLS already requires clients and servers to support fragmentation of handshake messages.
max_fragment_length: "${COAP_DTLS_MAX_FRAGMENT_LENGTH:1024}"
# Server DTLS credentials
@@ -1745,6 +1745,8 @@ queue:
print-interval-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_MIN_PRINT_INTERVAL_MS:60000}"
# Time to wait for the stats-loading requests to Kafka to finish
kafka-response-timeout-ms: "${TB_QUEUE_KAFKA_CONSUMER_STATS_RESPONSE_TIMEOUT_MS:1000}"
+ # Topics cache TTL in milliseconds. 5 minutes by default
+ topics_cache_ttl_ms: "${TB_QUEUE_KAFKA_TOPICS_CACHE_TTL_MS:300000}"
partitions:
hash_function_name: "${TB_QUEUE_PARTITIONS_HASH_FUNCTION_NAME:murmur3_128}" # murmur3_32, murmur3_128 or sha256
transport_api:
diff --git a/application/src/test/java/org/thingsboard/server/cf/CalculatedFieldIntegrationTest.java b/application/src/test/java/org/thingsboard/server/cf/CalculatedFieldIntegrationTest.java
index 6f1ae6f481..fa30dc9025 100644
--- a/application/src/test/java/org/thingsboard/server/cf/CalculatedFieldIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/cf/CalculatedFieldIntegrationTest.java
@@ -799,23 +799,22 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
doPost("/api/calculatedField", cf, CalculatedField.class);
- // --- Assert initial evaluation (ENTERED / OUTSIDE) ---
+ // --- Assert initial evaluation ---
await().alias("initial geofencing evaluation")
.atMost(TIMEOUT, TimeUnit.SECONDS)
.pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
.untilAsserted(() -> {
ArrayNode attrs = getServerAttributes(device.getId(),
"allowedZonesEvent", "allowedZonesStatus", "restrictedZonesStatus", "restrictedZonesEvent");
- // --- no restrictedZonesEvent as no transition happened yet
- assertThat(attrs).isNotNull().isNotEmpty().hasSize(3);
+ // --- no transition events as no transitions happened yet
+ assertThat(attrs).isNotNull().isNotEmpty().hasSize(2);
Map m = kv(attrs);
- assertThat(m).containsEntry("allowedZonesEvent", "ENTERED")
- .containsEntry("allowedZonesStatus", "INSIDE")
+ assertThat(m).containsEntry("allowedZonesStatus", "INSIDE")
.containsEntry("restrictedZonesStatus", "OUTSIDE");
});
// --- delete attributes reported in previous evaluation
- doDelete("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/SERVER_SCOPE?keys=allowedZonesEvent,allowedZonesStatus,restrictedZonesStatus", String.class);
+ doDelete("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/SERVER_SCOPE?keys=allowedZonesStatus,restrictedZonesStatus", String.class);
// --- Update restrictedZone by 'restrictedZone' attribute update
doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/attributes/" + DataConstants.SERVER_SCOPE,
@@ -909,17 +908,16 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
doPost("/api/calculatedField", cf, CalculatedField.class);
- // --- Assert initial evaluation (ENTERED / OUTSIDE) ---
+ // --- Assert initial evaluation ---
await().alias("initial geofencing evaluation")
.atMost(TIMEOUT, TimeUnit.SECONDS)
.pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
.untilAsserted(() -> {
ArrayNode attrs = getServerAttributes(device.getId(),
- "allowedZonesEvent", "allowedZonesStatus", "restrictedZonesStatus");
- assertThat(attrs).isNotNull().isNotEmpty().hasSize(3);
+ "allowedZonesEvent", "allowedZonesStatus", "restrictedZonesStatus", "restrictedZonesEvent");
+ assertThat(attrs).isNotNull().isNotEmpty().hasSize(2);
Map m = kv(attrs);
- assertThat(m).containsEntry("allowedZonesEvent", "ENTERED")
- .containsEntry("allowedZonesStatus", "INSIDE")
+ assertThat(m).containsEntry("allowedZonesStatus", "INSIDE")
.containsEntry("restrictedZonesStatus", "OUTSIDE");
});
@@ -1014,16 +1012,15 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
var geofencingConfiguration = (GeofencingCalculatedFieldConfiguration) configuration;
assertThat(geofencingConfiguration.isScheduledUpdateEnabled()).isTrue();
- // --- Assert initial evaluation (ENTERED) ---
+ // --- Assert initial evaluation ---
await().alias("initial geofencing evaluation")
.atMost(TIMEOUT, TimeUnit.SECONDS)
.pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
.untilAsserted(() -> {
ArrayNode attrs = getServerAttributes(device.getId(), "allowedZonesEvent", "allowedZonesStatus");
- assertThat(attrs).isNotNull().isNotEmpty().hasSize(2);
+ assertThat(attrs).isNotNull().isNotEmpty().hasSize(1);
Map m = kv(attrs);
- assertThat(m).containsEntry("allowedZonesEvent", "ENTERED")
- .containsEntry("allowedZonesStatus", "INSIDE");
+ assertThat(m).containsEntry("allowedZonesStatus", "INSIDE");
});
// --- Move device OUTSIDE Zone A (expect LEFT) ---
@@ -1057,11 +1054,11 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
awaitForCalculatedFieldEntityMessageProcessorToRegisterCfStateAsReadyToRefreshDynamicArguments(device.getId(), savedCalculatedField.getId(), minAllowedScheduledUpdateIntervalInSecForCF);
- // --- Same coordinates as before, but now we expect ENTERED since a new zone is registered ---
+ // --- Same coordinates as before, but now we expect INSIDE group status since a new zone is registered ---
doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/timeseries/unusedScope",
JacksonUtil.toJsonNode("{\"latitude\":50.4760,\"longitude\":30.5110}")).andExpect(status().isOk());
- // --- Assert dynamic refresh picks up new relation and flips event back to ENTERED on the next telemetry update ---
+ // --- Assert dynamic refresh picks up a new relation and flips status back to INSIDE on the next telemetry update ---
await().alias("dynamic refresh rebinds allowedZones")
.atMost(TIMEOUT, TimeUnit.SECONDS)
.pollInterval(1, TimeUnit.SECONDS)
@@ -1069,7 +1066,7 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
ArrayNode attrs = getServerAttributes(device.getId(), "allowedZonesEvent", "allowedZonesStatus");
assertThat(attrs).isNotNull().isNotEmpty().hasSize(2);
Map m = kv(attrs);
- assertThat(m).containsEntry("allowedZonesEvent", "ENTERED")
+ assertThat(m).containsEntry("allowedZonesEvent", "LEFT") // attribute from previous eval with outdated ts.
.containsEntry("allowedZonesStatus", "INSIDE");
});
}
@@ -1089,7 +1086,7 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
// Telemetry on device
doPost("/api/plugins/telemetry/DEVICE/" + device.getUuidId() + "/timeseries/unusedScope",
- JacksonUtil.toJsonNode("{\"temperature\":12.5}")).andExpect(status().isOk());
+ JacksonUtil.toJsonNode("{\"temperature\":12.5, \"humidity\":85}")).andExpect(status().isOk());
// --- Build CF: PROPAGATION with expression ---
CalculatedField cf = new CalculatedField();
@@ -1102,11 +1099,14 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
cfg.setRelation(new RelationPathLevel(EntitySearchDirection.TO, EntityRelation.CONTAINS_TYPE));
cfg.setApplyExpressionToResolvedArguments(true);
- Argument arg = new Argument();
- arg.setRefEntityKey(new ReferencedEntityKey("temperature", ArgumentType.TS_LATEST, null));
- cfg.setArguments(Map.of("t", arg));
+ Argument arg1 = new Argument();
+ arg1.setRefEntityKey(new ReferencedEntityKey("temperature", ArgumentType.TS_LATEST, null));
- cfg.setExpression("{\"testResult\": t * 2}");
+ Argument arg2 = new Argument();
+ arg2.setRefEntityKey(new ReferencedEntityKey("humidity", ArgumentType.TS_LATEST, null));
+
+ cfg.setArguments(Map.of("t", arg1, "h", arg2));
+ cfg.setExpression("return { testResult: (t + h) / 2};");
AttributesOutput output = new AttributesOutput();
output.setScope(AttributeScope.SERVER_SCOPE);
@@ -1125,8 +1125,8 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
ArrayNode attrs2 = getServerAttributes(asset2.getId(), "testResult");
assertThat(attrs1).isNotNull();
assertThat(attrs2).isNotNull();
- assertThat(attrs1.get(0).get("value").asDouble()).isEqualTo(25.0);
- assertThat(attrs2.get(0).get("value").asDouble()).isEqualTo(25.0);
+ assertThat(attrs1.get(0).get("value").asDouble()).isEqualTo(48.75);
+ assertThat(attrs2.get(0).get("value").asDouble()).isEqualTo(48.75);
});
String deleteUrl = String.format("/api/v2/relation?fromId=%s&fromType=%s&relationType=%s&toId=%s&toType=%s",
@@ -1148,7 +1148,7 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
ArrayNode attrs2 = getServerAttributes(asset2.getId(), "testResult");
assertThat(attrs1).isNullOrEmpty();
assertThat(attrs2).isNotNull();
- assertThat(attrs2.get(0).get("value").asDouble()).isEqualTo(50);
+ assertThat(attrs2.get(0).get("value").asDouble()).isEqualTo(55);
});
}
@@ -1167,7 +1167,7 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
// Telemetry on device
long ts = System.currentTimeMillis() - 300000L;
- postTelemetry(device.getId(), String.format("{\"ts\": %s, \"values\": {\"temperature\":12.5}}", ts));
+ postTelemetry(device.getId(), String.format("{\"ts\": %s, \"values\": {\"temperature\":12.5, \"humidity\":85}}", ts));
// --- Build CF: PROPAGATION without expression ---
CalculatedField cf = new CalculatedField();
@@ -1180,9 +1180,12 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
cfg.setRelation(new RelationPathLevel(EntitySearchDirection.TO, EntityRelation.CONTAINS_TYPE));
cfg.setApplyExpressionToResolvedArguments(false); // arguments-only mode
- Argument arg = new Argument();
- arg.setRefEntityKey(new ReferencedEntityKey("temperature", ArgumentType.TS_LATEST, null));
- cfg.setArguments(Map.of("temperatureComputed", arg));
+ Argument arg1 = new Argument();
+ arg1.setRefEntityKey(new ReferencedEntityKey("temperature", ArgumentType.TS_LATEST, null));
+ Argument arg2 = new Argument();
+ arg2.setRefEntityKey(new ReferencedEntityKey("humidity", ArgumentType.TS_LATEST, null));
+
+ cfg.setArguments(Map.of("temperatureComputed", arg1, "humidityComputed", arg2));
TimeSeriesOutput output = new TimeSeriesOutput();
output.setStrategy(new TimeSeriesImmediateOutputStrategy(0, true, true, true, true));
@@ -1197,14 +1200,18 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
.atMost(TIMEOUT, TimeUnit.SECONDS)
.pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
.untilAsserted(() -> {
- ObjectNode telemetry1 = getLatestTelemetry(asset1.getId(), "temperatureComputed");
- ObjectNode telemetry2 = getLatestTelemetry(asset2.getId(), "temperatureComputed");
+ ObjectNode telemetry1 = getLatestTelemetry(asset1.getId(), "temperatureComputed,humidityComputed");
+ ObjectNode telemetry2 = getLatestTelemetry(asset2.getId(), "temperatureComputed,humidityComputed");
assertThat(telemetry1).isNotNull();
assertThat(telemetry2).isNotNull();
assertThat(telemetry1.get("temperatureComputed").get(0).get("ts").asText()).isEqualTo(Long.toString(ts));
assertThat(telemetry1.get("temperatureComputed").get(0).get("value").asDouble()).isEqualTo(12.5);
+ assertThat(telemetry1.get("humidityComputed").get(0).get("ts").asText()).isEqualTo(Long.toString(ts));
+ assertThat(telemetry1.get("humidityComputed").get(0).get("value").asDouble()).isEqualTo(85);
assertThat(telemetry2.get("temperatureComputed").get(0).get("ts").asText()).isEqualTo(Long.toString(ts));
assertThat(telemetry2.get("temperatureComputed").get(0).get("value").asDouble()).isEqualTo(12.5);
+ assertThat(telemetry2.get("humidityComputed").get(0).get("ts").asText()).isEqualTo(Long.toString(ts));
+ assertThat(telemetry2.get("humidityComputed").get(0).get("value").asDouble()).isEqualTo(85);
});
String deleteUrl = String.format("/api/v2/relation?fromId=%s&fromType=%s&relationType=%s&toId=%s&toType=%s",
@@ -1212,10 +1219,10 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
EntityRelation.CONTAINS_TYPE, device.getId().getId(), EntityType.DEVICE
);
doDelete(deleteUrl).andExpect(status().isOk());
- doDelete("/api/plugins/telemetry/ASSET/" + asset1.getId() + "/timeseries/delete?keys=temperatureComputed&deleteAllDataForKeys=true").andExpect(status().isOk());
+ doDelete("/api/plugins/telemetry/ASSET/" + asset1.getId() + "/timeseries/delete?keys=temperatureComputed,humidityComputed&deleteAllDataForKeys=true").andExpect(status().isOk());
- // Update telemetry on device
- long newTs = System.currentTimeMillis() - 300000L;
+ // Update telemetry on the device
+ long newTs = ts + 300000L;
postTelemetry(device.getId(), String.format("{\"ts\": %s, \"values\": {\"temperature\":25}}", newTs));
// --- Assert propagated calculation (arguments-only mode after update) ---
@@ -1223,14 +1230,37 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
.atMost(TIMEOUT, TimeUnit.SECONDS)
.pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
.untilAsserted(() -> {
- ObjectNode telemetry1 = getLatestTelemetry(asset1.getId(), "temperatureComputed");
- ObjectNode telemetry2 = getLatestTelemetry(asset2.getId(), "temperatureComputed");
+ ObjectNode telemetry1 = getLatestTelemetry(asset1.getId(), "temperatureComputed,humidityComputed");
+ ObjectNode telemetry2 = getLatestTelemetry(asset2.getId(), "temperatureComputed,humidityComputed");
assertThat(telemetry1).isNotNull();
assertThat(telemetry2).isNotNull();
assertThat(telemetry1.get("temperatureComputed").get(0).get("value")).isEqualTo(NullNode.instance);
+ assertThat(telemetry1.get("humidityComputed").get(0).get("value")).isEqualTo(NullNode.instance);
+
assertThat(telemetry2.get("temperatureComputed").get(0).get("ts").asText()).isEqualTo(Long.toString(newTs));
assertThat(telemetry2.get("temperatureComputed").get(0).get("value").asDouble()).isEqualTo(25);
+ // TS for humidity is not updated -> expected
+ assertThat(telemetry2.get("humidityComputed").get(0).get("ts").asText()).isEqualTo(Long.toString(ts));
+ assertThat(telemetry2.get("humidityComputed").get(0).get("value").asDouble()).isEqualTo(85);
});
+
+ Asset asset3 = createAsset("Propagated Asset 3", null);
+ EntityRelation rel3 = new EntityRelation(asset3.getId(), device.getId(), EntityRelation.CONTAINS_TYPE);
+ doPost("/api/relation", rel3).andExpect(status().isOk());
+
+ // --- Assert propagated calculation (arguments-only mode after update) ---
+ await().alias("propagation args-only to new entity after relation creation")
+ .atMost(TIMEOUT, TimeUnit.SECONDS)
+ .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
+ .untilAsserted(() -> {
+ ObjectNode telemetry = getLatestTelemetry(asset3.getId(), "temperatureComputed,humidityComputed");
+ assertThat(telemetry).isNotNull();
+ assertThat(telemetry.get("temperatureComputed").get(0).get("ts").asText()).isEqualTo(Long.toString(newTs));
+ assertThat(telemetry.get("temperatureComputed").get(0).get("value").asDouble()).isEqualTo(25);
+ assertThat(telemetry.get("humidityComputed").get(0).get("ts").asText()).isEqualTo(Long.toString(newTs));
+ assertThat(telemetry.get("humidityComputed").get(0).get("value").asDouble()).isEqualTo(85);
+ });
+
}
@Test
@@ -1282,6 +1312,83 @@ public class CalculatedFieldIntegrationTest extends CalculatedFieldControllerTes
});
}
+ @Test
+ public void testCalculatedFieldWhenBatchOfTelemetrySent() throws Exception {
+ Device testDevice = createDevice("Test device", "1234567890");
+ long now = System.currentTimeMillis();
+ doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode(String.format("{\"ts\": %s, \"values\": {\"a\":5, \"b\":10}}", now - TimeUnit.MINUTES.toMillis(3))));
+ doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode(String.format("{\"ts\": %s, \"values\": {\"b\":20}}", now - TimeUnit.MINUTES.toMillis(1))));
+
+ CalculatedField calculatedField = new CalculatedField();
+ calculatedField.setEntityId(testDevice.getId());
+ calculatedField.setType(CalculatedFieldType.SCRIPT);
+ calculatedField.setName("Script CF");
+ calculatedField.setDebugSettings(DebugSettings.all());
+
+ ScriptCalculatedFieldConfiguration config = new ScriptCalculatedFieldConfiguration();
+
+ ReferencedEntityKey refEntityKeyA = new ReferencedEntityKey("a", ArgumentType.TS_LATEST, null);
+ Argument argumentA = new Argument();
+ argumentA.setRefEntityKey(refEntityKeyA);
+ Argument argumentB = new Argument();
+ ReferencedEntityKey refEntityKeyB = new ReferencedEntityKey("b", ArgumentType.TS_ROLLING, null);
+ argumentB.setTimeWindow(TimeUnit.MINUTES.toMillis(10));
+ argumentB.setLimit(1000);
+ argumentB.setRefEntityKey(refEntityKeyB);
+ config.setArguments(Map.of("a", argumentA, "b", argumentB));
+ config.setExpression("""
+ return {
+ "latestA": a,
+ "avgB": b.avg
+ };
+ """);
+
+ config.setOutput(new TimeSeriesOutput());
+
+ calculatedField.setConfiguration(config);
+
+ doPost("/api/calculatedField", calculatedField, CalculatedField.class);
+
+ await().alias("create CF -> perform initial calculation").atMost(TIMEOUT, TimeUnit.SECONDS)
+ .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
+ .untilAsserted(() -> {
+ ObjectNode result = getLatestTelemetry(testDevice.getId(), "latestA", "avgB");
+ assertThat(result).isNotNull();
+ assertThat(result.get("latestA").get(0).get("value").asText()).isEqualTo("5");
+ assertThat(result.get("avgB").get(0).get("value").asText()).isEqualTo("15.0");
+ });
+
+ doPost("/api/plugins/telemetry/DEVICE/" + testDevice.getUuidId() + "/timeseries/" + DataConstants.SERVER_SCOPE, JacksonUtil.toJsonNode(String.format("""
+ [{
+ "ts": %s,
+ "values": {
+ "a": 6,
+ "b": 100
+ }
+ }, {
+ "ts": %s,
+ "values": {
+ "a": 7,
+ "b": 200
+ }
+ }, {
+ "ts": %s,
+ "values": {
+ "a": 8,
+ "b": 300
+ }
+ }]""", now - TimeUnit.MINUTES.toMillis(2), now, now - TimeUnit.MINUTES.toMillis(5))));
+
+ await().alias("update telemetry -> recalculate state").atMost(TIMEOUT, TimeUnit.SECONDS)
+ .pollInterval(POLL_INTERVAL, TimeUnit.SECONDS)
+ .untilAsserted(() -> {
+ ObjectNode result = getLatestTelemetry(testDevice.getId(), "latestA", "avgB");
+ assertThat(result).isNotNull();
+ assertThat(result.get("latestA").get(0).get("value").asText()).isEqualTo("7");
+ assertThat(result.get("avgB").get(0).get("value").asText()).isEqualTo("126.0");
+ });
+ }
+
@Test
public void testSimpleCalculatedFieldWhenSkipRuleEngineOutputProcessing() throws Exception {
Device testDevice = createDevice("Test device", "1234567890");
diff --git a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
index 80e79280df..b9c6e17ded 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AbstractWebTest.java
@@ -1209,7 +1209,7 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
Map statesMap = (Map) ReflectionTestUtils.getField(processor, "states");
Awaitility.await("CF state for entity actor ready to refresh dynamic arguments").atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> {
CalculatedFieldState calculatedFieldState = statesMap.get(cfId);
- boolean isReady = calculatedFieldState != null && ((GeofencingCalculatedFieldState) calculatedFieldState).getLastDynamicArgumentsRefreshTs() <
+ boolean isReady = calculatedFieldState != null && ((GeofencingCalculatedFieldState) calculatedFieldState).getLastScheduledRefreshTs() <
System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(scheduledUpdateInterval);
log.warn("entityId {}, cfId {}, state ready to refresh == {}", entityId, cfId, isReady);
return isReady;
@@ -1441,7 +1441,8 @@ public abstract class AbstractWebTest extends AbstractInMemoryStorageTest {
EntityType entityType,
List entities,
List names) throws Exception {
- return doGetTypedWithPageLink("/api/calculatedFields?type=" + type + "&" +
+ return doGetTypedWithPageLink("/api/calculatedFields?" +
+ (type != null ? "types=" + type + "&" : "") +
(entityType != null ? "entityType=" + entityType + "&" : "") +
(entities != null ? "entities=" + String.join(",",
entities.stream().map(UUID::toString).toList()) + "&" : "") +
diff --git a/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java
index e160fff59e..d039d7a26d 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AssetControllerTest.java
@@ -50,7 +50,7 @@ import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.relation.EntityRelation;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.dao.asset.AssetDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.service.DaoSqlTest;
diff --git a/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java
index 2691352d01..a1efe16381 100644
--- a/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/AssetProfileControllerTest.java
@@ -42,13 +42,17 @@ import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.rule.RuleChain;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.dao.asset.AssetProfileDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.service.DaoSqlTest;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Function;
import java.util.stream.Collectors;
import static org.hamcrest.Matchers.containsString;
@@ -195,6 +199,38 @@ public class AssetProfileControllerTest extends AbstractControllerTest {
Assert.assertEquals(savedAssetProfile.getName(), foundAssetProfileInfo.getName());
}
+ @Test
+ public void testFindAssetProfileInfoByIds() throws Exception {
+ List assetProfiles = new ArrayList<>();
+ for (int i = 0; i < 20; i++) {
+ AssetProfile assetProfile = this.createAssetProfile("Asset Profile" + i);
+ assetProfile.setTenantId(savedTenant.getId());
+ assetProfiles.add(doPost("/api/assetProfile", assetProfile, AssetProfileInfo.class));
+ }
+
+ List expected = assetProfiles.subList(5, 15);
+
+ String idsParam = expected.stream()
+ .map(ap -> ap.getId().getId().toString())
+ .collect(Collectors.joining(","));
+ AssetProfileInfo[] foundAssetProfileInfos = doGet("/api/assetProfileInfos?assetProfileIds=" + idsParam, AssetProfileInfo[].class);
+
+ Assert.assertNotNull(foundAssetProfileInfos);
+ Assert.assertEquals(expected.size(), foundAssetProfileInfos.length);
+
+ Map infoById = Arrays.stream(foundAssetProfileInfos)
+ .collect(Collectors.toMap(info -> info.getId().getId(), Function.identity()));
+
+ for (AssetProfileInfo assetProfileInfo : expected) {
+ UUID id = assetProfileInfo.getId().getId();
+ AssetProfileInfo info = infoById.get(id);
+ Assert.assertNotNull("AssetProfileInfo not found for id " + id, info);
+
+ Assert.assertEquals(assetProfileInfo.getId(), info.getId());
+ Assert.assertEquals(assetProfileInfo.getName(), info.getName());
+ }
+ }
+
@Test
public void whenGetAssetProfileInfoById_thenPermissionsAreChecked() throws Exception {
AssetProfile assetProfile = createAssetProfile("Asset profile 1");
diff --git a/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java
index 33f6bfa250..cc9098d492 100644
--- a/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/CalculatedFieldControllerTest.java
@@ -259,6 +259,8 @@ public class CalculatedFieldControllerTest extends AbstractControllerTest {
List allCalculatedFields = getCalculatedFields(CalculatedFieldType.SIMPLE,
null, null, null);
assertThat(allCalculatedFields).contains(deviceCalculatedField, profileCalculatedField);
+ allCalculatedFields = getCalculatedFields(null, null, null, null);
+ assertThat(allCalculatedFields).contains(deviceCalculatedField, profileCalculatedField);
List profileLevelCalculatedFields = getCalculatedFields(CalculatedFieldType.SIMPLE,
EntityType.DEVICE_PROFILE, null, null);
diff --git a/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java
index f4e91f993e..be99343459 100644
--- a/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/CustomerControllerTest.java
@@ -44,12 +44,17 @@ import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.dao.customer.CustomerDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.service.DaoSqlTest;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsString;
@@ -261,6 +266,40 @@ public class CustomerControllerTest extends AbstractControllerTest {
.andExpect(status().isOk());
}
+ @Test
+ public void testFindCustomersByIds() throws Exception {
+ List savedCustomers = new ArrayList<>();
+ for (int i = 0; i < 5; i++) {
+ Customer customer = new Customer();
+ customer.setTitle("My customer " + i);
+ savedCustomers.add(doPost("/api/customer", customer, Customer.class));
+ }
+
+ String idsParam = savedCustomers.stream()
+ .map(c -> c.getId().getId().toString())
+ .collect(Collectors.joining(","));
+
+ Customer[] foundCustomers = doGet("/api/customers?customerIds=" + idsParam, Customer[].class);
+
+ Assert.assertNotNull(foundCustomers);
+ Assert.assertEquals(savedCustomers.size(), foundCustomers.length);
+
+ Map foundById = Arrays.stream(foundCustomers)
+ .collect(Collectors.toMap(c -> c.getId().getId(), Function.identity()));
+
+ for (Customer savedCustomer : savedCustomers) {
+ UUID id = savedCustomer.getId().getId();
+ Customer foundCustomer = foundById.get(id);
+ Assert.assertNotNull("Customer not found for id " + id, foundCustomer);
+ Assert.assertEquals(savedCustomer, foundCustomer);
+ }
+
+ for (Customer savedCustomer : savedCustomers) {
+ doDelete("/api/customer/" + savedCustomer.getId().getId().toString())
+ .andExpect(status().isOk());
+ }
+ }
+
@Test
public void testDeleteCustomer() throws Exception {
Customer customer = new Customer();
diff --git a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
index a73bc3befb..712b9f1472 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DashboardControllerTest.java
@@ -51,13 +51,16 @@ import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.dao.dashboard.DashboardDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.service.DaoSqlTest;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Base64;
import java.util.List;
import java.util.Map;
+import java.util.UUID;
+import java.util.function.Function;
import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;
@@ -155,6 +158,42 @@ public class DashboardControllerTest extends AbstractControllerTest {
Assert.assertEquals(savedDashboard, foundDashboard);
}
+ @Test
+ public void testFindDashboardInfosByIds() throws Exception {
+ List dashboards = new ArrayList<>();
+ for (int i = 0; i < 20; i++) {
+ Dashboard dashboard = new Dashboard();
+ dashboard.setTitle("My dashboard " + i);
+ dashboards.add(doPost("/api/dashboard", dashboard, Dashboard.class));
+ }
+
+ List expected = dashboards.subList(5, 15);
+
+ String idsParam = expected.stream()
+ .map(d -> d.getId().getId().toString())
+ .collect(Collectors.joining(","));
+
+ DashboardInfo[] result = doGet(
+ "/api/dashboards?dashboardIds=" + idsParam,
+ DashboardInfo[].class
+ );
+
+ Assert.assertNotNull(result);
+ Assert.assertEquals(expected.size(), result.length);
+
+ Map infoById = Arrays.stream(result)
+ .collect(Collectors.toMap(info -> info.getId().getId(), Function.identity()));
+
+ for (Dashboard dashboard : expected) {
+ UUID id = dashboard.getId().getId();
+ DashboardInfo info = infoById.get(id);
+ Assert.assertNotNull("DashboardInfo not found for id " + id, info);
+
+ Assert.assertEquals(dashboard.getId(), info.getId());
+ Assert.assertEquals(dashboard.getTitle(), info.getTitle());
+ }
+ }
+
@Test
public void testDeleteDashboard() throws Exception {
Dashboard dashboard = new Dashboard();
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
index 78679948ab..efbf18d5f5 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceControllerTest.java
@@ -72,7 +72,7 @@ import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportColumn
import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportRequest;
import org.thingsboard.server.common.data.sync.ie.importing.csv.BulkImportResult;
import org.thingsboard.server.dao.device.DeviceDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.exception.DeviceCredentialsValidationException;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.service.DaoSqlTest;
diff --git a/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java
index 320e3815f6..970461480d 100644
--- a/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/DeviceProfileControllerTest.java
@@ -52,13 +52,17 @@ import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.rule.RuleChain;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.dao.device.DeviceProfileDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.service.DaoSqlTest;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Function;
import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;
@@ -214,6 +218,42 @@ public class DeviceProfileControllerTest extends AbstractControllerTest {
Assert.assertEquals(savedDeviceProfile.getType(), foundDeviceProfileInfo.getType());
}
+ @Test
+ public void testFindDeviceProfileInfosByIds() throws Exception {
+ List deviceProfiles = new ArrayList<>();
+ for (int i = 0; i < 20; i++) {
+ DeviceProfile deviceProfile = this.createDeviceProfile("Device Profile " + i);
+ deviceProfiles.add(saveDeviceProfile(deviceProfile));
+ }
+
+ List expected = deviceProfiles.subList(5, 15);
+
+ String idsParam = expected.stream()
+ .map(dp -> dp.getId().getId().toString())
+ .collect(Collectors.joining(","));
+
+ DeviceProfileInfo[] result = doGet(
+ "/api/deviceProfileInfos?deviceProfileIds=" + idsParam,
+ DeviceProfileInfo[].class
+ );
+
+ Assert.assertNotNull(result);
+ Assert.assertEquals(expected.size(), result.length);
+
+ Map infoById = Arrays.stream(result)
+ .collect(Collectors.toMap(info -> info.getId().getId(), Function.identity()));
+
+ for (DeviceProfile dp : expected) {
+ UUID id = dp.getId().getId();
+ DeviceProfileInfo info = infoById.get(id);
+ Assert.assertNotNull("DeviceProfileInfo not found for id " + id, info);
+
+ Assert.assertEquals(dp.getId(), info.getId());
+ Assert.assertEquals(dp.getName(), info.getName());
+ Assert.assertEquals(dp.getType(), info.getType());
+ }
+ }
+
@Test
public void whenGetDeviceProfileInfoById_thenPermissionsAreChecked() throws Exception {
DeviceProfile deviceProfile = createDeviceProfile("Device profile 1", null);
diff --git a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
index f1d3ef1d52..217bba43bb 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EdgeControllerTest.java
@@ -72,7 +72,7 @@ import org.thingsboard.server.common.data.security.DeviceCredentials;
import org.thingsboard.server.common.data.security.UserCredentials;
import org.thingsboard.server.common.data.security.model.JwtSettings;
import org.thingsboard.server.dao.edge.EdgeDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.service.DaoSqlTest;
import org.thingsboard.server.edge.imitator.EdgeImitator;
diff --git a/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
index 167048a969..fdff81799f 100644
--- a/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/EntityViewControllerTest.java
@@ -63,16 +63,19 @@ import org.thingsboard.server.common.data.query.EntityKeyType;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.common.data.security.DeviceCredentials;
import org.thingsboard.server.dao.entityview.EntityViewDao;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.model.ModelConstants;
import org.thingsboard.server.dao.service.DaoSqlTest;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.UUID;
import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
import java.util.stream.Collectors;
import static java.util.concurrent.TimeUnit.HOURS;
@@ -148,6 +151,36 @@ public class EntityViewControllerTest extends AbstractControllerTest {
assertEquals(savedView, foundView);
}
+ @Test
+ public void testFindEntityViewByIds() throws Exception {
+ List assetProfiles = new ArrayList<>();
+ for (int i = 0; i < 20; i++) {
+ assetProfiles.add(getNewSavedEntityView("Test entity view " + i));
+ }
+
+ List expected = assetProfiles.subList(5, 15);
+
+ String idsParam = expected.stream()
+ .map(ap -> ap.getId().getId().toString())
+ .collect(Collectors.joining(","));
+ EntityView[] foundEntityViews = doGet("/api/entityViews?entityViewIds=" + idsParam, EntityView[].class);
+
+ Assert.assertNotNull(foundEntityViews);
+ Assert.assertEquals(expected.size(), foundEntityViews.length);
+
+ Map infoById = Arrays.stream(foundEntityViews)
+ .collect(Collectors.toMap(info -> info.getId().getId(), Function.identity()));
+
+ for (EntityView entityView : expected) {
+ UUID id = entityView.getId().getId();
+ EntityView view = infoById.get(id);
+ Assert.assertNotNull("Entity view not found for id " + id, view);
+
+ Assert.assertEquals(entityView.getId(), view.getId());
+ Assert.assertEquals(entityView.getName(), view.getName());
+ }
+ }
+
@Test
public void testSaveEntityView() throws Exception {
String name = "Test entity view";
diff --git a/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java
index 3fc839996c..7df2b84c43 100644
--- a/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/OtaPackageControllerTest.java
@@ -37,7 +37,7 @@ import org.thingsboard.server.common.data.id.DeviceProfileId;
import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.security.Authority;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.service.DaoSqlTest;
import java.nio.ByteBuffer;
diff --git a/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java
index a6a022347f..a02332812b 100644
--- a/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/RuleChainControllerTest.java
@@ -47,12 +47,17 @@ import org.thingsboard.server.common.data.rule.RuleChainMetaData;
import org.thingsboard.server.common.data.rule.RuleChainType;
import org.thingsboard.server.common.data.rule.RuleNode;
import org.thingsboard.server.common.data.security.Authority;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.rule.RuleChainDao;
import org.thingsboard.server.dao.service.DaoSqlTest;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;
import static org.hamcrest.Matchers.containsString;
@@ -231,6 +236,44 @@ public class RuleChainControllerTest extends AbstractControllerTest {
Assert.assertEquals(savedRuleChain, foundRuleChain);
}
+ @Test
+ public void testFindRuleChainsByIds() throws Exception {
+ List ruleChains = new ArrayList<>();
+ for (int i = 0; i < 20; i++) {
+ RuleChain ruleChain = new RuleChain();
+ ruleChain.setName("RuleChain " + i);
+ ruleChains.add(doPost("/api/ruleChain", ruleChain, RuleChain.class));
+ }
+
+ List expected = ruleChains.subList(5, 15);
+
+ String idsParam = expected.stream()
+ .map(rc -> rc.getId().getId().toString())
+ .collect(Collectors.joining(","));
+
+ RuleChain[] result = doGet(
+ "/api/ruleChains?ruleChainIds=" + idsParam,
+ RuleChain[].class
+ );
+
+ Assert.assertNotNull(result);
+ Assert.assertEquals(expected.size(), result.length);
+
+ Map rcById = Arrays.stream(result)
+ .collect(Collectors.toMap(rc -> rc.getId().getId(), Function.identity()));
+
+ for (RuleChain rc : expected) {
+ UUID id = rc.getId().getId();
+ RuleChain found = rcById.get(id);
+ Assert.assertNotNull("RuleChain not found for id " + id, found);
+
+ Assert.assertEquals(rc.getId(), found.getId());
+ Assert.assertEquals(rc.getName(), found.getName());
+ Assert.assertEquals(rc.getTenantId(), found.getTenantId());
+ }
+ }
+
+
@Test
public void testDeleteRuleChain() throws Exception {
RuleChain ruleChain = new RuleChain();
diff --git a/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java
index 0875551112..5e880fb957 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TbResourceControllerTest.java
@@ -48,7 +48,7 @@ import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.common.data.widget.WidgetType;
import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.service.DaoSqlTest;
import java.util.ArrayList;
diff --git a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
index 6f68b97619..4b439ab4f9 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantControllerTest.java
@@ -68,6 +68,7 @@ import org.thingsboard.server.queue.discovery.PartitionService;
import org.thingsboard.server.queue.discovery.QueueKey;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashMap;
@@ -77,6 +78,7 @@ import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicReference;
import java.util.function.Consumer;
+import java.util.function.Function;
import java.util.function.Predicate;
import java.util.stream.Collectors;
@@ -187,6 +189,42 @@ public class TenantControllerTest extends AbstractControllerTest {
deleteTenant(savedTenant.getId());
}
+ @Test
+ public void testFindTenantsByIds() throws Exception {
+ loginSysAdmin();
+
+ List savedTenants = new ArrayList<>();
+ for (int i = 0; i < 10; i++) {
+ Tenant tenant = new Tenant();
+ tenant.setTitle("My tenant " + i);
+ savedTenants.add(saveTenant(tenant));
+ }
+
+ String idsParam = savedTenants.stream()
+ .map(t -> t.getId().getId().toString())
+ .collect(Collectors.joining(","));
+
+ Tenant[] foundTenants = doGet("/api/tenants?tenantIds=" + idsParam, Tenant[].class);
+
+ Assert.assertNotNull(foundTenants);
+ Assert.assertEquals(savedTenants.size(), foundTenants.length);
+
+ Map foundById = Arrays.stream(foundTenants)
+ .collect(Collectors.toMap(t -> t.getId().getId(), Function.identity()));
+
+ for (Tenant savedTenant : savedTenants) {
+ UUID id = savedTenant.getId().getId();
+ Tenant foundTenant = foundById.get(id);
+ Assert.assertNotNull("Tenant not found for id " + id, foundTenant);
+ Assert.assertEquals(savedTenant, foundTenant);
+ }
+
+ for (Tenant savedTenant : savedTenants) {
+ deleteTenant(savedTenant.getId());
+ }
+ }
+
+
@Test
public void testFindTenantInfoById() throws Exception {
loginSysAdmin();
diff --git a/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
index 8f83f2c186..4862a00125 100644
--- a/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/TenantProfileControllerTest.java
@@ -42,8 +42,12 @@ import org.thingsboard.server.queue.TbQueueCallback;
import java.lang.reflect.Field;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Function;
import java.util.stream.Collectors;
import static org.hamcrest.Matchers.containsString;
@@ -120,6 +124,43 @@ public class TenantProfileControllerTest extends AbstractControllerTest {
Assert.assertEquals(savedTenantProfile.getName(), foundTenantProfileInfo.getName());
}
+ @Test
+ public void testFindTenantProfilesByIds() throws Exception {
+ loginSysAdmin();
+ List tenantProfiles = new ArrayList<>();
+ for (int i = 0; i < 10; i++) {
+ TenantProfile tenantProfile = this.createTenantProfile("Tenant Profile " + i);
+ tenantProfiles.add(doPost("/api/tenantProfile", tenantProfile, TenantProfile.class));
+ }
+
+ List expected = tenantProfiles.subList(2, 7);
+
+ String idsParam = expected.stream()
+ .map(tp -> tp.getId().getId().toString())
+ .collect(Collectors.joining(","));
+
+ TenantProfile[] result = doGet(
+ "/api/tenantProfiles?ids=" + idsParam,
+ TenantProfile[].class
+ );
+
+ Assert.assertNotNull(result);
+ Assert.assertEquals(expected.size(), result.length);
+
+ Map tpById = Arrays.stream(result)
+ .collect(Collectors.toMap(tp -> tp.getId().getId(), Function.identity()));
+
+ for (TenantProfile tp : expected) {
+ UUID id = tp.getId().getId();
+ TenantProfile found = tpById.get(id);
+ Assert.assertNotNull("TenantProfile not found for id " + id, found);
+
+ Assert.assertEquals(tp.getId(), found.getId());
+ Assert.assertEquals(tp.getName(), found.getName());
+ }
+ }
+
+
@Test
public void testFindDefaultTenantProfileInfo() throws Exception {
loginSysAdmin();
diff --git a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
index 28d43699fd..8fef7f3e1d 100644
--- a/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/UserControllerTest.java
@@ -50,13 +50,17 @@ import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.common.data.settings.StarredDashboardInfo;
import org.thingsboard.server.common.data.settings.UserDashboardsInfo;
import org.thingsboard.server.dao.device.DeviceService;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.service.DaoSqlTest;
import org.thingsboard.server.dao.user.UserDao;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Function;
import java.util.stream.Collectors;
import static org.assertj.core.api.Assertions.assertThat;
@@ -263,6 +267,37 @@ public class UserControllerTest extends AbstractControllerTest {
Assert.assertEquals(savedUser, foundUser);
}
+ @Test
+ public void testFindUsersByIds() throws Exception {
+ loginTenantAdmin();
+ List savedUsers = new ArrayList<>();
+ for (int i = 0; i < 10; i++) {
+ User user = createTenantAdminUser();
+ savedUsers.add(doPost("/api/user", user, User.class));
+ }
+
+ String idsParam = savedUsers.stream()
+ .map(u -> u.getId().getId().toString())
+ .collect(Collectors.joining(","));
+
+ User[] foundUsers = doGet("/api/users?userIds=" + idsParam, User[].class);
+
+ Assert.assertNotNull(foundUsers);
+ Assert.assertEquals(savedUsers.size(), foundUsers.length);
+
+ Map foundById = Arrays.stream(foundUsers)
+ .collect(Collectors.toMap(u -> u.getId().getId(), Function.identity()));
+
+ for (User savedUser : savedUsers) {
+ User foundUser = foundById.get(savedUser.getId().getId());
+ Assert.assertNotNull("User not found for id " + savedUser.getId().getId(), foundUser);
+
+ foundUser.setAdditionalInfo(savedUser.getAdditionalInfo());
+ Assert.assertEquals(savedUser, foundUser);
+ }
+ }
+
+
@Test
public void testSaveUserWithSameEmail() throws Exception {
loginSysAdmin();
diff --git a/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java b/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
index 3440f26ea8..f84e5eb6e7 100644
--- a/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
+++ b/application/src/test/java/org/thingsboard/server/controller/WidgetsBundleControllerTest.java
@@ -29,12 +29,17 @@ import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.common.data.widget.WidgetsBundle;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.service.DaoSqlTest;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.Collections;
import java.util.List;
+import java.util.Map;
+import java.util.UUID;
+import java.util.function.Function;
+import java.util.stream.Collectors;
import static org.hamcrest.Matchers.containsString;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -150,6 +155,37 @@ public class WidgetsBundleControllerTest extends AbstractControllerTest {
Assert.assertEquals(savedWidgetsBundle, foundWidgetsBundle);
}
+ @Test
+ public void testFindWidgetsBundlesByIds() throws Exception {
+ List savedWidgetsBundles = new ArrayList<>();
+ for (int i = 0; i < 10; i++) {
+ WidgetsBundle widgetsBundle = new WidgetsBundle();
+ widgetsBundle.setTitle("My widgets bundle " + i);
+ savedWidgetsBundles.add(doPost("/api/widgetsBundle", widgetsBundle, WidgetsBundle.class));
+ }
+
+ String idsParam = savedWidgetsBundles.stream()
+ .map(wb -> wb.getId().getId().toString())
+ .collect(Collectors.joining(","));
+
+ WidgetsBundle[] foundWidgetsBundles =
+ doGet("/api/widgetsBundles?widgetsBundleIds=" + idsParam, WidgetsBundle[].class);
+
+ Assert.assertNotNull(foundWidgetsBundles);
+ Assert.assertEquals(savedWidgetsBundles.size(), foundWidgetsBundles.length);
+
+ Map foundById = Arrays.stream(foundWidgetsBundles)
+ .collect(Collectors.toMap(wb -> wb.getId().getId(), Function.identity()));
+
+ for (WidgetsBundle savedWidgetsBundle : savedWidgetsBundles) {
+ UUID id = savedWidgetsBundle.getId().getId();
+ WidgetsBundle foundWidgetsBundle = foundById.get(id);
+ Assert.assertNotNull("WidgetsBundle not found for id " + id, foundWidgetsBundle);
+ Assert.assertEquals(savedWidgetsBundle, foundWidgetsBundle);
+ }
+ }
+
+
@Test
public void testDeleteWidgetsBundle() throws Exception {
WidgetsBundle widgetsBundle = new WidgetsBundle();
diff --git a/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
index 84d879c993..ef11a4dcf8 100644
--- a/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/AbstractEdgeTest.java
@@ -22,6 +22,7 @@ import com.google.protobuf.AbstractMessage;
import com.google.protobuf.InvalidProtocolBufferException;
import com.google.protobuf.MessageLite;
import lombok.extern.slf4j.Slf4j;
+import org.awaitility.Awaitility;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
@@ -102,6 +103,7 @@ import org.thingsboard.server.gen.edge.v1.UserUpdateMsg;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.Optional;
import java.util.TreeMap;
import java.util.UUID;
@@ -738,4 +740,27 @@ abstract public class AbstractEdgeTest extends AbstractControllerTest {
return rpc;
}
+ protected void verifyEdgeDisconnected() {
+ verifyEdgeActiveFlag(false);
+ }
+
+ protected void verifyEdgeConnected() {
+ verifyEdgeActiveFlag(true);
+ }
+
+ private void verifyEdgeActiveFlag(boolean value) {
+ Awaitility.await()
+ .atMost(TIMEOUT, TimeUnit.SECONDS)
+ .until(() -> {
+ List> values = doGetAsyncTyped("/api/plugins/telemetry/EDGE/" + edge.getId() +
+ "/values/attributes/SERVER_SCOPE", new TypeReference<>() {});
+ Optional> activeAttrOpt = values.stream().filter(att -> att.get("key").equals("active")).findFirst();
+ if (activeAttrOpt.isEmpty()) {
+ return false;
+ }
+ Map activeAttr = activeAttrOpt.get();
+ return Boolean.toString(value).equals(activeAttr.get("value").toString());
+ });
+ }
+
}
diff --git a/application/src/test/java/org/thingsboard/server/edge/AiModelEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/AiModelEdgeTest.java
index 30c8448f5b..8daed92a9a 100644
--- a/application/src/test/java/org/thingsboard/server/edge/AiModelEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/AiModelEdgeTest.java
@@ -32,8 +32,11 @@ import org.thingsboard.server.gen.edge.v1.UplinkResponseMsg;
import java.util.Optional;
import java.util.UUID;
+import java.util.concurrent.TimeUnit;
+import static org.awaitility.Awaitility.await;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
+import static org.thingsboard.server.gen.edge.v1.UpdateMsgType.ENTITY_DELETED_RPC_MESSAGE;
@DaoSqlTest
public class AiModelEdgeTest extends AbstractEdgeTest {
@@ -42,7 +45,7 @@ public class AiModelEdgeTest extends AbstractEdgeTest {
private static final String UPDATED_AI_MODEL_NAME = "Updated Edge Test AiModel";
@Test
- public void testAiModel_create_update_delete() throws Exception {
+ public void testAiModel_create_update_delete_fromCloud() throws Exception {
// create AiModel
AiModel aiModel = createSimpleAiModel(DEFAULT_AI_MODEL_NAME);
@@ -91,26 +94,29 @@ public class AiModelEdgeTest extends AbstractEdgeTest {
}
@Test
- public void testSendAiModelToCloud() throws Exception {
- AiModel aiModel = createSimpleAiModel(DEFAULT_AI_MODEL_NAME);
- UUID uuid = Uuids.timeBased();
- UplinkMsg uplinkMsg = getUplinkMsg(uuid, aiModel, UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE);
-
- checkAiModelOnCloud(uplinkMsg, uuid, aiModel.getName());
- }
-
- @Test
- public void testUpdateAiModelNameOnCloud() throws Exception {
+ public void testAiModel_create_update_delete_toCloud() throws Exception {
+ // create
AiModel aiModel = createSimpleAiModel(DEFAULT_AI_MODEL_NAME);
UUID uuid = Uuids.timeBased();
UplinkMsg uplinkMsg = getUplinkMsg(uuid, aiModel, UpdateMsgType.ENTITY_CREATED_RPC_MESSAGE);
checkAiModelOnCloud(uplinkMsg, uuid, aiModel.getName());
+ // update
aiModel.setName(UPDATED_AI_MODEL_NAME);
UplinkMsg updatedUplinkMsg = getUplinkMsg(uuid, aiModel, UpdateMsgType.ENTITY_UPDATED_RPC_MESSAGE);
checkAiModelOnCloud(updatedUplinkMsg, uuid, aiModel.getName());
+
+ // delete
+ UplinkMsg deleteUplinkMsg = getDeleteUplinkMsg(uuid);
+ edgeImitator.expectResponsesAmount(1);
+ edgeImitator.sendUplinkMsg(deleteUplinkMsg);
+ Assert.assertTrue(edgeImitator.waitForResponses());
+
+ await().atMost(30, TimeUnit.SECONDS).untilAsserted(() ->
+ doGet("/api/ai/model/" + uuid, AiModel.class, status().isNotFound())
+ );
}
@Test
@@ -164,6 +170,20 @@ public class AiModelEdgeTest extends AbstractEdgeTest {
return aiModel;
}
+ private UplinkMsg getDeleteUplinkMsg(UUID uuid) throws InvalidProtocolBufferException {
+ UplinkMsg.Builder upLinkMsgBuilder = UplinkMsg.newBuilder();
+ AiModelUpdateMsg.Builder aiModelDeleteMsgBuilder = AiModelUpdateMsg.newBuilder();
+ aiModelDeleteMsgBuilder.setMsgType(ENTITY_DELETED_RPC_MESSAGE);
+ aiModelDeleteMsgBuilder.setIdMSB(uuid.getMostSignificantBits());
+ aiModelDeleteMsgBuilder.setIdLSB(uuid.getLeastSignificantBits());
+ testAutoGeneratedCodeByProtobuf(aiModelDeleteMsgBuilder);
+
+ upLinkMsgBuilder.addAiModelUpdateMsg(aiModelDeleteMsgBuilder.build());
+ testAutoGeneratedCodeByProtobuf(upLinkMsgBuilder);
+
+ return upLinkMsgBuilder.build();
+ }
+
private UplinkMsg getUplinkMsg(UUID uuid, AiModel aiModel, UpdateMsgType updateMsgType) throws InvalidProtocolBufferException {
UplinkMsg.Builder uplinkMsgBuilder = UplinkMsg.newBuilder();
AiModelUpdateMsg.Builder aiModelUpdateMsgBuilder = AiModelUpdateMsg.newBuilder();
diff --git a/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java
index 8d79416022..380dec8015 100644
--- a/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/DeviceEdgeTest.java
@@ -893,18 +893,7 @@ public class DeviceEdgeTest extends AbstractEdgeTest {
ObjectNode attributes = JacksonUtil.newObjectNode();
attributes.put("active", true);
doPost("/api/plugins/telemetry/EDGE/" + edge.getId() + "/attributes/" + DataConstants.SERVER_SCOPE, attributes);
- Awaitility.await()
- .atMost(TIMEOUT, TimeUnit.SECONDS)
- .until(() -> {
- List> values = doGetAsyncTyped("/api/plugins/telemetry/EDGE/" + edge.getId() +
- "/values/attributes/SERVER_SCOPE", new TypeReference<>() {});
- Optional> activeAttrOpt = values.stream().filter(att -> att.get("key").equals("active")).findFirst();
- if (activeAttrOpt.isEmpty()) {
- return false;
- }
- Map activeAttr = activeAttrOpt.get();
- return "true".equals(activeAttr.get("value").toString());
- });
+ verifyEdgeConnected();
}
}
diff --git a/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java
index a29d7a4672..cbac977835 100644
--- a/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/DeviceProfileEdgeTest.java
@@ -151,14 +151,20 @@ public class DeviceProfileEdgeTest extends AbstractEdgeTest {
// delete profile when edge is offline
edgeImitator.disconnect();
+ verifyEdgeDisconnected();
+
doDelete("/api/deviceProfile/" + deviceProfile.getUuidId())
.andExpect(status().isOk());
- edgeImitator.connect();
// 25 sync message
- // + 2 RuleChain and RuleChainMetadata
- // + 1 delete DeviceProfile
+ // + 1 RuleChain Added
+ // + 1 RuleChainMetadata Added
+ // + 1 DeviceProfile Delete
edgeImitator.expectMessageAmount(SYNC_MESSAGE_COUNT + 3);
+
+ edgeImitator.connect();
+ verifyEdgeConnected();
+
Assert.assertTrue(edgeImitator.waitForMessages());
latestMessage = edgeImitator.getLatestMessage();
diff --git a/application/src/test/java/org/thingsboard/server/edge/EdgeStatsIntegrationTest.java b/application/src/test/java/org/thingsboard/server/edge/EdgeStatsIntegrationTest.java
new file mode 100644
index 0000000000..71722ad2a8
--- /dev/null
+++ b/application/src/test/java/org/thingsboard/server/edge/EdgeStatsIntegrationTest.java
@@ -0,0 +1,148 @@
+/**
+ * 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.edge;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import lombok.extern.slf4j.Slf4j;
+import org.junit.Assert;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.thingsboard.common.util.JacksonUtil;
+import org.thingsboard.server.common.data.Customer;
+import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.asset.Asset;
+import org.thingsboard.server.common.data.edge.Edge;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.kv.TsKvEntry;
+import org.thingsboard.server.dao.edge.stats.EdgeStatsCounterService;
+import org.thingsboard.server.dao.edge.stats.EdgeStatsKey;
+import org.thingsboard.server.dao.edge.stats.MsgCounters;
+import org.thingsboard.server.dao.service.DaoSqlTest;
+import org.thingsboard.server.service.edge.stats.EdgeStatsService;
+
+import java.time.Duration;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.TimeUnit;
+
+import static org.awaitility.Awaitility.await;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.thingsboard.server.dao.edge.stats.EdgeStatsKey.DOWNLINK_MSGS_ADDED;
+import static org.thingsboard.server.dao.edge.stats.EdgeStatsKey.DOWNLINK_MSGS_PERMANENTLY_FAILED;
+import static org.thingsboard.server.dao.edge.stats.EdgeStatsKey.DOWNLINK_MSGS_PUSHED;
+import static org.thingsboard.server.dao.edge.stats.EdgeStatsKey.DOWNLINK_MSGS_TMP_FAILED;
+
+@DaoSqlTest
+@Slf4j
+public class EdgeStatsIntegrationTest extends AbstractEdgeTest {
+
+ private static final String STATISTICS_DEVICE_PROFILE = "STATISTICS";
+
+ private static final long EXPECTED_MSGS_ADDED = 6L;
+ private static final long EXPECTED_MSGS_PUSHED = 6L;
+ private static final long EXPECTED_MSGS_PERMANENTLY_FAILED = 0L;
+ private static final long EXPECTED_MSGS_TMP_FAILED = 0L;
+
+ @Autowired
+ private EdgeStatsService edgeStatsService;
+ @Autowired
+ private EdgeStatsCounterService statsCounterService;
+
+ @Test
+ public void testReportStats() throws Exception {
+ // GIVEN
+ simulateEdgeEventsAddedDownlinkPushed();
+
+ // Await Edge Counters Updated
+ await().atMost(10, TimeUnit.SECONDS).pollInterval(Duration.ofMillis(200)).untilAsserted(() -> {
+ MsgCounters counters = statsCounterService.getMsgCountersByEdge().get(edge.getId());
+ assertEquals(EXPECTED_MSGS_ADDED, counters.getMsgsAdded().get());
+ assertEquals(EXPECTED_MSGS_PUSHED, counters.getMsgsPushed().get());
+ assertEquals(EXPECTED_MSGS_PERMANENTLY_FAILED, counters.getMsgsPermanentlyFailed().get());
+ assertEquals(EXPECTED_MSGS_TMP_FAILED, counters.getMsgsTmpFailed().get());
+ });
+
+ Thread.sleep(1000);
+
+ // WHEN
+ edgeStatsService.reportStats();
+
+ // THEN
+ await().atMost(10, TimeUnit.SECONDS).pollInterval(Duration.ofMillis(200)).untilAsserted(() -> {
+ List actualStats = fetchLatestStats();
+ assertEquals(EXPECTED_MSGS_ADDED, getStatsLongValue(actualStats, DOWNLINK_MSGS_ADDED));
+ assertEquals(EXPECTED_MSGS_PUSHED, getStatsLongValue(actualStats, DOWNLINK_MSGS_PUSHED));
+ assertEquals(EXPECTED_MSGS_PERMANENTLY_FAILED, getStatsLongValue(actualStats, DOWNLINK_MSGS_PERMANENTLY_FAILED));
+ assertEquals(EXPECTED_MSGS_TMP_FAILED, getStatsLongValue(actualStats, DOWNLINK_MSGS_TMP_FAILED));
+ });
+ }
+
+ private long getStatsLongValue(List stats, EdgeStatsKey key) {
+ return stats.stream().filter(e -> e.getKey().equals(key.getKey())).findFirst().get().getLongValue().orElse(0L);
+ }
+
+ private List fetchLatestStats() throws ExecutionException, InterruptedException {
+ return tsService.findLatest(
+ tenantId,
+ edge.getId(),
+ Arrays.stream(EdgeStatsKey.values()).map(EdgeStatsKey::getKey).toList()).get();
+ }
+
+ private void simulateEdgeEventsAddedDownlinkPushed() throws InterruptedException, ExecutionException {
+ statsCounterService.clear(edge.getId());
+
+ // Save device and assign to edge
+ // 2 DOWNLINK_MSGS_ADDED, EdgeEvents: [{DEVICE_PROFILE: ADDED}, {DEVICE: ASSIGNED_TO_EDGE}]
+ // 2 DOWNLINK_MSGS_PUSHED, Downlinks: [{deviceProfileUpdateMsg}, {deviceUpdateMsg, deviceProfileUpdateMsg, deviceCredentialsUpdateMsg}]
+ edgeImitator.expectMessageAmount(4);
+ Device savedDevice = saveDevice("StatisticDevice", STATISTICS_DEVICE_PROFILE);
+ doPost("/api/edge/" + edge.getUuidId() + "/device/" + savedDevice.getUuidId(), Device.class);
+ Assert.assertTrue(edgeImitator.waitForMessages());
+
+ // Save asset and assign to edge
+ // 1 DOWNLINK_MSGS_ADDED, EdgeEvents: [{ASSET: ASSIGNED_TO_EDGE}]
+ // 1 DOWNLINK_MSGS_PUSHED, Downlinks: [{assetUpdateMsg, assetProfileUpdateMsg}]
+ edgeImitator.expectMessageAmount(2);
+ Asset savedAsset = saveAsset("Edge Asset");
+ doPost("/api/edge/" + edge.getUuidId()
+ + "/asset/" + savedAsset.getUuidId(), Asset.class);
+ Assert.assertTrue(edgeImitator.waitForMessages());
+
+ // Create customer and assign edge to the customer
+ // 2 DOWNLINK_MSGS_ADDED, EdgeEvents: [{CUSTOMER: ADDED}, {EDGE: ASSIGNED_TO_CUSTOMER}]
+ // 2 DOWNLINK_MSGS_PUSHED, Downlinks: [{customerUpdateMsg}, {edgeConfiguration}]
+ edgeImitator.expectMessageAmount(2);
+ Customer customer = new Customer();
+ customer.setTitle("Edge Customer");
+ Customer savedCustomer = doPost("/api/customer", customer, Customer.class);
+ doPost("/api/customer/" + savedCustomer.getUuidId()
+ + "/edge/" + edge.getUuidId(), Edge.class);
+ Assert.assertTrue(edgeImitator.waitForMessages());
+
+ // Send device telemetry downlink for the device
+ // 1 DOWNLINK_MSGS_ADDED, EdgeEvents: [{DEVICE: TIMESERIES_UPDATED}]
+ // 1 DOWNLINK_MSGS_PUSHED, Downlinks: [{entityData}]
+ edgeImitator.expectMessageAmount(1);
+ String timeseriesData = "{\"data\":{\"temperature\":25},\"ts\":" + System.currentTimeMillis() + "}";
+ JsonNode timeseriesEntityData = JacksonUtil.toJsonNode(timeseriesData);
+ EdgeEvent edgeEvent = constructEdgeEvent(tenantId, edge.getId(), EdgeEventActionType.TIMESERIES_UPDATED, savedDevice.getId().getId(), EdgeEventType.DEVICE, timeseriesEntityData);
+ edgeEventService.saveAsync(edgeEvent).get();
+ Assert.assertTrue(edgeImitator.waitForMessages());
+ }
+}
diff --git a/application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java b/application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java
index 36d9ed5308..a9ec11e9b1 100644
--- a/application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java
+++ b/application/src/test/java/org/thingsboard/server/edge/TelemetryEdgeTest.java
@@ -223,8 +223,10 @@ public class TelemetryEdgeTest extends AbstractEdgeTest {
device.getId().getId(), EdgeEventType.DEVICE, timeseriesEntityData);
edgeEventService.saveAsync(failedEdgeEvent).get();
+ // add unique body to avoid merge and filter by device id in edge service (mergeAndFilterDownlinkDuplicates)
+ JsonNode uniqueBody = JacksonUtil.toJsonNode("{\"idx\":" + idx + "}");
EdgeEvent successEdgeEvent = constructEdgeEvent(tenantId, edge.getId(), EdgeEventActionType.UPDATED,
- device.getId().getId(), EdgeEventType.DEVICE, null);
+ device.getId().getId(), EdgeEventType.DEVICE, uniqueBody);
edgeEventService.saveAsync(successEdgeEvent).get();
}
diff --git a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingCalculatedFieldStateTest.java b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingCalculatedFieldStateTest.java
index b3ce7bbb44..6a3d57d839 100644
--- a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingCalculatedFieldStateTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingCalculatedFieldStateTest.java
@@ -247,9 +247,8 @@ public class GeofencingCalculatedFieldStateTest {
assertThat(result).isNotNull();
assertThat(result.getType()).isEqualTo(output.getType());
assertThat(result.getScope()).isEqualTo(output.getScope());
- assertThat(result.getResult()).isEqualTo(
+ assertThat(result.getResult().get("values")).isEqualTo(
JacksonUtil.newObjectNode()
- .put("allowedZonesEvent", "ENTERED")
.put("allowedZonesStatus", "INSIDE")
.put("restrictedZonesStatus", "OUTSIDE")
);
@@ -329,9 +328,7 @@ public class GeofencingCalculatedFieldStateTest {
assertThat(result).isNotNull();
assertThat(result.getType()).isEqualTo(output.getType());
assertThat(result.getScope()).isEqualTo(output.getScope());
- assertThat(result.getResult()).isEqualTo(
- JacksonUtil.newObjectNode().put("allowedZonesEvent", "ENTERED")
- );
+ assertThat(result.getResult().get("values")).isEmpty();
SingleValueArgumentEntry newLatitude = new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("latitude", 50.4760), 146L);
SingleValueArgumentEntry newLongitude = new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("longitude", 30.5110), 166L);
@@ -406,7 +403,7 @@ public class GeofencingCalculatedFieldStateTest {
assertThat(result).isNotNull();
assertThat(result.getType()).isEqualTo(output.getType());
assertThat(result.getScope()).isEqualTo(output.getScope());
- assertThat(result.getResult()).isEqualTo(
+ assertThat(result.getResult().get("values")).isEqualTo(
JacksonUtil.newObjectNode()
.put("allowedZonesStatus", "INSIDE")
.put("restrictedZonesStatus", "OUTSIDE")
diff --git a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingZoneStateTest.java b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingZoneStateTest.java
index f6c6778ced..9b15fbc98a 100644
--- a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingZoneStateTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/GeofencingZoneStateTest.java
@@ -47,8 +47,8 @@ public class GeofencingZoneStateTest {
@Test
void evaluate_initialInside_thenInsideAgain() {
var inside = new Coordinates(50.4730, 30.5050);
- // first evaluation: no prior state -> ENTERED
- assertThat(state.evaluate(inside)).isEqualTo(new GeofencingEvalResult(ENTERED, INSIDE));
+ // first evaluation: no prior state -> INSIDE
+ assertThat(state.evaluate(inside)).isEqualTo(new GeofencingEvalResult(null, INSIDE));
// same position again -> INSIDE (steady state)
assertThat(state.evaluate(inside)).isEqualTo(new GeofencingEvalResult(null, INSIDE));
}
@@ -66,8 +66,8 @@ public class GeofencingZoneStateTest {
void evaluate_inside_thenLeave() {
var inside = new Coordinates(50.4730, 30.5050);
var outside = new Coordinates(50.4760, 30.5110);
- // enter
- assertThat(state.evaluate(inside)).isEqualTo(new GeofencingEvalResult(ENTERED, INSIDE));
+ // initial eval
+ assertThat(state.evaluate(inside)).isEqualTo(new GeofencingEvalResult(null, INSIDE));
// leave -> LEFT
assertThat(state.evaluate(outside)).isEqualTo(new GeofencingEvalResult(LEFT, OUTSIDE));
// still outside -> OUTSIDE
diff --git a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/PropagationArgumentEntryTest.java b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/PropagationArgumentEntryTest.java
index 14a1b629c1..12f3e4298d 100644
--- a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/PropagationArgumentEntryTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/PropagationArgumentEntryTest.java
@@ -25,6 +25,7 @@ import org.thingsboard.server.service.cf.ctx.state.propagation.PropagationArgume
import java.util.ArrayList;
import java.util.List;
+import java.util.Set;
import java.util.UUID;
import static org.assertj.core.api.Assertions.assertThat;
@@ -59,10 +60,10 @@ public class PropagationArgumentEntryTest {
@Test
void testGetValueReturnsPropagationIds() {
- assertThat(entry.getValue()).isInstanceOf(List.class);
+ assertThat(entry.getValue()).isInstanceOf(Set.class);
@SuppressWarnings("unchecked")
- List value = (List) entry.getValue();
- assertThat(value).containsExactly(ENTITY_1_ID, ENTITY_2_ID);
+ Set value = (Set) entry.getValue();
+ assertThat(value).containsExactlyInAnyOrder(ENTITY_1_ID, ENTITY_2_ID);
}
@Test
@@ -87,7 +88,7 @@ public class PropagationArgumentEntryTest {
boolean changed = entry.updateEntry(updated);
assertThat(changed).isTrue();
- assertThat(entry.getPropagationEntityIds()).containsExactlyElementsOf(newIds);
+ assertThat(entry.getEntityIds()).containsExactlyElementsOf(newIds);
}
@Test
@@ -97,7 +98,126 @@ public class PropagationArgumentEntryTest {
boolean changed = entry.updateEntry(updatedEmpty);
assertThat(changed).isTrue();
- assertThat(entry.getPropagationEntityIds()).isEmpty();
+ assertThat(entry.getEntityIds()).isEmpty();
+ }
+
+ @Test
+ void testUpdateEntryWhenAdded() {
+ var added = new PropagationArgumentEntry();
+ added.setAdded(List.of(ENTITY_3_ID));
+
+ boolean changed = entry.updateEntry(added);
+
+ assertThat(changed).isTrue();
+ assertThat(entry.getEntityIds()).containsExactlyInAnyOrder(ENTITY_1_ID, ENTITY_2_ID, ENTITY_3_ID);
+ assertThat(entry.getAdded()).isEqualTo(List.of(ENTITY_3_ID));
+ }
+
+ @Test
+ void testUpdateEntryWhenAddedExistingEntity() {
+ var added = new PropagationArgumentEntry();
+ added.setAdded(List.of(ENTITY_2_ID));
+
+ boolean changed = entry.updateEntry(added);
+
+ assertThat(changed).isFalse();
+ assertThat(entry.getEntityIds()).containsExactlyInAnyOrder(ENTITY_1_ID, ENTITY_2_ID);
+ assertThat(entry.getAdded()).isNull();
+ }
+
+ @Test
+ void testUpdateEntryWhenRemoved() {
+ var removed = new PropagationArgumentEntry();
+ removed.setRemoved(ENTITY_2_ID);
+
+ boolean changed = entry.updateEntry(removed);
+
+ assertThat(changed).isTrue();
+ assertThat(entry.getEntityIds()).containsExactlyInAnyOrder(ENTITY_1_ID);
+ assertThat(entry.getRemoved()).isNull();
+ }
+
+ @Test
+ void testUpdateEntryWhenRemovedNonExistingEntity() {
+ var removed = new PropagationArgumentEntry();
+ removed.setRemoved(ENTITY_3_ID);
+
+ boolean changed = entry.updateEntry(removed);
+
+ assertThat(changed).isFalse();
+ assertThat(entry.getEntityIds()).containsExactlyInAnyOrder(ENTITY_1_ID, ENTITY_2_ID);
+ assertThat(entry.getRemoved()).isNull();
+ }
+
+ @Test
+ void testUpdateEntryWhenPartitionStateRestoreAddsMissingIds() {
+ var restore = new PropagationArgumentEntry(List.of(ENTITY_1_ID, ENTITY_2_ID, ENTITY_3_ID));
+ restore.setIgnoreRemovedEntities(true);
+
+ boolean changed = entry.updateEntry(restore);
+
+ assertThat(changed).isTrue();
+ assertThat(entry.getEntityIds()).containsExactlyInAnyOrder(ENTITY_1_ID, ENTITY_2_ID, ENTITY_3_ID);
+ assertThat(entry.getAdded()).containsExactly(ENTITY_3_ID);
+ assertThat(entry.getRemoved()).isNull();
+ assertThat(entry.isIgnoreRemovedEntities()).isFalse();
+ }
+
+ @Test
+ void testUpdateEntryWhenPartitionStateRestoreRemovesStaleIds() {
+ var restore = new PropagationArgumentEntry(List.of(ENTITY_1_ID));
+ restore.setIgnoreRemovedEntities(true);
+
+ boolean changed = entry.updateEntry(restore);
+
+ assertThat(changed).isFalse(); // expected no change, since we consider the removal of stale ids as no-op
+ assertThat(entry.getEntityIds()).containsExactlyInAnyOrder(ENTITY_1_ID);
+ assertThat(entry.getAdded()).isNull();
+ assertThat(entry.getRemoved()).isNull();
+ assertThat(entry.isIgnoreRemovedEntities()).isFalse();
+ }
+
+ @Test
+ void testUpdateEntryWhenPartitionStateRestoreAddsAndRemoves() {
+ var restore = new PropagationArgumentEntry(List.of(ENTITY_1_ID, ENTITY_3_ID));
+ restore.setIgnoreRemovedEntities(true);
+
+ boolean changed = entry.updateEntry(restore);
+
+ assertThat(changed).isTrue();
+ assertThat(entry.getEntityIds()).containsExactlyInAnyOrder(ENTITY_1_ID, ENTITY_3_ID);
+ assertThat(entry.getAdded()).containsExactly(ENTITY_3_ID);
+ assertThat(entry.getRemoved()).isNull();
+ assertThat(entry.isIgnoreRemovedEntities()).isFalse();
+ }
+
+
+ @Test
+ void testUpdateEntryWhenPartitionStateRestoreNoChanges() {
+ var restore = new PropagationArgumentEntry(List.of(ENTITY_1_ID, ENTITY_2_ID));
+ restore.setIgnoreRemovedEntities(true);
+
+ boolean changed = entry.updateEntry(restore);
+
+ assertThat(changed).isFalse();
+ assertThat(entry.getEntityIds()).containsExactlyInAnyOrder(ENTITY_1_ID, ENTITY_2_ID);
+ assertThat(entry.getAdded()).isNull();
+ assertThat(entry.getRemoved()).isNull();
+ assertThat(entry.isIgnoreRemovedEntities()).isFalse();
+ }
+
+ @Test
+ void testUpdateEntryWhenPartitionStateRestoreEmptySet() {
+ var restore = new PropagationArgumentEntry(List.of());
+ restore.setIgnoreRemovedEntities(true);
+
+ boolean changed = entry.updateEntry(restore);
+
+ assertThat(changed).isFalse(); // expected no change, since we consider the removal of stale ids as no-op
+ assertThat(entry.getEntityIds()).isEmpty();
+ assertThat(entry.getAdded()).isNull();
+ assertThat(entry.getRemoved()).isNull();
+ assertThat(entry.isIgnoreRemovedEntities()).isFalse();
}
@Test
@@ -107,8 +227,8 @@ public class PropagationArgumentEntryTest {
assertThat(arg).isInstanceOf(TbelCfPropagationArg.class);
TbelCfPropagationArg tbelCfPropagationArg = (TbelCfPropagationArg) arg;
- assertThat(tbelCfPropagationArg.getValue()).isInstanceOf(List.class);
- assertThat((List) tbelCfPropagationArg.getValue()).containsExactly(ENTITY_1_ID, ENTITY_2_ID);
+ assertThat(tbelCfPropagationArg.getValue()).isInstanceOf(Set.class);
+ assertThat((Set) tbelCfPropagationArg.getValue()).containsExactlyInAnyOrder(ENTITY_1_ID, ENTITY_2_ID);
}
@@ -120,8 +240,8 @@ public class PropagationArgumentEntryTest {
assertThat(emptyArg).isInstanceOf(TbelCfPropagationArg.class);
TbelCfPropagationArg tbelCfPropagationArg = (TbelCfPropagationArg) emptyArg;
- assertThat(tbelCfPropagationArg.getValue()).isInstanceOf(List.class);
- assertThat((List) tbelCfPropagationArg.getValue()).isEmpty();
+ assertThat(tbelCfPropagationArg.getValue()).isInstanceOf(Set.class);
+ assertThat((Set) tbelCfPropagationArg.getValue()).isEmpty();
}
}
diff --git a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/PropagationCalculatedFieldStateTest.java b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/PropagationCalculatedFieldStateTest.java
index 202b88b2eb..a9bf6d54d1 100644
--- a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/PropagationCalculatedFieldStateTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/PropagationCalculatedFieldStateTest.java
@@ -47,6 +47,7 @@ import org.thingsboard.server.common.data.relation.EntitySearchDirection;
import org.thingsboard.server.common.data.relation.RelationPathLevel;
import org.thingsboard.server.common.stats.DefaultStatsFactory;
import org.thingsboard.server.dao.usagerecord.ApiLimitService;
+import org.thingsboard.server.service.cf.CalculatedFieldProcessingService;
import org.thingsboard.server.service.cf.PropagationCalculatedFieldResult;
import org.thingsboard.server.service.cf.TelemetryCalculatedFieldResult;
import org.thingsboard.server.service.cf.ctx.state.propagation.PropagationArgumentEntry;
@@ -57,12 +58,17 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.UUID;
import java.util.concurrent.ExecutionException;
import java.util.stream.Stream;
import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.thingsboard.server.common.data.cf.configuration.PropagationCalculatedFieldConfiguration.PROPAGATION_CONFIG_ARGUMENT;
@@ -70,17 +76,26 @@ import static org.thingsboard.server.common.data.cf.configuration.PropagationCal
public class PropagationCalculatedFieldStateTest {
private static final String TEMPERATURE_ARGUMENT_NAME = "t";
+ private static final String HUMIDITY_ARGUMENT_NAME = "h";
private static final String TEST_RESULT_EXPRESSION_KEY = "testResult";
private static final double TEMPERATURE_VALUE = 12.5;
+ private static final double HUMIDITY_VALUE = 85;
+
+ private static final PropagationArgumentEntry EMPTY_PROPAGATION_ARGUMENT = new PropagationArgumentEntry(Collections.emptyList());
private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("6c3513cb-85e7-4510-8746-1ba01859a8ce"));
private final DeviceId DEVICE_ID = new DeviceId(UUID.fromString("be960a50-c029-4698-b2ec-c56a543c561c"));
private final AssetId ASSET_ID_1 = new AssetId(UUID.fromString("d26f0e5b-7d7d-4a61-9f5e-08ab97b30734"));
private final AssetId ASSET_ID_2 = new AssetId(UUID.fromString("1933a317-4df5-4d36-9800-68aded74579b"));
- private final SingleValueArgumentEntry singleValueArgEntry =
+ private final SingleValueArgumentEntry EMPTY_SINGLE_VALUE_ARGUMENT = new SingleValueArgumentEntry();
+
+ private final SingleValueArgumentEntry temperatureArgumentEntry =
new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("temperature", TEMPERATURE_VALUE), 99L);
+ private final SingleValueArgumentEntry humidityArgumentEntry =
+ new SingleValueArgumentEntry(System.currentTimeMillis(), new DoubleDataEntry("humidity", HUMIDITY_VALUE), 99L);
+
private final PropagationArgumentEntry propagationArgEntry =
new PropagationArgumentEntry(new ArrayList<>(List.of(ASSET_ID_2, ASSET_ID_1)));
@@ -96,15 +111,19 @@ public class PropagationCalculatedFieldStateTest {
@MockitoBean
private ActorSystemContext actorSystemContext;
+ @MockitoBean
+ private CalculatedFieldProcessingService cfProcessingService;
+
@BeforeEach
void setUp() {
when(actorSystemContext.getTbelInvokeService()).thenReturn(tbelInvokeService);
when(actorSystemContext.getApiLimitService()).thenReturn(apiLimitService);
+ when(actorSystemContext.getCalculatedFieldProcessingService()).thenReturn(cfProcessingService);
when(apiLimitService.getLimit(any(), any())).thenReturn(1000L);
}
void initCtxAndState(boolean applyExpressionToResolvedArguments) {
- ctx = new CalculatedFieldCtx(getCalculatedField(applyExpressionToResolvedArguments), actorSystemContext);
+ ctx = spy(new CalculatedFieldCtx(getCalculatedField(applyExpressionToResolvedArguments), actorSystemContext));
ctx.init();
state = new PropagationCalculatedFieldState(ctx.getEntityId());
@@ -121,7 +140,7 @@ public class PropagationCalculatedFieldStateTest {
@Test
void testInitAddsRequiredArgument() {
initCtxAndState(false);
- assertThat(state.getRequiredArguments()).containsExactlyInAnyOrder(TEMPERATURE_ARGUMENT_NAME, PROPAGATION_CONFIG_ARGUMENT);
+ assertThat(state.getRequiredArguments()).containsExactlyInAnyOrder(TEMPERATURE_ARGUMENT_NAME, HUMIDITY_ARGUMENT_NAME, PROPAGATION_CONFIG_ARGUMENT);
}
@Test
@@ -133,7 +152,7 @@ public class PropagationCalculatedFieldStateTest {
private static Stream provideInvalidPropagationArgs() {
return Stream.of(
null,
- new PropagationArgumentEntry(Collections.emptyList())
+ EMPTY_PROPAGATION_ARGUMENT
);
}
@@ -143,7 +162,8 @@ public class PropagationCalculatedFieldStateTest {
initCtxAndState(false);
Map args = new HashMap<>();
- args.put(TEMPERATURE_ARGUMENT_NAME, singleValueArgEntry); // Valid user arg
+ args.put(TEMPERATURE_ARGUMENT_NAME, temperatureArgumentEntry); // Valid user arg
+ args.put(HUMIDITY_ARGUMENT_NAME, humidityArgumentEntry); // Valid user arg
if (propagationEntry != null) {
args.put(PROPAGATION_CONFIG_ARGUMENT, propagationEntry);
@@ -155,37 +175,76 @@ public class PropagationCalculatedFieldStateTest {
}
@Test
- void testIsReadyWhenPropagationArgHasEntities() {
+ void testIsReadyWithoutExpressionWhenAllArgumentsAreNotEmpty() {
initCtxAndState(false);
- state.update(Map.of(TEMPERATURE_ARGUMENT_NAME, singleValueArgEntry, PROPAGATION_CONFIG_ARGUMENT, propagationArgEntry), ctx);
+ Map updatedArgs = Map.of(
+ TEMPERATURE_ARGUMENT_NAME, temperatureArgumentEntry,
+ HUMIDITY_ARGUMENT_NAME, humidityArgumentEntry,
+ PROPAGATION_CONFIG_ARGUMENT, propagationArgEntry
+ );
+ state.update(updatedArgs, ctx);
assertThat(state.isReady()).isTrue();
assertThat(state.getReadinessStatus().errorMsg()).isNull();
}
+ @Test
+ void testIsReadyWithoutExpressionWhenAtLeastOneArgumentIsNotEmpty() {
+ initCtxAndState(false);
+ Map updatedArgs = Map.of(
+ TEMPERATURE_ARGUMENT_NAME, temperatureArgumentEntry,
+ HUMIDITY_ARGUMENT_NAME, EMPTY_SINGLE_VALUE_ARGUMENT,
+ PROPAGATION_CONFIG_ARGUMENT, propagationArgEntry);
+ state.update(updatedArgs, ctx);
+ assertThat(state.isReady()).isTrue();
+ assertThat(state.getReadinessStatus().errorMsg()).isNull();
+ }
+
+ @Test
+ void testIsNotReadyWithExpressionWhenAtLeastOneArgumentIsEmpty() {
+ initCtxAndState(true);
+ Map updatedArgs = Map.of(
+ TEMPERATURE_ARGUMENT_NAME, temperatureArgumentEntry,
+ HUMIDITY_ARGUMENT_NAME, EMPTY_SINGLE_VALUE_ARGUMENT,
+ PROPAGATION_CONFIG_ARGUMENT, propagationArgEntry);
+ state.update(updatedArgs, ctx);
+ assertThat(state.isReady()).isFalse();
+ assertThat(state.getReadinessStatus().errorMsg()).isEqualTo("Required arguments are missing: h");
+ }
+
@Test
void testPerformCalculationWithEmptyPropagationArg() throws Exception {
initCtxAndState(false);
- state.getArguments().put(PROPAGATION_CONFIG_ARGUMENT, new PropagationArgumentEntry(Collections.emptyList()));
+ Map initArgs = Map.of(
+ TEMPERATURE_ARGUMENT_NAME, temperatureArgumentEntry,
+ HUMIDITY_ARGUMENT_NAME, humidityArgumentEntry,
+ PROPAGATION_CONFIG_ARGUMENT, EMPTY_PROPAGATION_ARGUMENT);
+ state.update(initArgs, ctx);
+ assertThat(state.isReady()).isFalse();
+ // test empty propagation argument calculation
PropagationCalculatedFieldResult result = performCalculation();
assertThat(result).isNotNull();
assertThat(result.isEmpty()).isTrue();
- assertThat(result.getPropagationEntityIds()).isNullOrEmpty();
+ assertThat(result.getEntityIds()).isNullOrEmpty();
}
@Test
void testPerformCalculationWithArgumentsOnlyMode() throws Exception {
initCtxAndState(false);
- state.getArguments().put(PROPAGATION_CONFIG_ARGUMENT, propagationArgEntry);
- state.getArguments().put(TEMPERATURE_ARGUMENT_NAME, singleValueArgEntry);
+ Map initArgs = Map.of(
+ TEMPERATURE_ARGUMENT_NAME, temperatureArgumentEntry,
+ HUMIDITY_ARGUMENT_NAME, EMPTY_SINGLE_VALUE_ARGUMENT,
+ PROPAGATION_CONFIG_ARGUMENT, propagationArgEntry);
+ state.update(initArgs, ctx);
+ assertThat(state.isReady()).isTrue();
PropagationCalculatedFieldResult propagationResult = performCalculation();
assertThat(propagationResult).isNotNull();
assertThat(propagationResult.isEmpty()).isFalse();
- assertThat(propagationResult.getPropagationEntityIds()).containsExactly(ASSET_ID_2, ASSET_ID_1);
+ assertThat(propagationResult.getEntityIds()).containsExactly(ASSET_ID_2, ASSET_ID_1);
TelemetryCalculatedFieldResult result = propagationResult.getResult();
assertThat(result).isNotNull();
@@ -193,7 +252,7 @@ public class PropagationCalculatedFieldStateTest {
assertThat(result.getScope()).isEqualTo(AttributeScope.SERVER_SCOPE);
ObjectNode expectedNode = JacksonUtil.newObjectNode();
- JacksonUtil.addKvEntry(expectedNode, singleValueArgEntry.getKvEntryValue(), TEMPERATURE_ARGUMENT_NAME);
+ JacksonUtil.addKvEntry(expectedNode, temperatureArgumentEntry.getKvEntryValue(), TEMPERATURE_ARGUMENT_NAME);
assertThat(result.getResult()).isEqualTo(expectedNode);
}
@@ -201,14 +260,18 @@ public class PropagationCalculatedFieldStateTest {
@Test
void testPerformCalculationWithExpressionResultMode() throws Exception {
initCtxAndState(true);
- state.getArguments().put(PROPAGATION_CONFIG_ARGUMENT, propagationArgEntry);
- state.getArguments().put(TEMPERATURE_ARGUMENT_NAME, singleValueArgEntry);
-
+ Map initArgs = Map.of(
+ TEMPERATURE_ARGUMENT_NAME, temperatureArgumentEntry,
+ HUMIDITY_ARGUMENT_NAME, humidityArgumentEntry,
+ PROPAGATION_CONFIG_ARGUMENT, propagationArgEntry
+ );
+ state.update(initArgs, ctx);
+ assertThat(state.isReady()).isTrue();
PropagationCalculatedFieldResult propagationResult = performCalculation();
assertThat(propagationResult).isNotNull();
assertThat(propagationResult.isEmpty()).isFalse();
- assertThat(propagationResult.getPropagationEntityIds()).containsExactly(ASSET_ID_2, ASSET_ID_1);
+ assertThat(propagationResult.getEntityIds()).containsExactly(ASSET_ID_2, ASSET_ID_1);
TelemetryCalculatedFieldResult result = propagationResult.getResult();
assertThat(result).isNotNull();
@@ -216,11 +279,62 @@ public class PropagationCalculatedFieldStateTest {
assertThat(result.getScope()).isEqualTo(AttributeScope.SERVER_SCOPE);
ObjectNode expectedNode = JacksonUtil.newObjectNode();
- expectedNode.put(TEST_RESULT_EXPRESSION_KEY, TEMPERATURE_VALUE * 2);
+ expectedNode.put(TEST_RESULT_EXPRESSION_KEY, (TEMPERATURE_VALUE + HUMIDITY_VALUE) / 2);
assertThat(result.getResult()).isEqualTo(expectedNode);
}
+ @Test
+ void testPropagationWithUpdatedPropagationArgument() throws ExecutionException, InterruptedException {
+ initCtxAndState(false);
+ Map initArgs = Map.of(
+ TEMPERATURE_ARGUMENT_NAME, temperatureArgumentEntry,
+ HUMIDITY_ARGUMENT_NAME, EMPTY_SINGLE_VALUE_ARGUMENT,
+ PROPAGATION_CONFIG_ARGUMENT, propagationArgEntry
+ );
+ state.update(initArgs, ctx);
+ assertThat(state.isReady()).isTrue();
+
+ AssetId newEntityId = new AssetId(UUID.fromString("83e2c962-eeae-4708-984e-e6a24760f9c3"));
+ PropagationArgumentEntry propagationArgumentEntry = new PropagationArgumentEntry();
+ propagationArgumentEntry.setAdded(List.of(newEntityId));
+ Map updated = state.update(Map.of(PROPAGATION_CONFIG_ARGUMENT, propagationArgumentEntry), ctx);
+ assertThat(updated).isNotNull().containsEntry(PROPAGATION_CONFIG_ARGUMENT, propagationArgumentEntry);
+
+ PropagationCalculatedFieldResult propagationCalculatedFieldResult = performCalculation(updated);
+ assertThat(propagationCalculatedFieldResult).isNotNull();
+ assertThat(propagationCalculatedFieldResult.getEntityIds()).isNotNull().containsExactly(newEntityId);
+ assertThat(propagationCalculatedFieldResult.getResult()).isNotNull();
+ assertThat(propagationCalculatedFieldResult.getResult().getResult()).isNotNull();
+ assertThat(propagationCalculatedFieldResult.getResult().getResult()).isEqualTo(JacksonUtil.newObjectNode().put(TEMPERATURE_ARGUMENT_NAME, TEMPERATURE_VALUE));
+ }
+
+ @Test
+ void testPropapagationStateInitWithRestoredSetToFalse() {
+ initCtxAndState(false);
+ verify(cfProcessingService, never()).fetchPropagationArgumentFromDb(any(), any());
+ verify(ctx, never()).scheduleReevaluation(anyLong(), any());
+ }
+
+ @Test
+ void testPropapagationStateInitWithRestoredSetToTrue() {
+ initCtxAndState(false);
+ Map initArgs = Map.of(
+ TEMPERATURE_ARGUMENT_NAME, temperatureArgumentEntry,
+ HUMIDITY_ARGUMENT_NAME, humidityArgumentEntry,
+ PROPAGATION_CONFIG_ARGUMENT, new PropagationArgumentEntry(Collections.emptyList())
+ );
+ state.update(initArgs, ctx);
+ assertThat(state.isReady()).isFalse();
+
+ when(cfProcessingService.fetchPropagationArgumentFromDb(any(), any())).thenReturn(Optional.of(propagationArgEntry));
+
+ state.init(true);
+
+ verify(cfProcessingService).fetchPropagationArgumentFromDb(ctx, state.getEntityId());
+ verify(ctx).scheduleReevaluation(0L, state.getActorCtx());
+ }
+
private CalculatedField getCalculatedField(boolean applyExpressionToResolvedArguments) {
CalculatedField calculatedField = new CalculatedField();
calculatedField.setTenantId(TENANT_ID);
@@ -243,8 +357,12 @@ public class PropagationCalculatedFieldStateTest {
ReferencedEntityKey tempKey = new ReferencedEntityKey("temperature", ArgumentType.TS_LATEST, null);
temperatureArg.setRefEntityKey(tempKey);
- config.setArguments(Map.of(TEMPERATURE_ARGUMENT_NAME, temperatureArg));
- config.setExpression("{" + TEST_RESULT_EXPRESSION_KEY + ": " + TEMPERATURE_ARGUMENT_NAME + " * 2}");
+ Argument humidityArg = new Argument();
+ ReferencedEntityKey humidityKey = new ReferencedEntityKey("humidity", ArgumentType.TS_LATEST, null);
+ humidityArg.setRefEntityKey(humidityKey);
+
+ config.setArguments(Map.of(TEMPERATURE_ARGUMENT_NAME, temperatureArg, HUMIDITY_ARGUMENT_NAME, humidityArg));
+ config.setExpression("return { " + TEST_RESULT_EXPRESSION_KEY + ": (" + TEMPERATURE_ARGUMENT_NAME + " + " + HUMIDITY_ARGUMENT_NAME + ") / 2};");
AttributesOutput output = new AttributesOutput();
output.setScope(AttributeScope.SERVER_SCOPE);
@@ -254,6 +372,10 @@ public class PropagationCalculatedFieldStateTest {
}
private PropagationCalculatedFieldResult performCalculation() throws ExecutionException, InterruptedException {
- return (PropagationCalculatedFieldResult) state.performCalculation(Collections.emptyMap(), ctx).get();
+ return performCalculation(Collections.emptyMap());
+ }
+
+ private PropagationCalculatedFieldResult performCalculation(Map updatedArgs) throws ExecutionException, InterruptedException {
+ return (PropagationCalculatedFieldResult) state.performCalculation(updatedArgs, ctx).get();
}
}
diff --git a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/RelatedEntitiesAggregationCalculatedFieldStateTest.java b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/RelatedEntitiesAggregationCalculatedFieldStateTest.java
index a93a6e8ddd..5085c64ef2 100644
--- a/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/RelatedEntitiesAggregationCalculatedFieldStateTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/cf/ctx/state/RelatedEntitiesAggregationCalculatedFieldStateTest.java
@@ -113,8 +113,10 @@ public class RelatedEntitiesAggregationCalculatedFieldStateTest {
}
@Test
- void testIsReadyReturnFalseWhenNoArgumentsSet() {
+ void testIsReadyWhenNoRelatedEntities() {
assertThat(state.isReady()).isFalse();
+ assertThat(state.getReadinessStatus().errorMsg())
+ .isEqualTo("No entities found via 'Aggregation path to related entities'. Verify the configured relation type and direction.");
}
@Test
diff --git a/application/src/test/java/org/thingsboard/server/service/edge/EdgeMsgConstructorUtilsTest.java b/application/src/test/java/org/thingsboard/server/service/edge/EdgeMsgConstructorUtilsTest.java
index 1ee6e31372..ebb8305871 100644
--- a/application/src/test/java/org/thingsboard/server/service/edge/EdgeMsgConstructorUtilsTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/edge/EdgeMsgConstructorUtilsTest.java
@@ -15,10 +15,12 @@
*/
package org.thingsboard.server.service.edge;
+import com.fasterxml.jackson.databind.JsonNode;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestInstance;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.MethodSource;
@@ -36,6 +38,10 @@ import org.thingsboard.rule.engine.rest.TbSendRestApiCallReplyNode;
import org.thingsboard.rule.engine.telemetry.TbCalculatedFieldsNode;
import org.thingsboard.rule.engine.telemetry.TbMsgAttributesNode;
import org.thingsboard.rule.engine.telemetry.TbMsgTimeseriesNode;
+import org.thingsboard.server.common.data.edge.EdgeEvent;
+import org.thingsboard.server.common.data.edge.EdgeEventActionType;
+import org.thingsboard.server.common.data.edge.EdgeEventType;
+import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.rule.RuleChainMetaData;
import org.thingsboard.server.common.data.rule.RuleNode;
import org.thingsboard.server.gen.edge.v1.EdgeVersion;
@@ -44,6 +50,7 @@ import org.thingsboard.server.gen.edge.v1.UpdateMsgType;
import java.lang.reflect.Constructor;
import java.util.List;
import java.util.Optional;
+import java.util.UUID;
import java.util.stream.Stream;
import static org.thingsboard.server.service.edge.EdgeMsgConstructorUtils.EXCLUDED_NODES_BY_EDGE_VERSION;
@@ -155,4 +162,95 @@ public class EdgeMsgConstructorUtilsTest {
String.format("For EdgeVersion '%s', ruleNode '%s' should not be included.", edgeVersion, ruleNode.getType()));
}
+ @Test
+ @DisplayName("mergeDownlinkDuplicates: latest per attribute key is retained and duplicates removed")
+ public void testMergeDownlinkDuplicates() {
+ UUID deviceId = UUID.randomUUID();
+ UUID assetId = UUID.randomUUID();
+ TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
+
+ var deviceAttrUpdate1 = createEdgeEvent(tenantId, 1, EdgeEventActionType.ATTRIBUTES_UPDATED,
+ deviceId, EdgeEventType.DEVICE, createAttrBody(1_000L, "{\"a\":1,\"b\":1,\"d\":1}"));
+ var deviceAttrUpdate2 = createEdgeEvent(tenantId, 2, EdgeEventActionType.ATTRIBUTES_UPDATED,
+ deviceId, EdgeEventType.DEVICE, createAttrBody(2_000L, "{\"a\":2,\"b\":2,\"c\":2}"));
+ var deviceAttrUpdate3 = createEdgeEvent(tenantId, 3, EdgeEventActionType.ATTRIBUTES_UPDATED,
+ deviceId, EdgeEventType.DEVICE, createAttrBody(3_000L, "{\"a\":3,\"d\":3}"));
+
+ var deviceUpdate = createEdgeEvent(tenantId, 4, EdgeEventActionType.UPDATED,
+ deviceId, EdgeEventType.DEVICE, null);
+ var deviceUpdateDup = createEdgeEvent(tenantId, 5, EdgeEventActionType.UPDATED,
+ deviceId, EdgeEventType.DEVICE, null);
+
+ var assetAttrUpdate1 = createEdgeEvent(tenantId, 6, EdgeEventActionType.ATTRIBUTES_UPDATED,
+ assetId, EdgeEventType.ASSET, createAttrBody(6_000L, "{\"a\":6,\"d\":6}"));
+ var assetAttrUpdate2 = createEdgeEvent(tenantId, 7, EdgeEventActionType.ATTRIBUTES_UPDATED,
+ assetId, EdgeEventType.ASSET, createAttrBody(7_000L, "{\"a\":7,\"b\":7,\"c\":7}"));
+ var assetAttrUpdate3 = createEdgeEvent(tenantId, 8, EdgeEventActionType.ATTRIBUTES_UPDATED,
+ assetId, EdgeEventType.ASSET, createAttrBody(8_000L, "{\"a\":8,\"d\":8}"));
+
+ List input = List.of(deviceAttrUpdate1, deviceAttrUpdate2, deviceAttrUpdate3,
+ deviceUpdate, deviceUpdateDup,
+ assetAttrUpdate1, assetAttrUpdate2, assetAttrUpdate3);
+ List merged = EdgeMsgConstructorUtils.mergeAndFilterDownlinkDuplicates(input);
+
+ Assertions.assertEquals(5, merged.size());
+
+ EdgeEvent deviceMergedAttrBC = merged.get(0);
+ Assertions.assertEquals(2, deviceMergedAttrBC.getSeqId());
+ Assertions.assertEquals(deviceId, deviceMergedAttrBC.getEntityId());
+ Assertions.assertEquals(2_000L, deviceMergedAttrBC.getBody().get("ts").asLong());
+ Assertions.assertEquals(2, getIntValue(deviceMergedAttrBC.getBody(), "b"));
+ Assertions.assertEquals(2, getIntValue(deviceMergedAttrBC.getBody(), "c"));
+ Assertions.assertNull(getIntValue(deviceMergedAttrBC.getBody(), "a"));
+
+ EdgeEvent deviceMergedAttrAD = merged.get(1);
+ Assertions.assertEquals(3, deviceMergedAttrAD.getSeqId());
+ Assertions.assertEquals(deviceId, deviceMergedAttrAD.getEntityId());
+ Assertions.assertEquals(3_000L, deviceMergedAttrAD.getBody().get("ts").asLong());
+ Assertions.assertEquals(3, getIntValue(deviceMergedAttrAD.getBody(), "a"));
+ Assertions.assertEquals(3, getIntValue(deviceMergedAttrAD.getBody(), "d"));
+
+ EdgeEvent mergedDeviceUpdate = merged.get(2);
+ Assertions.assertEquals(4, mergedDeviceUpdate.getSeqId());
+ Assertions.assertEquals(EdgeEventActionType.UPDATED, mergedDeviceUpdate.getAction());
+
+ EdgeEvent assetMergedAttrBC = merged.get(3);
+ Assertions.assertEquals(7, assetMergedAttrBC.getSeqId());
+ Assertions.assertEquals(assetId, assetMergedAttrBC.getEntityId());
+ Assertions.assertEquals(7_000L, assetMergedAttrBC.getBody().get("ts").asLong());
+ Assertions.assertEquals(7, getIntValue(assetMergedAttrBC.getBody(), "b"));
+ Assertions.assertEquals(7, getIntValue(assetMergedAttrBC.getBody(), "c"));
+ Assertions.assertNull(getIntValue(assetMergedAttrBC.getBody(), "a"));
+
+ EdgeEvent assetMergedAttrAD = merged.get(4);
+ Assertions.assertEquals(8, assetMergedAttrAD.getSeqId());
+ Assertions.assertEquals(assetId, assetMergedAttrAD.getEntityId());
+ Assertions.assertEquals(8_000L, assetMergedAttrAD.getBody().get("ts").asLong());
+ Assertions.assertEquals(8, getIntValue(assetMergedAttrAD.getBody(), "a"));
+ Assertions.assertEquals(8, getIntValue(assetMergedAttrAD.getBody(), "d"));
+ }
+
+ private Integer getIntValue(JsonNode body, String key) {
+ return body.get("kv").get(key) != null ? body.get("kv").get(key).asInt() : null;
+ }
+
+ private static JsonNode createAttrBody(long ts, String kvJson) {
+ return JacksonUtil.toJsonNode("{\"ts\":" + ts + ",\"kv\":" + kvJson + "}");
+ }
+
+ private static EdgeEvent createEdgeEvent(TenantId tenantId,
+ long seqId,
+ EdgeEventActionType action,
+ UUID entityId,
+ EdgeEventType type,
+ JsonNode body) {
+ EdgeEvent edgeEvent = new EdgeEvent();
+ edgeEvent.setSeqId(seqId);
+ edgeEvent.setTenantId(tenantId);
+ edgeEvent.setAction(action);
+ edgeEvent.setEntityId(entityId);
+ edgeEvent.setType(type);
+ edgeEvent.setBody(body);
+ return edgeEvent;
+ }
}
diff --git a/application/src/test/java/org/thingsboard/server/service/edge/EdgeStatsTest.java b/application/src/test/java/org/thingsboard/server/service/edge/EdgeStatsTest.java
index 25ff0f1b5d..3cb4bec803 100644
--- a/application/src/test/java/org/thingsboard/server/service/edge/EdgeStatsTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/edge/EdgeStatsTest.java
@@ -21,6 +21,7 @@ import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.ArgumentCaptor;
+import org.mockito.Captor;
import org.mockito.Mock;
import org.mockito.junit.jupiter.MockitoExtension;
import org.springframework.test.util.ReflectionTestUtils;
@@ -44,9 +45,11 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.stream.Collectors;
+import static org.mockito.ArgumentMatchers.anyList;
import static org.mockito.ArgumentMatchers.anyLong;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.thingsboard.server.dao.edge.stats.EdgeStatsKey.DOWNLINK_MSGS_ADDED;
@@ -58,6 +61,16 @@ import static org.thingsboard.server.dao.edge.stats.EdgeStatsKey.DOWNLINK_MSGS_T
@ExtendWith(MockitoExtension.class)
public class EdgeStatsTest {
+ private static final int TTL_DAYS = 30;
+ private static final long REPORT_INTERVAL_MILLIS = 600_000L;
+
+ private static final long EXPECTED_MSGS_ADDED = 5L;
+ private static final long EXPECTED_MSGS_PUSHED = 3L;
+ private static final long EXPECTED_MSGS_PERMANENTLY_FAILED = 1L;
+ private static final long EXPECTED_MSGS_TMP_FAILED = 0L;
+ private static final long EXPECTED_MSGS_LAG = 10L;
+ private static final long EXPECTED_MSGS_KAFKA_LAG = 15L;
+
@Mock
private TimeseriesService tsService;
@Mock
@@ -66,108 +79,100 @@ public class EdgeStatsTest {
private EdgeStatsCounterService statsCounterService;
private EdgeStatsService edgeStatsService;
+ @Captor
+ private ArgumentCaptor> captor;
+
private final TenantId tenantId = TenantId.fromUUID(UUID.randomUUID());
private final EdgeId edgeId = new EdgeId(UUID.randomUUID());
@BeforeEach
void setUp() {
- edgeStatsService = new EdgeStatsService(
+ edgeStatsService = createEdgeStatsService(Optional.empty());
+ }
+
+ private EdgeStatsService createEdgeStatsService(Optional kafkaAdmin) {
+ EdgeStatsService service = new EdgeStatsService(
tsService,
statsCounterService,
topicService,
- Optional.empty()
+ kafkaAdmin
);
-
- ReflectionTestUtils.setField(edgeStatsService, "edgesStatsTtlDays", 30);
- ReflectionTestUtils.setField(edgeStatsService, "reportIntervalMillis", 600_000L);
+ ReflectionTestUtils.setField(service, "edgesStatsTtlDays", TTL_DAYS);
+ ReflectionTestUtils.setField(service, "reportIntervalMillis", REPORT_INTERVAL_MILLIS);
+ return service;
}
@Test
public void testReportStatsSavesTelemetry() {
- // given
+ // GIVEN
+ setupCounters();
+
+ // WHEN
+ edgeStatsService.reportStats();
+
+ // THEN
+ Map counters = verifyCounters();
+ Assertions.assertEquals(EXPECTED_MSGS_LAG, counters.get(DOWNLINK_MSGS_LAG.getKey()).longValue());
+ }
+
+ @Test
+ public void testReportStatsWithKafkaLag() {
+ // GIVEN
+ setupCounters();
+ setupKafkaLag();
+
+ // WHEN
+ edgeStatsService.reportStats();
+
+ // THEN
+ Map valuesByKey = verifyCounters();
+ Assertions.assertEquals(EXPECTED_MSGS_KAFKA_LAG, valuesByKey.get(DOWNLINK_MSGS_LAG.getKey()));
+ }
+
+ private void setupCounters() {
MsgCounters counters = new MsgCounters(tenantId);
- counters.getMsgsAdded().set(5);
- counters.getMsgsPushed().set(3);
- counters.getMsgsPermanentlyFailed().set(1);
- counters.getMsgsTmpFailed().set(0);
- counters.getMsgsLag().set(10);
+ counters.getMsgsAdded().set(EXPECTED_MSGS_ADDED);
+ counters.getMsgsPushed().set(EXPECTED_MSGS_PUSHED);
+ counters.getMsgsPermanentlyFailed().set(EXPECTED_MSGS_PERMANENTLY_FAILED);
+ counters.getMsgsTmpFailed().set(EXPECTED_MSGS_TMP_FAILED);
+ counters.getMsgsLag().set(EXPECTED_MSGS_LAG);
ConcurrentHashMap countersByEdge = new ConcurrentHashMap<>();
countersByEdge.put(edgeId, counters);
- when(statsCounterService.getCounterByEdge()).thenReturn(countersByEdge);
+ when(statsCounterService.getMsgCountersByEdge()).thenReturn(countersByEdge);
- ArgumentCaptor> captor = ArgumentCaptor.forClass(List.class);
when(tsService.save(eq(tenantId), eq(edgeId), captor.capture(), anyLong()))
.thenReturn(Futures.immediateFuture(mock(TimeseriesSaveResult.class)));
+ }
- // when
- edgeStatsService.reportStats();
+ private Map verifyCounters() {
+ verify(tsService, times(1)).save(eq(tenantId), eq(edgeId), anyList(), anyLong());
+ verify(statsCounterService, times(1)).clear(edgeId);
- // then
List entries = captor.getValue();
Assertions.assertEquals(5, entries.size());
Map valuesByKey = entries.stream()
.collect(Collectors.toMap(TsKvEntry::getKey, e -> e.getLongValue().orElse(-1L)));
- Assertions.assertEquals(5L, valuesByKey.get(DOWNLINK_MSGS_ADDED.getKey()).longValue());
- Assertions.assertEquals(3L, valuesByKey.get(DOWNLINK_MSGS_PUSHED.getKey()).longValue());
- Assertions.assertEquals(1L, valuesByKey.get(DOWNLINK_MSGS_PERMANENTLY_FAILED.getKey()).longValue());
- Assertions.assertEquals(0L, valuesByKey.get(DOWNLINK_MSGS_TMP_FAILED.getKey()).longValue());
- Assertions.assertEquals(10L, valuesByKey.get(DOWNLINK_MSGS_LAG.getKey()).longValue());
-
-
- verify(statsCounterService).clear(edgeId);
+ Assertions.assertEquals(EXPECTED_MSGS_ADDED, valuesByKey.get(DOWNLINK_MSGS_ADDED.getKey()).longValue());
+ Assertions.assertEquals(EXPECTED_MSGS_PUSHED, valuesByKey.get(DOWNLINK_MSGS_PUSHED.getKey()).longValue());
+ Assertions.assertEquals(EXPECTED_MSGS_PERMANENTLY_FAILED, valuesByKey.get(DOWNLINK_MSGS_PERMANENTLY_FAILED.getKey()).longValue());
+ Assertions.assertEquals(EXPECTED_MSGS_TMP_FAILED, valuesByKey.get(DOWNLINK_MSGS_TMP_FAILED.getKey()).longValue());
+ return valuesByKey;
}
- @Test
- public void testReportStatsWithKafkaLag() {
- // given
- MsgCounters counters = new MsgCounters(tenantId);
- counters.getMsgsAdded().set(2);
- counters.getMsgsPushed().set(2);
- counters.getMsgsPermanentlyFailed().set(0);
- counters.getMsgsTmpFailed().set(1);
- counters.getMsgsLag().set(0);
-
- ConcurrentHashMap countersByEdge = new ConcurrentHashMap<>();
- countersByEdge.put(edgeId, counters);
-
- // mocks
- when(statsCounterService.getCounterByEdge()).thenReturn(countersByEdge);
-
+ private void setupKafkaLag() {
String topic = "edge-topic";
TopicPartitionInfo partitionInfo = new TopicPartitionInfo(topic, tenantId, 0, false);
when(topicService.buildEdgeEventNotificationsTopicPartitionInfo(tenantId, edgeId)).thenReturn(partitionInfo);
KafkaAdmin kafkaAdmin = mock(KafkaAdmin.class);
when(kafkaAdmin.getTotalLagForGroupsBulk(Set.of(topic)))
- .thenReturn(Map.of(topic, 15L));
-
- ArgumentCaptor> captor = ArgumentCaptor.forClass(List.class);
- when(tsService.save(eq(tenantId), eq(edgeId), captor.capture(), anyLong()))
- .thenReturn(Futures.immediateFuture(mock(TimeseriesSaveResult.class)));
-
- edgeStatsService = new EdgeStatsService(
- tsService,
- statsCounterService,
- topicService,
- Optional.of(kafkaAdmin)
- );
- ReflectionTestUtils.setField(edgeStatsService, "edgesStatsTtlDays", 30);
- ReflectionTestUtils.setField(edgeStatsService, "reportIntervalMillis", 600_000L);
-
- // when
- edgeStatsService.reportStats();
-
- // then
- List entries = captor.getValue();
- Map valuesByKey = entries.stream()
- .collect(Collectors.toMap(TsKvEntry::getKey, e -> e.getLongValue().orElse(-1L)));
+ .thenReturn(Map.of(topic, EXPECTED_MSGS_KAFKA_LAG));
- Assertions.assertEquals(15L, valuesByKey.get(DOWNLINK_MSGS_LAG.getKey()));
- verify(statsCounterService).clear(edgeId);
+ edgeStatsService = createEdgeStatsService(Optional.of(kafkaAdmin));
}
}
diff --git a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
index a146730465..aadbb2ebb5 100644
--- a/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/resource/sql/BaseTbResourceServiceTest.java
@@ -60,7 +60,7 @@ import org.thingsboard.server.common.data.widget.WidgetTypeDetails;
import org.thingsboard.server.controller.AbstractControllerTest;
import org.thingsboard.server.dao.ai.AiModelService;
import org.thingsboard.server.dao.dashboard.DashboardService;
-import org.thingsboard.server.dao.exception.DataValidationException;
+import org.thingsboard.server.exception.DataValidationException;
import org.thingsboard.server.dao.resource.ResourceService;
import org.thingsboard.server.dao.rule.RuleChainService;
import org.thingsboard.server.dao.service.DaoSqlTest;
diff --git a/application/src/test/java/org/thingsboard/server/service/security/auth/pat/ApiKeyAuthenticationProviderTest.java b/application/src/test/java/org/thingsboard/server/service/security/auth/pat/ApiKeyAuthenticationProviderTest.java
index 3c1b7dda18..bd20299baf 100644
--- a/application/src/test/java/org/thingsboard/server/service/security/auth/pat/ApiKeyAuthenticationProviderTest.java
+++ b/application/src/test/java/org/thingsboard/server/service/security/auth/pat/ApiKeyAuthenticationProviderTest.java
@@ -15,18 +15,24 @@
*/
package org.thingsboard.server.service.security.auth.pat;
+import org.apache.commons.lang3.RandomStringUtils;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.mockito.Mockito;
+import org.thingsboard.server.common.data.User;
import org.thingsboard.server.common.data.audit.ActionType;
import org.thingsboard.server.common.data.edge.Edge;
import org.thingsboard.server.common.data.pat.ApiKey;
import org.thingsboard.server.common.data.pat.ApiKeyInfo;
+import org.thingsboard.server.common.data.security.Authority;
import org.thingsboard.server.controller.AbstractControllerTest;
import org.thingsboard.server.dao.service.DaoSqlTest;
+import java.util.concurrent.TimeUnit;
+
+import static org.awaitility.Awaitility.await;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.thingsboard.server.dao.model.ModelConstants.NULL_UUID;
@@ -101,6 +107,62 @@ public class ApiKeyAuthenticationProviderTest extends AbstractControllerTest {
doGetWithApiKey("/api/admin/featuresInfo").andExpect(status().isUnauthorized());
}
+ @Test
+ public void testUnauthorizedWhenUserCredentialsDisabled() throws Exception {
+ User newUser = new User();
+ newUser.setAuthority(Authority.TENANT_ADMIN);
+ newUser.setTenantId(tenantId);
+ newUser.setEmail("testUser" + RandomStringUtils.secure().nextAlphanumeric(10) + "@thingsboard.org");
+ newUser.setFirstName("Test");
+ newUser.setLastName("User");
+ User savedUser = createUser(newUser, "testPassword1");
+
+ ApiKeyInfo apiKeyInfo = new ApiKeyInfo();
+ apiKeyInfo.setDescription("Test API key for user credentials test");
+ apiKeyInfo.setEnabled(true);
+ apiKeyInfo.setUserId(savedUser.getId());
+ ApiKey testApiKey = doPost("/api/apiKey", apiKeyInfo, ApiKey.class);
+ setApiKey(testApiKey.getValue());
+
+ doGetWithApiKey("/api/admin/repositorySettings/exists").andExpect(status().isOk());
+
+ doPost("/api/user/" + savedUser.getId().getId() + "/userCredentialsEnabled?userCredentialsEnabled=false").andExpect(status().isOk());
+
+ await().atMost(5, TimeUnit.SECONDS)
+ .untilAsserted(() -> doGetWithApiKey("/api/admin/repositorySettings/exists").andExpect(status().isUnauthorized()));
+
+ resetApiKey();
+ doDelete("/api/apiKey/" + testApiKey.getId()).andExpect(status().isOk());
+ loginSysAdmin();
+ doDelete("/api/user/" + savedUser.getId().getId()).andExpect(status().isOk());
+ }
+
+ @Test
+ public void testUnauthorizedWhenUserDeleted() throws Exception {
+ User newUser = new User();
+ newUser.setAuthority(Authority.TENANT_ADMIN);
+ newUser.setTenantId(tenantId);
+ newUser.setEmail("testUser" + RandomStringUtils.secure().nextAlphanumeric(10) + "@thingsboard.org");
+ newUser.setFirstName("Test");
+ newUser.setLastName("User");
+ User savedUser = createUser(newUser, "testPassword1");
+
+ ApiKeyInfo apiKeyInfo = new ApiKeyInfo();
+ apiKeyInfo.setDescription("Test API key for user deletion test");
+ apiKeyInfo.setEnabled(true);
+ apiKeyInfo.setUserId(savedUser.getId());
+ ApiKey testApiKey = doPost("/api/apiKey", apiKeyInfo, ApiKey.class);
+ setApiKey(testApiKey.getValue());
+
+ doGetWithApiKey("/api/admin/repositorySettings/exists").andExpect(status().isOk());
+
+ loginSysAdmin();
+ doDelete("/api/user/" + savedUser.getId().getId()).andExpect(status().isOk());
+
+ await().atMost(5, TimeUnit.SECONDS)
+ .untilAsserted(() -> doGetWithApiKey("/api/admin/repositorySettings/exists").andExpect(status().isUnauthorized()));
+ }
+
private ApiKeyInfo constructApiKeyInfo() {
ApiKeyInfo apiKeyInfo = new ApiKeyInfo();
apiKeyInfo.setDescription("New API key description");
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/AbstractOtaLwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/AbstractOtaLwM2MIntegrationTest.java
index cff56694e5..0681f00d27 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/AbstractOtaLwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/AbstractOtaLwM2MIntegrationTest.java
@@ -16,14 +16,10 @@
package org.thingsboard.server.transport.lwm2m.ota;
import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.node.ObjectNode;
-import com.github.dockerjava.zerodep.shaded.org.apache.commons.codec.binary.Hex;
import lombok.extern.slf4j.Slf4j;
-import org.eclipse.leshan.core.ResponseCode;
import org.springframework.mock.web.MockMultipartFile;
import org.springframework.test.web.servlet.request.MockMultipartHttpServletRequestBuilder;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
-import org.thingsboard.common.util.JacksonUtil;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.OtaPackageInfo;
import org.thingsboard.server.common.data.id.DeviceProfileId;
@@ -35,20 +31,13 @@ import org.thingsboard.server.transport.lwm2m.AbstractLwM2MIntegrationTest;
import java.util.Comparator;
import java.util.List;
-import java.util.Optional;
import java.util.UUID;
import java.util.stream.Collectors;
-import static org.junit.Assert.assertEquals;
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import static org.thingsboard.rest.client.utils.RestJsonConverter.toTimeseries;
import static org.thingsboard.server.common.data.ota.OtaPackageType.FIRMWARE;
import static org.thingsboard.server.common.data.ota.OtaPackageType.SOFTWARE;
-import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.OTA_INFO_19_FILE_CHECKSUM256;
-import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.OTA_INFO_19_FILE_NAME;
-import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.OTA_INFO_19_FILE_SIZE;
-import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.OTA_INFO_19_TITLE;
-import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.OTA_INFO_19_VERSION;
@Slf4j
@DaoSqlTest
@@ -57,7 +46,6 @@ public abstract class AbstractOtaLwM2MIntegrationTest extends AbstractLwM2MInteg
protected static final String CLIENT_ENDPOINT_WITHOUT_FW_INFO = "WithoutFirmwareInfoDevice";
protected static final String CLIENT_ENDPOINT_OTA5 = "Ota5_Device";
protected static final String CLIENT_ENDPOINT_OTA9 = "Ota9_Device";
- protected static final String CLIENT_ENDPOINT_OTA9_19 = "Ota9_Device_19";
protected List expectedStatuses;
protected final String OBSERVE_ATTRIBUTES_WITH_PARAMS_OTA5 =
@@ -88,37 +76,6 @@ public abstract class AbstractOtaLwM2MIntegrationTest extends AbstractLwM2MInteg
" \"attributeLwm2m\": {}\n" +
" }";
- protected final String OBSERVE_ATTRIBUTES_WITH_PARAMS_OTA5_19 =
-
- " {\n" +
- " \"keyName\": {\n" +
- " \"/5_1.2/0/3\": \"state\",\n" +
- " \"/5_1.2/0/5\": \"updateResult\",\n" +
- " \"/5_1.2/0/6\": \"pkgname\",\n" +
- " \"/5_1.2/0/7\": \"pkgversion\",\n" +
- " \"/5_1.2/0/9\": \"firmwareUpdateDeliveryMethod\",\n" +
- " \"/19_1.1/0/0\": \"dataRead\"\n" +
- " },\n" +
- " \"observe\": [\n" +
- " \"/5_1.2/0/3\",\n" +
- " \"/5_1.2/0/5\",\n" +
- " \"/5_1.2/0/6\",\n" +
- " \"/5_1.2/0/7\",\n" +
- " \"/5_1.2/0/9\",\n" +
- " \"/19_1.1/0/0\"\n" +
- " ],\n" +
- " \"attribute\": [],\n" +
- " \"telemetry\": [\n" +
- " \"/5_1.2/0/3\",\n" +
- " \"/5_1.2/0/5\",\n" +
- " \"/5_1.2/0/6\",\n" +
- " \"/5_1.2/0/7\",\n" +
- " \"/5_1.2/0/9\",\n" +
- " \"/19_1.1/0/0\"\n" +
- " ],\n" +
- " \"attributeLwm2m\": {}\n" +
- " }";
-
public static final String CLIENT_LWM2M_SETTINGS_19 =
" {\n" +
" \"useObject19ForOtaInfo\": true,\n" +
@@ -247,27 +204,4 @@ public abstract class AbstractOtaLwM2MIntegrationTest extends AbstractLwM2MInteg
log.warn("{}", statuses);
return statuses.containsAll(expectedStatuses);
}
-
- protected void resultReadOtaParams_19(String resourceIdVer, OtaPackageInfo otaPackageInfo) throws Exception {
- String actualResult = sendRPCById(resourceIdVer);
- ObjectNode rpcActualResult = JacksonUtil.fromString(actualResult, ObjectNode.class);
- assertEquals(ResponseCode.CONTENT.getName(), rpcActualResult.get("result").asText());
- String valStr = rpcActualResult.get("value").asText();
- String start = "{ id=0 value=";
- String valHexDec = valStr.substring(valStr.indexOf(start) + start.length(), (valStr.indexOf("}")));
- String valNode = new String(Hex.decodeHex((valHexDec).toCharArray()));
- ObjectNode actualResultVal = JacksonUtil.fromString(valNode, ObjectNode.class);
- assert actualResultVal != null;
- assertEquals(otaPackageInfo.getTitle(), actualResultVal.get(OTA_INFO_19_TITLE).asText());
- assertEquals(otaPackageInfo.getVersion(), actualResultVal.get(OTA_INFO_19_VERSION).asText());
- assertEquals(otaPackageInfo.getChecksum(), actualResultVal.get(OTA_INFO_19_FILE_CHECKSUM256).asText());
- assertEquals(otaPackageInfo.getFileName(), actualResultVal.get(OTA_INFO_19_FILE_NAME).asText());
- assertEquals(Optional.of(otaPackageInfo.getDataSize()), Optional.of((long) actualResultVal.get(OTA_INFO_19_FILE_SIZE).asInt()));
- }
-
- private String sendRPCById(String path) throws Exception {
- String setRpcRequest = "{\"method\": \"Read\", \"params\": {\"id\": \"" + path + "\"}}";
- return doPostAsync("/api/plugins/rpc/twoway/" + lwM2MTestClient.getDeviceIdStr(), setRpcRequest, String.class, status().isOk());
- }
-
}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota5LwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota5LwM2MIntegrationTest.java
index e4db6f70bf..0943491045 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota5LwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota5LwM2MIntegrationTest.java
@@ -21,7 +21,6 @@ import org.junit.Assert;
import org.junit.Test;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.OtaPackageInfo;
import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials;
import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
import org.thingsboard.server.common.data.kv.KvEntry;
@@ -46,10 +45,7 @@ import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.QUEU
import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.UPDATED;
import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.UPDATING;
import static org.thingsboard.server.dao.service.OtaPackageServiceTest.TARGET_FW_VERSION;
-import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.BINARY_APP_DATA_CONTAINER;
import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
-import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_0;
-import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.FW_INSTANCE_ID;
@Slf4j
public class Ota5LwM2MIntegrationTest extends AbstractOtaLwM2MIntegrationTest {
@@ -111,51 +107,4 @@ public class Ota5LwM2MIntegrationTest extends AbstractOtaLwM2MIntegrationTest {
.until(() -> getFwSwStateTelemetryFromAPI(device.getId().getId(), "fw_state"), this::predicateForStatuses);
log.warn("Object5: Got the ts: {}", ts);
}
-
- /**
- * ObjectId = 19/65533/0
- * {
- * "title" : "My firmware",
- * "version" : "fw.v.1.5.0-update",
- * "checksum" : "4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a",
- * "fileSize" : 1,
- * "fileName" : "filename.txt"
- * }
- * to base64
- * /5/0/5 -> Update Result (Res); 5/0/3 -> State;
- * => ((Res>=0 && Res<=9) && State=0)
- * => Write to Package/Write to Package URI -> DOWNLOADING ((Res>=0 && Res<=9) && State=1)
- * => Download Finished -> DOWNLOADED ((Res==0 || Res=8) && State=2)
- * => Executable resource Update is triggered / Initiate Firmware Update -> UPDATING (Res=0 && State=3)
- * => Update Successful [Res==1]
- * => Start / Res=0 -> "IDLE" ....
- * @throws Exception
- */
- @Test
- public void testFirmwareUpdateByObject5WithObject19_Ok() throws Exception {
- Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration19(OBSERVE_ATTRIBUTES_WITH_PARAMS_OTA5_19, getBootstrapServerCredentialsNoSec(NONE));
- DeviceProfile deviceProfile = createLwm2mDeviceProfile("profileFor" + this.CLIENT_ENDPOINT_OTA5 + "19_Ok", transportConfiguration);
- String endpoint = this.CLIENT_ENDPOINT_OTA5 + "19_Ok";
- LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(endpoint));
- final Device device = createLwm2mDevice(deviceCredentials, endpoint, deviceProfile.getId());
- createNewClient(SECURITY_NO_SEC, null, false, endpoint, device.getId().getId().toString());
- awaitObserveReadAll(6, device.getId().getId().toString());
-
- OtaPackageInfo otaPackageInfo = createFirmware(TARGET_FW_VERSION, deviceProfile.getId());
- device.setFirmwareId(otaPackageInfo.getId());
- final Device savedDevice = doPost("/api/device", device, Device.class);
-
- assertThat(savedDevice).as("saved device").isNotNull();
- assertThat(getDeviceFromAPI(device.getId().getId())).as("fetched device").isEqualTo(savedDevice);
-
- expectedStatuses = Arrays.asList(QUEUED, INITIATED, DOWNLOADING, DOWNLOADED, UPDATING, UPDATED);
- List ts = await("await on timeseries for FW")
- .atMost(TIMEOUT, TimeUnit.SECONDS)
- .until(() -> getFwSwStateTelemetryFromAPI(device.getId().getId(), "fw_state"), this::predicateForStatuses);
-
- String ver_Id_19 = lwM2MTestClient.getLeshanClient().getObjectTree().getModel().getObjectModel(BINARY_APP_DATA_CONTAINER).version;
- String resourceIdVer = "/" + BINARY_APP_DATA_CONTAINER + "_" + ver_Id_19 + "/" + FW_INSTANCE_ID + "/" + RESOURCE_ID_0;
- resultReadOtaParams_19(resourceIdVer, otaPackageInfo);
- log.warn("Object5 with Object19: Got the ts: {}", ts);
- }
}
diff --git a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota9LwM2MIntegrationTest.java b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota9LwM2MIntegrationTest.java
index b2617dd7ba..5371a6a3c0 100644
--- a/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota9LwM2MIntegrationTest.java
+++ b/application/src/test/java/org/thingsboard/server/transport/lwm2m/ota/sql/Ota9LwM2MIntegrationTest.java
@@ -19,7 +19,6 @@ import lombok.extern.slf4j.Slf4j;
import org.junit.Test;
import org.thingsboard.server.common.data.Device;
import org.thingsboard.server.common.data.DeviceProfile;
-import org.thingsboard.server.common.data.OtaPackageInfo;
import org.thingsboard.server.common.data.device.credentials.lwm2m.LwM2MDeviceCredentials;
import org.thingsboard.server.common.data.device.profile.Lwm2mDeviceProfileTransportConfiguration;
import org.thingsboard.server.common.data.kv.TsKvEntry;
@@ -36,10 +35,7 @@ import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.INIT
import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.QUEUED;
import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.UPDATED;
import static org.thingsboard.server.common.data.ota.OtaPackageUpdateStatus.VERIFIED;
-import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.BINARY_APP_DATA_CONTAINER;
import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.LwM2MProfileBootstrapConfigType.NONE;
-import static org.thingsboard.server.transport.lwm2m.Lwm2mTestHelper.RESOURCE_ID_0;
-import static org.thingsboard.server.transport.lwm2m.server.ota.DefaultLwM2MOtaUpdateService.SW_INSTANCE_ID;
@Slf4j
public class Ota9LwM2MIntegrationTest extends AbstractOtaLwM2MIntegrationTest {
@@ -51,7 +47,8 @@ public class Ota9LwM2MIntegrationTest extends AbstractOtaLwM2MIntegrationTest {
* => PKG integrity verified -> DELIVERED (Res=3 (Successfully Downloaded and package integrity verified) && State=3) -> INSTALLED;
* => Install -> INSTALLED (Res=2 SW successfully installed) && State=4) -> Start
*
- * */
+ *
+ */
@Test
public void testSoftwareUpdateByObject9() throws Exception {
String clientEndpoint = this.CLIENT_ENDPOINT_OTA9;
@@ -75,47 +72,4 @@ public class Ota9LwM2MIntegrationTest extends AbstractOtaLwM2MIntegrationTest {
.until(() -> getFwSwStateTelemetryFromAPI(device.getId().getId(), "sw_state"), this::predicateForStatuses);
log.warn("Object9: Got the ts: {}", ts);
}
- /**
- * ObjectId = 19/65534/0
- * {
- * "title" : "My sw",
- * "version" : "v1.0.19",
- * "checksum" : "4bf5122f344554c53bde2ebb8cd2b7e3d1600ad631c385a5d7cce23c7785459a",
- * "fileSize" : 1,
- * "fileName" : "filename.txt"
- * }
- * => Start -> INITIAL (State=0) -> DOWNLOAD STARTED;
- * => PKG / URI Write -> DOWNLOAD STARTED (Res=1 (Downloading) && State=1) -> DOWNLOADED
- * => PKG Written -> DOWNLOADED (Res=1 Initial && State=2) -> DELIVERED;
- * => PKG integrity verified -> DELIVERED (Res=3 (Successfully Downloaded and package integrity verified) && State=3) -> INSTALLED;
- * => Install -> INSTALLED (Res=2 SW successfully installed) && State=4) -> Start
- *
- * */
- @Test
- public void testSoftwareUpdateByObject9WithObject19_Ok() throws Exception {
- String clientEndpoint = this.CLIENT_ENDPOINT_OTA9_19;
- Lwm2mDeviceProfileTransportConfiguration transportConfiguration = getTransportConfiguration19(OBSERVE_ATTRIBUTES_WITH_PARAMS_OTA9_19, getBootstrapServerCredentialsNoSec(NONE));
- DeviceProfile deviceProfile = createLwm2mDeviceProfile("profileFor" + clientEndpoint, transportConfiguration);
- LwM2MDeviceCredentials deviceCredentials = getDeviceCredentialsNoSec(createNoSecClientCredentials(clientEndpoint));
- final Device device = createLwm2mDevice(deviceCredentials, clientEndpoint, deviceProfile.getId());
- createNewClient(SECURITY_NO_SEC, null, false, clientEndpoint, device.getId().getId().toString());
- awaitObserveReadAll(5, device.getId().getId().toString());
- OtaPackageInfo otaPackageInfo = createSoftware(deviceProfile.getId(), "v1.0.19");
- device.setSoftwareId(otaPackageInfo.getId());
- final Device savedDevice = doPost("/api/device", device, Device.class); //sync call
-
- assertThat(savedDevice).as("saved device").isNotNull();
- assertThat(getDeviceFromAPI(device.getId().getId())).as("fetched device").isEqualTo(savedDevice);
-
- expectedStatuses = List.of(
- QUEUED, INITIATED, DOWNLOADING, DOWNLOADING, DOWNLOADING, DOWNLOADED, VERIFIED, UPDATED);
- List ts = await("await on timeseries")
- .atMost(TIMEOUT, TimeUnit.SECONDS)
- .until(() -> getFwSwStateTelemetryFromAPI(device.getId().getId(), "sw_state"), this::predicateForStatuses);
-
- String ver_Id_19 = lwM2MTestClient.getLeshanClient().getObjectTree().getModel().getObjectModel(BINARY_APP_DATA_CONTAINER).version;
- String resourceIdVer = "/" + BINARY_APP_DATA_CONTAINER + "_" + ver_Id_19 + "/" + SW_INSTANCE_ID + "/" + RESOURCE_ID_0;
- resultReadOtaParams_19(resourceIdVer, otaPackageInfo);
- log.warn("Object9: Got the ts: {}", ts);
- }
}
diff --git a/application/src/test/java/org/thingsboard/server/utils/CalculatedFieldUtilsTest.java b/application/src/test/java/org/thingsboard/server/utils/CalculatedFieldUtilsTest.java
index db24e51123..f4bb9bc4c9 100644
--- a/application/src/test/java/org/thingsboard/server/utils/CalculatedFieldUtilsTest.java
+++ b/application/src/test/java/org/thingsboard/server/utils/CalculatedFieldUtilsTest.java
@@ -119,7 +119,7 @@ class CalculatedFieldUtilsTest {
}
@Test
- void toProtoAndFromProto_shouldCreatePropagationStateWithoutPropagationArgument() {
+ void toProtoAndFromProto_shouldCreatePropagationStateWithNotEmptyPropagationArgument() {
// given
CalculatedFieldEntityCtxId stateId = mock(CalculatedFieldEntityCtxId.class);
given(stateId.tenantId()).willReturn(TENANT_ID);
@@ -158,7 +158,7 @@ class CalculatedFieldUtilsTest {
assertThat(propagationState.getEntityId()).isEqualTo(DEVICE_ID);
assertThat(propagationState.getArguments()).isNotNull();
- assertThat(propagationState.getArguments().get(PROPAGATION_CONFIG_ARGUMENT)).isNull();
+ assertThat(propagationState.getArguments().get(PROPAGATION_CONFIG_ARGUMENT)).isEqualTo(propagationArgumentEntry);
assertThat(propagationState.getArguments().get("state")).isNotNull().isEqualTo(singleValueArgumentEntry);
assertThat(propagationState.getRequiredArguments()).isNull();
assertThat(propagationState.getReadinessStatus()).isNull();
diff --git a/common/actor/pom.xml b/common/actor/pom.xml
index 92b174ea61..1ce65906da 100644
--- a/common/actor/pom.xml
+++ b/common/actor/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 4.3.0-SNAPSHOT
+ 4.3.0-RC
common
org.thingsboard.common
diff --git a/common/cache/pom.xml b/common/cache/pom.xml
index fcf52e01b7..bc2fbd8bda 100644
--- a/common/cache/pom.xml
+++ b/common/cache/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 4.3.0-SNAPSHOT
+ 4.3.0-RC
common
org.thingsboard.common
diff --git a/common/cluster-api/pom.xml b/common/cluster-api/pom.xml
index 1f4b5ff41b..cbb082d26a 100644
--- a/common/cluster-api/pom.xml
+++ b/common/cluster-api/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 4.3.0-SNAPSHOT
+ 4.3.0-RC
common
org.thingsboard.common
diff --git a/common/coap-server/pom.xml b/common/coap-server/pom.xml
index 27ff645a0f..d2c5ffc7ab 100644
--- a/common/coap-server/pom.xml
+++ b/common/coap-server/pom.xml
@@ -22,7 +22,7 @@
4.0.0
org.thingsboard
- 4.3.0-SNAPSHOT
+ 4.3.0-RC
common
org.thingsboard.common
diff --git a/common/dao-api/pom.xml b/common/dao-api/pom.xml
index 160351d55d..6904d69aa3 100644
--- a/common/dao-api/pom.xml
+++ b/common/dao-api/pom.xml
@@ -20,7 +20,7 @@
4.0.0
org.thingsboard
- 4.3.0-SNAPSHOT
+ 4.3.0-RC
common
org.thingsboard.common
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/asset/AssetProfileService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/asset/AssetProfileService.java
index bf29654941..bc7af698f9 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/asset/AssetProfileService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/asset/AssetProfileService.java
@@ -62,4 +62,6 @@ public interface AssetProfileService extends EntityDaoService {
List findAssetProfileNamesByTenantId(TenantId tenantId, boolean activeOnly);
+ List findAssetProfilesByIds(TenantId tenantId, List assetProfileIds);
+
}
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java
index 1cd5ff9ff1..93535f29f0 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/customer/CustomerService.java
@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.page.PageData;
import org.thingsboard.server.common.data.page.PageLink;
import org.thingsboard.server.dao.entity.EntityDaoService;
+import java.util.List;
import java.util.Optional;
public interface CustomerService extends EntityDaoService {
@@ -50,4 +51,6 @@ public interface CustomerService extends EntityDaoService {
void deleteCustomersByTenantId(TenantId tenantId);
+ List findCustomersByTenantIdAndIds(TenantId tenantId, List customerIds);
+
}
diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java
index 264a808c97..1d850ac99b 100644
--- a/common/dao-api/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java
+++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/dashboard/DashboardService.java
@@ -80,4 +80,6 @@ public interface DashboardService extends EntityDaoService {
PageData findAllDashboardsIds(PageLink pageLink);
+ List