Merge remote-tracking branch 'origin/rc'

application/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>application</artifactId>

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

@@ -14,69 +14,3 @@
 -- limitations under the License.
 --
 
--- UPDATE TENANT PROFILE CONFIGURATION START
-
-UPDATE tenant_profile
-SET profile_data = jsonb_set(
-    profile_data,
-    '{configuration}',
-    jsonb_build_object(
-        'minAllowedScheduledUpdateIntervalInSecForCF', 10,
-        'maxRelationLevelPerCfArgument', 2,
-        'maxRelatedEntitiesToReturnPerCfArgument', 100,
-        'minAllowedDeduplicationIntervalInSecForCF', 10,
-        'minAllowedAggregationIntervalInSecForCF', 60,
-        'intermediateAggregationIntervalInSecForCF', 300,
-        'cfReevaluationCheckInterval', 60,
-        'alarmsReevaluationInterval', 60
-    )
-    ||
-    jsonb_strip_nulls(profile_data -> 'configuration')
-)
-WHERE NOT (
-    jsonb_strip_nulls(profile_data -> 'configuration') ?& ARRAY[
-        'minAllowedScheduledUpdateIntervalInSecForCF',
-        'maxRelationLevelPerCfArgument',
-        'maxRelatedEntitiesToReturnPerCfArgument',
-        'minAllowedDeduplicationIntervalInSecForCF',
-        'minAllowedAggregationIntervalInSecForCF',
-        'intermediateAggregationIntervalInSecForCF',
-        'cfReevaluationCheckInterval',
-        'alarmsReevaluationInterval'
-    ]
-);
-
--- UPDATE TENANT PROFILE CONFIGURATION END
-
--- CALCULATED FIELD UNIQUE CONSTRAINT UPDATE START
-
-ALTER TABLE calculated_field DROP CONSTRAINT IF EXISTS calculated_field_unq_key;
-ALTER TABLE calculated_field ADD CONSTRAINT calculated_field_unq_key UNIQUE (entity_id, type, name);
-
--- CALCULATED FIELD UNIQUE CONSTRAINT UPDATE END
-
--- CALCULATED FIELD OUTPUT STRATEGY UPDATE START
-
-UPDATE calculated_field
-SET configuration = jsonb_set(
-        configuration::jsonb,
-        '{output}',
-        (configuration::jsonb -> 'output')
-            || jsonb_build_object(
-                'strategy',
-                jsonb_build_object(
-                        'type', 'RULE_CHAIN'
-                )
-               ),
-        false
-                    )
-WHERE (configuration::jsonb -> 'output' -> 'strategy') IS NULL;
-
--- CALCULATED FIELD OUTPUT STRATEGY UPDATE END
-
--- REMOVAL OF CALCULATED FIELD LINKS PERSISTENCE START
-
-DROP TABLE IF EXISTS calculated_field_link;
-ANALYZE calculated_field;
-
--- REMOVAL OF CALCULATED FIELD LINKS PERSISTENCE END

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

@@ -425,7 +425,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
                 try {
                     cfCtx.init();
                 } catch (Exception e) {
-                    throw CalculatedFieldException.builder().ctx(cfCtx).eventEntity(cf.getEntityId()).cause(e).errorMessage("Failed to initialize CF context").build();
+                    throw CalculatedFieldException.builder().ctx(cfCtx).eventEntity(cf.getEntityId()).cause(e).errorMessage(e.getMessage()).build();
                 }
                 calculatedFields.put(cf.getId(), cfCtx);
                 // We use copy on write lists to safely pass the reference to another actor for the iteration.
@@ -456,7 +456,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
                 try {
                     newCfCtx.init();
                 } catch (Exception e) {
-                    throw CalculatedFieldException.builder().ctx(newCfCtx).eventEntity(newCfCtx.getEntityId()).cause(e).errorMessage("Failed to initialize CF context").build();
+                    throw CalculatedFieldException.builder().ctx(newCfCtx).eventEntity(newCfCtx.getEntityId()).cause(e).errorMessage(e.getMessage()).build();
                 } finally {
                     calculatedFields.put(newCf.getId(), newCfCtx);
                     List<CalculatedFieldCtx> oldCfList = entityIdCalculatedFields.get(newCf.getEntityId());
@@ -819,7 +819,7 @@ public class CalculatedFieldManagerMessageProcessor extends AbstractContextAware
         try {
             cfCtx.init();
         } catch (Exception e) {
-            throw CalculatedFieldException.builder().ctx(cfCtx).eventEntity(cf.getEntityId()).cause(e).errorMessage("Failed to initialize CF context").build();
+            throw CalculatedFieldException.builder().ctx(cfCtx).eventEntity(cf.getEntityId()).cause(e).errorMessage(e.getMessage()).build();
         } finally {
             calculatedFields.put(cf.getId(), cfCtx);
             // We use copy on write lists to safely pass the reference to another actor for the iteration.

application/src/main/java/org/thingsboard/server/install/ThingsboardInstallService.java

@@ -116,7 +116,6 @@ public class ThingsboardInstallService {
                     entityDatabaseSchemaService.createDatabaseIndexes();
 
                     // TODO: cleanup update code after each release
-                    systemDataLoaderService.updateDefaultNotificationConfigs(false);
 
                     // Runs upgrade scripts that are not possible in plain SQL.
                     dataUpdateService.updateData();

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

@@ -387,7 +387,7 @@ public class CalculatedFieldCtx implements Closeable {
             tbelExpressions.put(expression, engine);
         } catch (Exception e) {
             initialized = false;
-            throw new RuntimeException("Failed to init calculated field ctx. Invalid expression syntax.", e);
+            throw new RuntimeException("Failed to initialize CF context. The script expression is invalid. Please check for syntax errors or unsupported functions.", e);
         }
     }
 
@@ -404,7 +404,7 @@ public class CalculatedFieldCtx implements Closeable {
             simpleExpressions.put(expression, compiledExpression);
         } else {
             initialized = false;
-            throw new RuntimeException("Failed to init calculated field ctx. Invalid expression syntax.");
+            throw new RuntimeException("Failed to initialize CF context. The expression has invalid syntax or unknown variables. Ensure all mathematical operators are correct.");
         }
     }
 
@@ -726,6 +726,9 @@ public class CalculatedFieldCtx implements Closeable {
                 return true;
             }
         }
+        if (cfType == CalculatedFieldType.PROPAGATION && !propagationArgument.equals(other.propagationArgument)) {
+            return true;
+        }
         if (hasGeofencingZoneGroupConfigurationChanges(other)) {
             return true;
         }

application/src/main/java/org/thingsboard/server/service/install/DefaultDatabaseSchemaSettingsService.java

@@ -31,7 +31,7 @@ public class DefaultDatabaseSchemaSettingsService implements DatabaseSchemaSetti
     // This list should include all versions that are compatible for the upgrade in 4 digits format (like 4.2.0.0, etc.).
     // The compatibility cycle usually breaks when we have some scripts written in Java that may not work after a new release.
     // TODO: don't check the "patch" number, since upgrade is not required for patch releases
-    private static final List<String> SUPPORTED_VERSIONS_FOR_UPGRADE = List.of("4.2.1.0", "4.2.1.1", "4.2.1.2");
+    private static final List<String> SUPPORTED_VERSIONS_FOR_UPGRADE = List.of("4.3.0.0");
 
     private final ProjectInfo projectInfo;
     private final JdbcTemplate jdbcTemplate;

common/actor/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/cache/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/cluster-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/coap-server/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/dao-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/data/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/discovery-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/edge-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/edqs/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/message/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>common</artifactId>

common/proto/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/queue/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/script/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/script/remote-js-client/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>

common/script/script-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>script</artifactId>
     </parent>
     <groupId>org.thingsboard.common.script</groupId>

common/stats/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/transport/coap/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/http/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/lwm2m/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/mqtt/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/transport/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/transport/snmp/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
 

common/transport/transport-api/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.common</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.common.transport</groupId>

common/util/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

common/version-control/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>common</artifactId>
     </parent>
     <groupId>org.thingsboard.common</groupId>

dao/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>dao</artifactId>

dao/src/main/java/org/thingsboard/server/dao/sql/device/DefaultNativeAssetRepository.java

@@ -50,7 +50,8 @@ public class DefaultNativeAssetRepository extends AbstractNativeRepository imple
     @Override
     public PageData<ProfileEntityIdInfo> findProfileEntityIdInfosByTenantId(UUID tenantId, Pageable pageable) {
         String PROFILE_ASSET_ID_INFO_QUERY = String.format("SELECT tenant_id as tenantId, customer_id as customerId, asset_profile_id as profileId, id as id FROM asset WHERE tenant_id = '%s' ORDER BY created_time ASC LIMIT %%s OFFSET %%s", tenantId);
-        return find(COUNT_QUERY, PROFILE_ASSET_ID_INFO_QUERY, pageable, DefaultNativeAssetRepository::toInfo);
+        String COUNT_QUERY_BY_TENANT = String.format("SELECT count(id) FROM asset WHERE tenant_id = '%s';", tenantId);
+        return find(COUNT_QUERY_BY_TENANT, PROFILE_ASSET_ID_INFO_QUERY, pageable, DefaultNativeAssetRepository::toInfo);
     }
 
     private static ProfileEntityIdInfo toInfo(Map<String, Object> row) {

dao/src/main/java/org/thingsboard/server/dao/sql/device/DefaultNativeDeviceRepository.java

@@ -62,7 +62,8 @@ public class DefaultNativeDeviceRepository extends AbstractNativeRepository impl
     @Override
     public PageData<ProfileEntityIdInfo> findProfileEntityIdInfosByTenantId(UUID tenantId, Pageable pageable) {
         String PROFILE_DEVICE_ID_INFO_QUERY = String.format("SELECT tenant_id as tenantId, customer_id as customerId, device_profile_id as profileId, id as id FROM device WHERE tenant_id = '%s' ORDER BY created_time ASC LIMIT %%s OFFSET %%s", tenantId);
-        return find(COUNT_QUERY, PROFILE_DEVICE_ID_INFO_QUERY, pageable, DefaultNativeDeviceRepository::toInfo);
+        String COUNT_QUERY_BY_TENANT = String.format("SELECT count(id) FROM device WHERE tenant_id = '%s';", tenantId);
+        return find(COUNT_QUERY_BY_TENANT, PROFILE_DEVICE_ID_INFO_QUERY, pageable, DefaultNativeDeviceRepository::toInfo);
     }
 
     private static ProfileEntityIdInfo toInfo(Map<String, Object> row) {

edqs/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>edqs</artifactId>

monitoring/pom.xml

@@ -21,7 +21,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
 

msa/black-box-tests/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>

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

@@ -44,7 +44,6 @@ import java.util.Map;
 import java.util.Random;
 import java.util.function.Consumer;
 
-
 @Slf4j
 @Listeners(TestListener.class)
 public abstract class AbstractContainerTest {
@@ -170,19 +169,14 @@ public abstract class AbstractContainerTest {
         DeviceProfileProvisionConfiguration provisionConfiguration;
         String testProvisionDeviceKey = TEST_PROVISION_DEVICE_KEY;
         deviceProfile.setProvisionType(provisionType);
-        switch(provisionType) {
+        provisionConfiguration = switch (provisionType) {
-            case ALLOW_CREATE_NEW_DEVICES:
+            case ALLOW_CREATE_NEW_DEVICES -> new AllowCreateNewDevicesDeviceProfileProvisionConfiguration(TEST_PROVISION_DEVICE_SECRET);
-                provisionConfiguration = new AllowCreateNewDevicesDeviceProfileProvisionConfiguration(TEST_PROVISION_DEVICE_SECRET);
+            case CHECK_PRE_PROVISIONED_DEVICES -> new CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration(TEST_PROVISION_DEVICE_SECRET);
-                break;
+            default -> {
-            case CHECK_PRE_PROVISIONED_DEVICES:
-                provisionConfiguration = new CheckPreProvisionedDevicesDeviceProfileProvisionConfiguration(TEST_PROVISION_DEVICE_SECRET);
-                break;
-            default:
-            case DISABLED:
                 testProvisionDeviceKey = null;
-                provisionConfiguration = new DisabledDeviceProfileProvisionConfiguration(null);
+                yield new DisabledDeviceProfileProvisionConfiguration(null);
-                break;
+            }
-        }
+        };
         DeviceProfileData deviceProfileData = deviceProfile.getProfileData();
         deviceProfileData.setProvisionConfiguration(provisionConfiguration);
         deviceProfile.setProfileData(deviceProfileData);

msa/black-box-tests/src/test/java/org/thingsboard/server/msa/connectivity/JavaRestClientTest.java

@@ -16,6 +16,7 @@
 package org.thingsboard.server.msa.connectivity;
 
 import com.google.gson.JsonObject;
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClients;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
@@ -26,7 +27,6 @@ import org.apache.hc.client5.http.ssl.NoopHostnameVerifier;
 import org.apache.hc.core5.ssl.SSLContexts;
 import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.web.client.RestTemplate;
-import org.testcontainers.shaded.org.apache.commons.lang3.RandomStringUtils;
 import org.testng.annotations.AfterMethod;
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.BeforeMethod;
@@ -34,6 +34,10 @@ import org.testng.annotations.Test;
 import org.thingsboard.common.util.JacksonUtil;
 import org.thingsboard.rest.client.RestClient;
 import org.thingsboard.server.common.data.Device;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.DeviceProfileInfo;
+import org.thingsboard.server.common.data.DeviceProfileType;
+import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.EntityType;
 import org.thingsboard.server.common.data.Tenant;
 import org.thingsboard.server.common.data.User;
@@ -41,6 +45,11 @@ import org.thingsboard.server.common.data.alarm.Alarm;
 import org.thingsboard.server.common.data.alarm.AlarmInfo;
 import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
 import org.thingsboard.server.common.data.alarm.AlarmSeverity;
+import org.thingsboard.server.common.data.asset.AssetProfile;
+import org.thingsboard.server.common.data.asset.AssetProfileInfo;
+import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileConfiguration;
+import org.thingsboard.server.common.data.device.profile.DefaultDeviceProfileTransportConfiguration;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
 import org.thingsboard.server.common.data.domain.Domain;
 import org.thingsboard.server.common.data.domain.DomainInfo;
 import org.thingsboard.server.common.data.id.NotificationTargetId;
@@ -94,6 +103,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -109,8 +119,10 @@ public class JavaRestClientTest extends AbstractContainerTest {
     public static final String DEFAULT_NOTIFICATION_SUBJECT = "Just a test";
     public static final NotificationType DEFAULT_NOTIFICATION_TYPE = NotificationType.GENERAL;
     private RestClient restClient;
-    private Tenant tenant;
+    private Tenant tenant1;
-    private User user;
+    private Tenant tenant2;
+    private User tenantAdmin1;
+    private User tenantAdmin2;
 
     @BeforeClass
     public void beforeClass() throws Exception {
@@ -140,31 +152,45 @@ public class JavaRestClientTest extends AbstractContainerTest {
     public void setUp() throws Exception {
         restClient.login("sysadmin@thingsboard.org", "sysadmin");
 
-        // create tenant and tenant admin
+        // create tenant 1 and tenant admin 1
-        tenant = new Tenant();
+        tenant1 = new Tenant();
-        tenant.setTitle("Java Rest Client Test Tenant " + RandomStringUtils.randomAlphabetic(5));
+        tenant1.setTitle("Java Rest Client Test Tenant " + RandomStringUtils.insecure().randomAlphabetic(5));
-        tenant = restClient.saveTenant(tenant);
+        tenant1 = restClient.saveTenant(tenant1);
 
-        String email = RandomStringUtils.randomAlphabetic(5) + "@gmail.com";
+        String email1 = RandomStringUtils.insecure().randomAlphabetic(5) + "@gmail.com";
-        user = restClient.saveUser(defaultTenantAdmin(tenant.getId(), email), false);
+        tenantAdmin1 = restClient.saveUser(defaultTenantAdmin(tenant1.getId(), email1), false);
-        restClient.activateUser(user.getId(), "password123", false);
+        restClient.activateUser(tenantAdmin1.getId(), "password123", false);
-        restClient.login(email, "password123");
+
+        // create tenant 2 and tenant admin 2
+        tenant2 = new Tenant();
+        tenant2.setTitle("Java Rest Client Test Tenant " + RandomStringUtils.insecure().randomAlphabetic(5));
+        tenant2 = restClient.saveTenant(tenant2);
+
+        String email2 = RandomStringUtils.insecure().randomAlphabetic(5) + "@gmail.com";
+        tenantAdmin2 = restClient.saveUser(defaultTenantAdmin(tenant2.getId(), email2), false);
+        restClient.activateUser(tenantAdmin2.getId(), "password123", false);
+
+        // tenant 1 tenant admin by default
+        restClient.login(tenantAdmin1.getEmail(), "password123");
     }
 
     @AfterMethod
     public void tearDown() {
         restClient.login("sysadmin@thingsboard.org", "sysadmin");
-        if (tenant != null) {
+        if (tenant1 != null) {
-            restClient.deleteTenant(tenant.getId());
+            restClient.deleteTenant(tenant1.getId());
+        }
+        if (tenant2 != null) {
+            restClient.deleteTenant(tenant2.getId());
         }
     }
 
     @Test
     public void testGetAlarmsV2() {
-        Device device = restClient.saveDevice(defaultDevicePrototype(RandomStringUtils.randomAlphabetic(5)));
+        Device device = restClient.saveDevice(defaultDevicePrototype(RandomStringUtils.insecure().randomAlphabetic(5)));
         assertThat(device).isNotNull();
 
-        String type = "High temp" + RandomStringUtils.randomAlphabetic(5);
+        String type = "High temp" + RandomStringUtils.insecure().randomAlphabetic(5);
         Alarm alarm = Alarm.builder()
                 .originator(device.getId())
                 .severity(AlarmSeverity.CRITICAL)
@@ -202,7 +228,7 @@ public class JavaRestClientTest extends AbstractContainerTest {
 
     @Test
     public void testTimeSeriesByReadTsKvQueries() {
-        Device device = restClient.saveDevice(defaultDevicePrototype(RandomStringUtils.randomAlphabetic(5)));
+        Device device = restClient.saveDevice(defaultDevicePrototype(RandomStringUtils.insecure().randomAlphabetic(5)));
         assertThat(device).isNotNull();
 
         DeviceCredentials deviceCredentials = restClient.getDeviceCredentialsByDeviceId(device.getId()).get();
@@ -230,7 +256,7 @@ public class JavaRestClientTest extends AbstractContainerTest {
 
     @Test
     public void testFindNotifications() {
-        NotificationTarget notificationTarget = createNotificationTarget(user.getId());
+        NotificationTarget notificationTarget = createNotificationTarget(tenantAdmin1.getId());
         String notificationText1 = "Notification 1";
         NotificationTemplate notificationTemplate = createNotificationTemplate(DEFAULT_NOTIFICATION_TYPE, DEFAULT_NOTIFICATION_SUBJECT, notificationText1, new NotificationDeliveryMethod[]{WEB});
         NotificationRequest notificationRequest = submitNotificationRequest(notificationTarget.getId(), notificationTemplate.getId());
@@ -248,7 +274,7 @@ public class JavaRestClientTest extends AbstractContainerTest {
 
         NotificationRequestPreview requestPreview = restClient.getNotificationRequestPreview(notificationRequest, 10);
         assertThat(requestPreview.getTotalRecipientsCount()).isEqualTo(1);
-        assertThat(requestPreview.getRecipientsPreview()).isEqualTo(List.of(user.getEmail()));
+        assertThat(requestPreview.getRecipientsPreview()).isEqualTo(List.of(tenantAdmin1.getEmail()));
 
         PageData<Notification> notifications = restClient.getNotifications(false, WEB, new PageLink(30));
         assertThat(notifications.getTotalElements()).isEqualTo(2);
@@ -316,7 +342,7 @@ public class JavaRestClientTest extends AbstractContainerTest {
         restClient.login("sysadmin@thingsboard.org", "sysadmin");
 
         Domain domain = new Domain();
-        String prefix = RandomStringUtils.randomAlphabetic(5).toLowerCase();
+        String prefix = RandomStringUtils.insecure().randomAlphabetic(5).toLowerCase();
         domain.setName(prefix + ".test.com");
         Domain savedDomain = restClient.saveDomain(domain);
         assertThat(savedDomain.getName()).isEqualTo(domain.getName());
@@ -330,10 +356,10 @@ public class JavaRestClientTest extends AbstractContainerTest {
         restClient.login("sysadmin@thingsboard.org", "sysadmin");
 
         MobileApp mobileApp = new MobileApp();
-        String prefix = RandomStringUtils.randomAlphabetic(5).toLowerCase();
+        String prefix = RandomStringUtils.insecure().randomAlphabetic(5).toLowerCase();
         mobileApp.setPkgName(prefix + "test.app.apple");
         mobileApp.setPlatformType(PlatformType.ANDROID);
-        mobileApp.setAppSecret(RandomStringUtils.randomAlphabetic(20));
+        mobileApp.setAppSecret(RandomStringUtils.insecure().randomAlphabetic(20));
         mobileApp.setStatus(MobileAppStatus.DRAFT);
 
         MobileApp savedMobileApp = restClient.saveMobileApp(mobileApp);
@@ -343,7 +369,7 @@ public class JavaRestClientTest extends AbstractContainerTest {
         assertThat(retrieved.getData()).hasSize(1);
 
         MobileAppBundle mobileAppBundle = new MobileAppBundle();
-        String bundlePrefix = RandomStringUtils.randomAlphabetic(5).toLowerCase();
+        String bundlePrefix = RandomStringUtils.insecure().randomAlphabetic(5).toLowerCase();
         mobileAppBundle.setTitle(bundlePrefix + "Test Bundle");
         mobileAppBundle.setAndroidAppId(savedMobileApp.getId());
 
@@ -357,7 +383,7 @@ public class JavaRestClientTest extends AbstractContainerTest {
         filter.setUsersIds(Arrays.stream(usersIds).map(UUIDBased::getId).toList());
 
         NotificationTarget notificationTarget = new NotificationTarget();
-        notificationTarget.setName(filter + RandomStringUtils.randomNumeric(5));
+        notificationTarget.setName(filter + RandomStringUtils.insecure().randomNumeric(5));
         PlatformUsersNotificationTargetConfig targetConfig = new PlatformUsersNotificationTargetConfig();
         targetConfig.setUsersFilter(filter);
         notificationTarget.setConfiguration(targetConfig);
@@ -367,7 +393,7 @@ public class JavaRestClientTest extends AbstractContainerTest {
     private NotificationTemplate createNotificationTemplate(NotificationType notificationType, String subject,
                                                             String text, NotificationDeliveryMethod... deliveryMethods) {
         NotificationTemplate notificationTemplate = new NotificationTemplate();
-        notificationTemplate.setName("Notification template: " + RandomStringUtils.randomAlphabetic(5));
+        notificationTemplate.setName("Notification template: " + RandomStringUtils.insecure().randomAlphabetic(5));
         notificationTemplate.setNotificationType(notificationType);
         NotificationTemplateConfig config = new NotificationTemplateConfig();
         config.setDeliveryMethodsTemplates(new HashMap<>());
@@ -418,9 +444,9 @@ public class JavaRestClientTest extends AbstractContainerTest {
     public void testApiKeyOperations() {
         // Create an API key
         ApiKeyInfo apiKeyInfo = new ApiKeyInfo();
-        apiKeyInfo.setDescription("Test API Key " + RandomStringUtils.randomAlphabetic(5));
+        apiKeyInfo.setDescription("Test API Key " + RandomStringUtils.insecure().randomAlphabetic(5));
         apiKeyInfo.setEnabled(true);
-        apiKeyInfo.setUserId(user.getId());
+        apiKeyInfo.setUserId(tenantAdmin1.getId());
         apiKeyInfo.setExpirationTime(0);
 
         ApiKey savedApiKey = restClient.saveApiKey(apiKeyInfo);
@@ -428,18 +454,18 @@ public class JavaRestClientTest extends AbstractContainerTest {
         assertThat(savedApiKey.getId()).isNotNull();
         assertThat(savedApiKey.getDescription()).isEqualTo(apiKeyInfo.getDescription());
         assertThat(savedApiKey.isEnabled()).isTrue();
-        assertThat(savedApiKey.getUserId()).isEqualTo(user.getId());
+        assertThat(savedApiKey.getUserId()).isEqualTo(tenantAdmin1.getId());
-        assertThat(savedApiKey.getTenantId()).isEqualTo(tenant.getId());
+        assertThat(savedApiKey.getTenantId()).isEqualTo(tenant1.getId());
         assertThat(savedApiKey.getValue()).isNotNull();
 
         // Get user API keys
-        PageData<ApiKeyInfo> apiKeys = restClient.getUserApiKeys(user.getId(), new PageLink(10));
+        PageData<ApiKeyInfo> apiKeys = restClient.getUserApiKeys(tenantAdmin1.getId(), new PageLink(10));
         assertThat(apiKeys).isNotNull();
         assertThat(apiKeys.getData()).hasSize(1);
         assertThat(apiKeys.getData().get(0).getId()).isEqualTo(savedApiKey.getId());
 
         // Update API key description
-        String updatedDescription = "Updated description " + RandomStringUtils.randomAlphabetic(5);
+        String updatedDescription = "Updated description " + RandomStringUtils.insecure().randomAlphabetic(5);
         ApiKeyInfo updatedApiKeyInfo = restClient.updateApiKeyDescription(savedApiKey.getId(), updatedDescription);
         assertThat(updatedApiKeyInfo).isNotNull();
         assertThat(updatedApiKeyInfo.getDescription()).isEqualTo(updatedDescription);
@@ -458,8 +484,96 @@ public class JavaRestClientTest extends AbstractContainerTest {
         restClient.deleteApiKey(savedApiKey.getId());
 
         // Verify the API key is deleted
-        PageData<ApiKeyInfo> apiKeysAfterDelete = restClient.getUserApiKeys(user.getId(), new PageLink(10));
+        PageData<ApiKeyInfo> apiKeysAfterDelete = restClient.getUserApiKeys(tenantAdmin1.getId(), new PageLink(10));
         assertThat(apiKeysAfterDelete.getData()).isEmpty();
     }
 
+    @Test
+    public void testGetDeviceProfileInfosByIds() {
+        var profileData = new DeviceProfileData();
+        profileData.setConfiguration(new DefaultDeviceProfileConfiguration());
+        profileData.setTransportConfiguration(new DefaultDeviceProfileTransportConfiguration());
+
+        // Create a device profile in tenant1 (current tenant)
+        var deviceProfile1 = new DeviceProfile();
+        deviceProfile1.setTenantId(tenant1.getId());
+        deviceProfile1.setName("Device Profile 1");
+        deviceProfile1.setType(DeviceProfileType.DEFAULT);
+        deviceProfile1.setTransportType(DeviceTransportType.DEFAULT);
+        deviceProfile1.setProfileData(profileData);
+        deviceProfile1 = restClient.saveDeviceProfile(deviceProfile1);
+
+        var deviceProfile2 = new DeviceProfile();
+        deviceProfile2.setTenantId(tenant1.getId());
+        deviceProfile2.setName("Device Profile 2");
+        deviceProfile2.setType(DeviceProfileType.DEFAULT);
+        deviceProfile2.setTransportType(DeviceTransportType.DEFAULT);
+        deviceProfile2.setProfileData(profileData);
+        deviceProfile2 = restClient.saveDeviceProfile(deviceProfile2);
+
+        // Create two more device profiles in tenant2 (different tenant)
+        restClient.login(tenantAdmin2.getEmail(), "password123");
+
+        var deviceProfile3 = new DeviceProfile();
+        deviceProfile3.setTenantId(tenant2.getId());
+        deviceProfile3.setName("Device Profile 3");
+        deviceProfile3.setType(DeviceProfileType.DEFAULT);
+        deviceProfile3.setTransportType(DeviceTransportType.DEFAULT);
+        deviceProfile3.setProfileData(profileData);
+        deviceProfile3 = restClient.saveDeviceProfile(deviceProfile3);
+
+        var deviceProfile4 = new DeviceProfile();
+        deviceProfile4.setTenantId(tenant2.getId());
+        deviceProfile4.setName("Device Profile 4");
+        deviceProfile4.setType(DeviceProfileType.DEFAULT);
+        deviceProfile4.setTransportType(DeviceTransportType.DEFAULT);
+        deviceProfile4.setProfileData(profileData);
+        deviceProfile4 = restClient.saveDeviceProfile(deviceProfile4);
+
+        // Attempt to fetch profiles 1 and 3 while acting as Tenant 2.
+        // - Profile 1: Filtered out because it belongs to a different tenant.
+        // - Profile 2: Filtered out because it belongs to a different tenant and was not requested.
+        // - Profile 3: Should be returned.
+        // - Profile 4: Filtered out; it belongs to the correct tenant, but was not requested by ID.
+        List<DeviceProfileInfo> profiles = restClient.getDeviceProfileInfosByIds(Set.of(deviceProfile1.getUuidId(), deviceProfile3.getUuidId()));
+        assertThat(profiles).hasSize(1);
+        assertThat(profiles.get(0).getId()).isEqualTo(deviceProfile3.getId());
+    }
+
+    @Test
+    public void testGetAssetProfilesByIds() {
+        // Create two asset profiles in tenant1 (current tenant)
+        var assetProfile1 = new AssetProfile();
+        assetProfile1.setTenantId(tenant1.getId());
+        assetProfile1.setName("Asset Profile 1");
+        assetProfile1 = restClient.saveAssetProfile(assetProfile1);
+
+        var assetProfile2 = new AssetProfile();
+        assetProfile2.setTenantId(tenant1.getId());
+        assetProfile2.setName("Asset Profile 2");
+        assetProfile2 = restClient.saveAssetProfile(assetProfile2);
+
+        // Create two more asset profiles in tenant2 (different tenant)
+        restClient.login(tenantAdmin2.getEmail(), "password123");
+
+        var assetProfile3 = new AssetProfile();
+        assetProfile3.setTenantId(tenant2.getId());
+        assetProfile3.setName("Asset Profile 3");
+        assetProfile3 = restClient.saveAssetProfile(assetProfile3);
+
+        var assetProfile4 = new AssetProfile();
+        assetProfile4.setTenantId(tenant2.getId());
+        assetProfile4.setName("Asset Profile 4");
+        assetProfile4 = restClient.saveAssetProfile(assetProfile4);
+
+        // Attempt to fetch profiles 1 and 3 while acting as Tenant 2.
+        // - Profile 1: Filtered out because it belongs to a different tenant.
+        // - Profile 2: Filtered out because it belongs to a different tenant and was not requested.
+        // - Profile 3: Should be returned.
+        // - Profile 4: Filtered out; it belongs to the correct tenant, but was not requested by ID.
+        List<AssetProfileInfo> profiles = restClient.getAssetProfilesByIds(Set.of(assetProfile1.getUuidId(), assetProfile3.getUuidId()));
+        assertThat(profiles).hasSize(1);
+        assertThat(profiles.get(0).getId()).isEqualTo(assetProfile3.getId());
+    }
+
 }

msa/edqs/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>

msa/js-executor/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thingsboard-js-executor",
   "private": true,
-  "version": "4.3.0",
+  "version": "4.3.0.1",
   "description": "ThingsBoard JavaScript Executor Microservice",
   "main": "server.ts",
   "bin": "server.js",

msa/js-executor/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>

msa/monitoring/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
 

msa/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>msa</artifactId>

msa/tb-node/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>

msa/tb/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>

msa/transport/coap/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>

msa/transport/http/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>

msa/transport/lwm2m/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>

msa/transport/mqtt/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard.msa</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.msa.transport</groupId>

msa/transport/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>

msa/transport/snmp/pom.xml

@@ -21,7 +21,7 @@
     <parent>
         <groupId>org.thingsboard.msa</groupId>
         <artifactId>transport</artifactId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
     </parent>
 
     <groupId>org.thingsboard.msa.transport</groupId>

msa/vc-executor-docker/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>

msa/vc-executor/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>

msa/web-ui/package.json

@@ -1,7 +1,7 @@
 {
   "name": "thingsboard-web-ui",
   "private": true,
-  "version": "4.3.0",
+  "version": "4.3.0.1",
   "description": "ThingsBoard Web UI Microservice",
   "main": "server.ts",
   "bin": "server.js",

msa/web-ui/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>msa</artifactId>
     </parent>
     <groupId>org.thingsboard.msa</groupId>

netty-mqtt/pom.xml

@@ -19,11 +19,11 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>netty-mqtt</artifactId>
-    <version>4.3.0-RC</version>
+    <version>4.3.0.1-SNAPSHOT</version>
     <packaging>jar</packaging>
 
     <name>Netty MQTT Client</name>

pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.thingsboard</groupId>
     <artifactId>thingsboard</artifactId>
-    <version>4.3.0-RC</version>
+    <version>4.3.0.1-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>Thingsboard</name>

rest-client/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>rest-client</artifactId>
@@ -51,6 +51,10 @@
             <groupId>com.auth0</groupId>
             <artifactId>java-jwt</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.apache.httpcomponents.core5</groupId>
+            <artifactId>httpcore5</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

rest-client/src/main/java/org/thingsboard/rest/client/RestClient.java

@@ -23,6 +23,7 @@ import lombok.Getter;
 import lombok.SneakyThrows;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.concurrent.LazyInitializer;
+import org.apache.hc.core5.net.URIBuilder;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.core.io.ByteArrayResource;
 import org.springframework.core.io.Resource;
@@ -157,11 +158,11 @@ import org.thingsboard.server.common.data.oauth2.PlatformType;
 import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.page.PageData;
-import org.thingsboard.server.common.data.pat.ApiKey;
-import org.thingsboard.server.common.data.pat.ApiKeyInfo;
 import org.thingsboard.server.common.data.page.PageLink;
 import org.thingsboard.server.common.data.page.SortOrder;
 import org.thingsboard.server.common.data.page.TimePageLink;
+import org.thingsboard.server.common.data.pat.ApiKey;
+import org.thingsboard.server.common.data.pat.ApiKeyInfo;
 import org.thingsboard.server.common.data.plugin.ComponentDescriptor;
 import org.thingsboard.server.common.data.plugin.ComponentType;
 import org.thingsboard.server.common.data.query.AlarmCountQuery;
@@ -210,17 +211,21 @@ import org.thingsboard.server.common.data.widget.WidgetsBundle;
 import java.io.Closeable;
 import java.io.IOException;
 import java.net.URI;
+import java.net.URISyntaxException;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Optional;
+import java.util.Set;
 import java.util.UUID;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static java.util.stream.Collectors.joining;
 import static org.thingsboard.server.common.data.StringUtils.isEmpty;
 
 public class RestClient implements Closeable {
@@ -1588,6 +1593,33 @@ public class RestClient implements Closeable {
                 }, activeOnly).getBody();
     }
 
+    public List<DeviceProfileInfo> getDeviceProfileInfosByIds(Set<UUID> ids) {
+        URIBuilder builder;
+        try {
+            builder = new URIBuilder(baseURL);
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Invalid base URL: " + baseURL, e);
+        }
+
+        builder.appendPath("/api/deviceProfileInfos");
+
+        String commaSeparatedIds = ids.stream()
+                .filter(Objects::nonNull)
+                .map(UUID::toString)
+                .collect(joining(","));
+
+        builder.addParameter("deviceProfileIds", commaSeparatedIds);
+
+        URI uri;
+        try {
+            uri = builder.build();
+        } catch (URISyntaxException e) {
+            throw new IllegalStateException("Failed to construct API URI from base URL and provided params", e);
+        }
+
+        return restTemplate.exchange(uri, HttpMethod.GET, null, new ParameterizedTypeReference<List<DeviceProfileInfo>>() {}).getBody();
+    }
+
     public JsonNode claimDevice(String deviceName, ClaimRequest claimRequest) {
         return restTemplate.exchange(
                 baseURL + "/api/customer/device/{deviceName}/claim",
@@ -1824,6 +1856,33 @@ public class RestClient implements Closeable {
                 }, params).getBody();
     }
 
+    public List<AssetProfileInfo> getAssetProfilesByIds(Set<UUID> ids) {
+        URIBuilder builder;
+        try {
+            builder = new URIBuilder(baseURL);
+        } catch (URISyntaxException e) {
+            throw new IllegalArgumentException("Invalid base URL: " + baseURL, e);
+        }
+
+        builder.appendPath("/api/assetProfileInfos");
+
+        String commaSeparatedIds = ids.stream()
+                .filter(Objects::nonNull)
+                .map(UUID::toString)
+                .collect(joining(","));
+
+        builder.addParameter("assetProfileIds", commaSeparatedIds);
+
+        URI uri;
+        try {
+            uri = builder.build();
+        } catch (URISyntaxException e) {
+            throw new IllegalStateException("Failed to construct API URI from base URL and provided params", e);
+        }
+
+        return restTemplate.exchange(uri, HttpMethod.GET, null, new ParameterizedTypeReference<List<AssetProfileInfo>>() {}).getBody();
+    }
+
     public Long countEntitiesByQuery(EntityCountQuery query) {
         return restTemplate.postForObject(baseURL + "/api/entitiesQuery/count", query, Long.class);
     }

rule-engine/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>rule-engine</artifactId>

rule-engine/rule-engine-api/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>

rule-engine/rule-engine-components/pom.xml

@@ -22,7 +22,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>rule-engine</artifactId>
     </parent>
     <groupId>org.thingsboard.rule-engine</groupId>

tools/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>tools</artifactId>

transport/coap/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>

transport/http/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>

transport/lwm2m/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>

transport/mqtt/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
     <groupId>org.thingsboard.transport</groupId>

transport/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <artifactId>transport</artifactId>

transport/snmp/pom.xml

@@ -21,7 +21,7 @@
 
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>transport</artifactId>
     </parent>
 

ui-ngx/package.json

@@ -1,6 +1,6 @@
 {
   "name": "thingsboard",
-  "version": "4.3.0",
+  "version": "4.3.0.1",
   "scripts": {
     "ng": "ng",
     "start": "node --max_old_space_size=8048 ./node_modules/@angular/cli/bin/ng serve --configuration development --host 0.0.0.0 --open",

ui-ngx/pom.xml

@@ -20,7 +20,7 @@
     <modelVersion>4.0.0</modelVersion>
     <parent>
         <groupId>org.thingsboard</groupId>
-        <version>4.3.0-RC</version>
+        <version>4.3.0.1-SNAPSHOT</version>
         <artifactId>thingsboard</artifactId>
     </parent>
     <groupId>org.thingsboard</groupId>