From 90fc84ea31bccb651cce4acf72608f96a248cc64 Mon Sep 17 00:00:00 2001 From: Oleksandra Matviienko Date: Fri, 24 Apr 2026 23:18:47 +0200 Subject: [PATCH] Technical cleanup of TenantId construction in tests and production code --- .../discovery/HashPartitionServiceTest.java | 6 +-- .../cf/DefaultCalculatedFieldCacheTest.java | 52 +++++++++---------- .../provision/DeviceProvisionServiceTest.java | 2 +- .../DefaultTbAssetProfileCacheTest.java | 14 ++--- .../DefaultTbDeviceProfileCacheTest.java | 14 ++--- .../queue/DefaultTbClusterServiceTest.java | 4 +- .../TbEntityLocalSubsInfoTest.java | 2 +- .../ws/DefaultWebSocketServiceTest.java | 2 +- .../session/GatewaySessionHandlerTest.java | 2 +- .../dao/service/TbCacheSerializationTest.java | 2 +- .../attributes/BaseAttributesServiceTest.java | 16 +++--- .../service/event/BaseEventServiceTest.java | 2 +- .../dao/sql/event/JpaBaseEventDaoTest.java | 2 +- .../query/DefaultQueryLogComponentTest.java | 2 +- .../dao/sql/tenant/JpaTenantDaoTest.java | 2 +- .../sql/widget/JpaWidgetsBundleDaoTest.java | 4 +- .../action/TbAssignToCustomerNodeTest.java | 2 +- .../action/TbCreateRelationNodeTest.java | 2 +- .../action/TbDeleteRelationNodeTest.java | 2 +- .../TbUnassignFromCustomerNodeTest.java | 2 +- .../filter/TbAssetTypeSwitchNodeTest.java | 2 +- .../filter/TbCheckAlarmStatusNodeTest.java | 2 +- .../filter/TbCheckRelationNodeTest.java | 2 +- .../filter/TbDeviceTypeSwitchNodeTest.java | 2 +- .../engine/flow/TbRuleChainInputNodeTest.java | 2 +- .../TbGetCustomerDetailsNodeTest.java | 2 +- .../metadata/TbGetDeviceAttrNodeTest.java | 2 +- .../TbGetOriginatorFieldsNodeTest.java | 2 +- .../TbGetRelatedAttributeNodeTest.java | 4 +- .../TbGetTenantAttributeNodeTest.java | 2 +- .../metadata/TbGetTenantDetailsNodeTest.java | 2 +- .../util/EntitiesFieldsAsyncLoaderTest.java | 4 +- ...ntitiesRelatedDeviceIdAsyncLoaderTest.java | 2 +- ...ntitiesRelatedEntityIdAsyncLoaderTest.java | 2 +- 34 files changed, 84 insertions(+), 84 deletions(-) diff --git a/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java b/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java index b1d59c031a..727a9c1aa5 100644 --- a/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java +++ b/application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java @@ -149,7 +149,7 @@ public class HashPartitionServiceTest { Random random = new Random(); long ts = new SimpleDateFormat("dd-MM-yyyy").parse("06-12-2016").getTime() - TimeUnit.DAYS.toMillis(tenantCount); for (int tenantIndex = 0; tenantIndex < tenantCount; tenantIndex++) { - TenantId tenantId = new TenantId(Uuids.startOf(ts)); + TenantId tenantId = TenantId.fromUUID(Uuids.startOf(ts)); ts += TimeUnit.DAYS.toMillis(1) + random.nextInt(1000); for (int queueIndex = 0; queueIndex < queueCount; queueIndex++) { QueueKey queueKey = new QueueKey(ServiceType.TB_RULE_ENGINE, "queue" + queueIndex, tenantId); @@ -190,7 +190,7 @@ public class HashPartitionServiceTest { Map tenants = new HashMap<>(); for (TenantProfileId tenantProfileId : isolatedTenantProfiles) { for (int i = 0; i < tenantsCountPerProfile; i++) { - tenants.put(new TenantId(UUID.randomUUID()), tenantProfileId); + tenants.put(TenantId.fromUUID(UUID.randomUUID()), tenantProfileId); } } @@ -299,7 +299,7 @@ public class HashPartitionServiceTest { Queue systemQueue = createQueue(TenantId.SYS_TENANT_ID, 10); queues.add(systemQueue); - TenantId tenantId = new TenantId(UUID.randomUUID()); + TenantId tenantId = TenantId.fromUUID(UUID.randomUUID()); mockRoutingInfo(tenantId, tenantProfileId, false); // not isolated yet mockQueues(queues); diff --git a/application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java b/application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java index 3ee229e7a0..853c7f6127 100644 --- a/application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java +++ b/application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java @@ -92,8 +92,8 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_tenantDeleted_evictsAllTenantCfsFromAllMaps() { - TenantId tenant1 = new TenantId(UUID.randomUUID()); - TenantId tenant2 = new TenantId(UUID.randomUUID()); + TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID()); + TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID()); DeviceId device1 = new DeviceId(UUID.randomUUID()); DeviceId device2 = new DeviceId(UUID.randomUUID()); @@ -110,7 +110,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_tenantDeleted_evictsOwnerEntities() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); stubDeviceOwner(tenant, device, tenant); @@ -125,7 +125,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_tenantDeleted_removesLinksToLinkedEntities() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceId cfEntity = new DeviceId(UUID.randomUUID()); DeviceId linkedDevice = new DeviceId(UUID.randomUUID()); @@ -139,7 +139,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_tenantUpdated_doesNotEvictCfs() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); CalculatedField cf = addCfToCache(tenant, device); @@ -152,7 +152,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_deviceDeleted_evictsCfsForThatDevice() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); CalculatedField cf = addCfToCache(tenant, device); @@ -164,7 +164,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_deviceDeleted_removesLinksForLinkedEntities() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); DeviceId linkedDevice = new DeviceId(UUID.randomUUID()); addCfToCache(tenant, device, linkedDevice); @@ -176,7 +176,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_deviceDeleted_evictsDeviceFromOwnerEntities() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); CustomerId customer = new CustomerId(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); stubDeviceOwner(tenant, device, customer); @@ -191,7 +191,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_assetDeleted_evictsCfsForThatAsset() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); AssetId asset = new AssetId(UUID.randomUUID()); CalculatedField cf = addCfToCache(tenant, asset); @@ -203,7 +203,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_deviceCreated_addsDeviceToOwnerEntities() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); CustomerId customer = new CustomerId(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); stubDeviceOwner(tenant, device, customer); @@ -217,7 +217,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_customerDeleted_evictsCustomerOwnerEntries() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); CustomerId customer = new CustomerId(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); stubDeviceOwner(tenant, device, customer); @@ -235,7 +235,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_deviceProfileDeleted_evictsCfsForThatProfile() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID()); CalculatedField cf = addCfToCache(tenant, profileId); @@ -247,7 +247,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_deviceProfileDeleted_removesLinksForLinkedEntities() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID()); DeviceId linkedDevice = new DeviceId(UUID.randomUUID()); addCfToCache(tenant, profileId, linkedDevice); @@ -259,7 +259,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_deviceProfileDeleted_doesNotEvictOtherProfilesCfs() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceProfileId profile1 = new DeviceProfileId(UUID.randomUUID()); DeviceProfileId profile2 = new DeviceProfileId(UUID.randomUUID()); CalculatedField cf1 = addCfToCache(tenant, profile1); @@ -275,7 +275,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_deviceProfileUpdated_doesNotEvictCfs() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID()); CalculatedField cf = addCfToCache(tenant, profileId); @@ -287,7 +287,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_assetProfileDeleted_evictsCfsForThatProfile() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); AssetProfileId profileId = new AssetProfileId(UUID.randomUUID()); CalculatedField cf = addCfToCache(tenant, profileId); @@ -299,7 +299,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_assetProfileDeleted_removesLinksForLinkedEntities() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); AssetProfileId profileId = new AssetProfileId(UUID.randomUUID()); AssetId linkedAsset = new AssetId(UUID.randomUUID()); addCfToCache(tenant, profileId, linkedAsset); @@ -311,7 +311,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_assetProfileDeleted_doesNotEvictOtherProfilesCfs() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); AssetProfileId profile1 = new AssetProfileId(UUID.randomUUID()); AssetProfileId profile2 = new AssetProfileId(UUID.randomUUID()); CalculatedField cf1 = addCfToCache(tenant, profile1); @@ -327,7 +327,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_assetProfileUpdated_doesNotEvictCfs() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); AssetProfileId profileId = new AssetProfileId(UUID.randomUUID()); CalculatedField cf = addCfToCache(tenant, profileId); @@ -341,7 +341,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_calculatedFieldCreated_addsCfToCache() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); CalculatedFieldId cfId = new CalculatedFieldId(UUID.randomUUID()); CalculatedField cf = buildCalculatedField(cfId, tenant, device, simpleCfConfig()); @@ -355,7 +355,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_calculatedFieldDeleted_evictsCfFromCache() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); CalculatedField cf = addCfToCache(tenant, device); @@ -367,7 +367,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_calculatedFieldUpdated_refreshesCfInCache() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); CalculatedField cf = addCfToCache(tenant, device); @@ -384,7 +384,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void evictOwner_customerDeleted_recursivelyEvictsDevicesOwnedByThatCustomer() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); CustomerId customer = new CustomerId(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); @@ -406,7 +406,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void evictOwner_tenantDeleted_recursivelyEvictsCustomerAndItsOwnedDevices() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); CustomerId customer = new CustomerId(UUID.randomUUID()); DeviceId device = new DeviceId(UUID.randomUUID()); @@ -431,7 +431,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_tenantProfileUpdated_callsHandleTenantProfileUpdate() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); TenantProfileId profileId = new TenantProfileId(UUID.randomUUID()); DefaultCalculatedFieldCache spyCache = spy(cache); @@ -442,7 +442,7 @@ public class DefaultCalculatedFieldCacheTest { @Test public void onComponentLifecycleEvent_tenantProfileDeleted_doesNotCallHandleTenantProfileUpdate() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); TenantProfileId profileId = new TenantProfileId(UUID.randomUUID()); DefaultCalculatedFieldCache spyCache = spy(cache); diff --git a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java index 4f2eaa5147..839fbd9557 100644 --- a/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java +++ b/application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java @@ -235,7 +235,7 @@ public class DeviceProvisionServiceTest { private Tenant createTenant() { Tenant tenant = new Tenant(); - tenant.setId(new TenantId(UUID.randomUUID())); + tenant.setId(TenantId.fromUUID(UUID.randomUUID())); return tenant; } diff --git a/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java b/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java index f9b8d428d7..666ae37c6e 100644 --- a/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java +++ b/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java @@ -57,8 +57,8 @@ public class DefaultTbAssetProfileCacheTest { @Test public void onComponentLifecycleEvent_tenantDeleted_evictsAssetProfilesForThatTenant() { - TenantId tenant1 = new TenantId(UUID.randomUUID()); - TenantId tenant2 = new TenantId(UUID.randomUUID()); + TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID()); + TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID()); AssetProfileId profileId1 = new AssetProfileId(UUID.randomUUID()); AssetProfileId profileId2 = new AssetProfileId(UUID.randomUUID()); @@ -75,7 +75,7 @@ public class DefaultTbAssetProfileCacheTest { @Test public void onComponentLifecycleEvent_tenantDeleted_evictsAssetMappingsForThatTenant() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); AssetProfileId profileId = new AssetProfileId(UUID.randomUUID()); AssetId assetId = new AssetId(UUID.randomUUID()); @@ -92,7 +92,7 @@ public class DefaultTbAssetProfileCacheTest { @Test public void onComponentLifecycleEvent_tenantDeleted_removesListenersForThatTenant() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); EntityId listenerId = new AssetId(UUID.randomUUID()); AtomicInteger callCount = new AtomicInteger(); @@ -110,7 +110,7 @@ public class DefaultTbAssetProfileCacheTest { @Test public void onComponentLifecycleEvent_tenantUpdated_doesNotEvictProfiles() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); AssetProfileId profileId = new AssetProfileId(UUID.randomUUID()); loadProfileIntoCache(tenant, profileId); @@ -123,8 +123,8 @@ public class DefaultTbAssetProfileCacheTest { @Test public void onComponentLifecycleEvent_differentTenantDeleted_keepsOtherTenantsProfiles() { - TenantId tenant1 = new TenantId(UUID.randomUUID()); - TenantId tenant2 = new TenantId(UUID.randomUUID()); + TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID()); + TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID()); AssetProfileId profileId1 = new AssetProfileId(UUID.randomUUID()); AssetProfileId profileId2 = new AssetProfileId(UUID.randomUUID()); diff --git a/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java b/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java index a26413514c..fc900b88e4 100644 --- a/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java +++ b/application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java @@ -57,8 +57,8 @@ public class DefaultTbDeviceProfileCacheTest { @Test public void onComponentLifecycleEvent_tenantDeleted_evictsDeviceProfilesForThatTenant() { - TenantId tenant1 = new TenantId(UUID.randomUUID()); - TenantId tenant2 = new TenantId(UUID.randomUUID()); + TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID()); + TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID()); DeviceProfileId profileId1 = new DeviceProfileId(UUID.randomUUID()); DeviceProfileId profileId2 = new DeviceProfileId(UUID.randomUUID()); @@ -76,7 +76,7 @@ public class DefaultTbDeviceProfileCacheTest { @Test public void onComponentLifecycleEvent_tenantDeleted_evictsDeviceMappingsForThatTenant() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID()); DeviceId deviceId = new DeviceId(UUID.randomUUID()); @@ -93,7 +93,7 @@ public class DefaultTbDeviceProfileCacheTest { @Test public void onComponentLifecycleEvent_tenantDeleted_removesListenersForThatTenant() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); EntityId listenerId = new DeviceId(UUID.randomUUID()); AtomicInteger callCount = new AtomicInteger(); @@ -111,7 +111,7 @@ public class DefaultTbDeviceProfileCacheTest { @Test public void onComponentLifecycleEvent_tenantUpdated_doesNotEvictProfiles() { - TenantId tenant = new TenantId(UUID.randomUUID()); + TenantId tenant = TenantId.fromUUID(UUID.randomUUID()); DeviceProfileId profileId = new DeviceProfileId(UUID.randomUUID()); loadProfileIntoCache(tenant, profileId); @@ -124,8 +124,8 @@ public class DefaultTbDeviceProfileCacheTest { @Test public void onComponentLifecycleEvent_differentTenantDeleted_keepsOtherTenantsProfiles() { - TenantId tenant1 = new TenantId(UUID.randomUUID()); - TenantId tenant2 = new TenantId(UUID.randomUUID()); + TenantId tenant1 = TenantId.fromUUID(UUID.randomUUID()); + TenantId tenant2 = TenantId.fromUUID(UUID.randomUUID()); DeviceProfileId profileId1 = new DeviceProfileId(UUID.randomUUID()); DeviceProfileId profileId2 = new DeviceProfileId(UUID.randomUUID()); diff --git a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java index 79b31acf78..09225216ca 100644 --- a/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java +++ b/application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java @@ -410,7 +410,7 @@ public class DefaultTbClusterServiceTest { @Test public void testGetRuleEngineProfileForUpdatedAndDeletedDevice() { DeviceId deviceId = new DeviceId(UUID.randomUUID()); - TenantId tenantId = new TenantId(UUID.randomUUID()); + TenantId tenantId = TenantId.fromUUID(UUID.randomUUID()); DeviceProfileId deviceProfileId = new DeviceProfileId(UUID.randomUUID()); Device device = new Device(deviceId); @@ -430,7 +430,7 @@ public class DefaultTbClusterServiceTest { @Test public void testGetRuleEngineProfileForUpdatedAndDeletedAsset() { AssetId assetId = new AssetId(UUID.randomUUID()); - TenantId tenantId = new TenantId(UUID.randomUUID()); + TenantId tenantId = TenantId.fromUUID(UUID.randomUUID()); AssetProfileId assetProfileId = new AssetProfileId(UUID.randomUUID()); Asset asset = new Asset(assetId); diff --git a/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityLocalSubsInfoTest.java b/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityLocalSubsInfoTest.java index ba1a89eb38..1ab2a54319 100644 --- a/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityLocalSubsInfoTest.java +++ b/application/src/test/java/org/thingsboard/server/service/subscription/TbEntityLocalSubsInfoTest.java @@ -161,7 +161,7 @@ public class TbEntityLocalSubsInfoTest { } private TbEntityLocalSubsInfo createSubsInfo() { - return new TbEntityLocalSubsInfo(new TenantId(UUID.randomUUID()), new DeviceId(UUID.randomUUID())); + return new TbEntityLocalSubsInfo(TenantId.fromUUID(UUID.randomUUID()), new DeviceId(UUID.randomUUID())); } private void checkEvent(TbEntitySubEvent event, Set expectedSubs, ComponentLifecycleEvent expectedType) { diff --git a/application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java b/application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java index a533e0369f..673062256f 100644 --- a/application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java +++ b/application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java @@ -113,7 +113,7 @@ class DefaultWebSocketServiceTest { assertThat(publicUserSubscriptionsMap).as("map should contain tenant1").containsKey(tenant1); assertThat(publicUserSubscriptionsMap).as("map should contain tenant2").containsKey(tenant2); assertThat(publicUserSubscriptionsMap).as("map must not have a single NULL_UUID entry for all tenants") - .doesNotContainKey(new TenantId(EntityId.NULL_UUID)); + .doesNotContainKey(TenantId.fromUUID(EntityId.NULL_UUID)); assertThat(publicUserSubscriptionsMap.get(tenant1)) .as("tenant1 should have exactly %d subscriptions", maxPublicSubscriptions) diff --git a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java index 6b4e5e9925..30dc825a9b 100644 --- a/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java +++ b/common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java @@ -75,7 +75,7 @@ public class GatewaySessionHandlerTest { ConcurrentHashMap devices = new ConcurrentHashMap<>(); TransportDeviceInfo deviceInfo = new TransportDeviceInfo(); deviceInfo.setDeviceId(new DeviceId(UUID.randomUUID())); - deviceInfo.setTenantId(new TenantId(UUID.randomUUID())); + deviceInfo.setTenantId(TenantId.fromUUID(UUID.randomUUID())); deviceInfo.setCustomerId(new CustomerId(UUID.randomUUID())); deviceInfo.setDeviceName("device1"); deviceInfo.setDeviceType("default"); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/TbCacheSerializationTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/TbCacheSerializationTest.java index e1654678a0..b0ae8fb6ae 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/TbCacheSerializationTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/TbCacheSerializationTest.java @@ -37,7 +37,7 @@ public class TbCacheSerializationTest extends AbstractServiceTest { @Test public void AlarmTypesSerializationTest() { var typesCount = 13; - TenantId tenantId = new TenantId(UUID.randomUUID()); + TenantId tenantId = TenantId.fromUUID(UUID.randomUUID()); List types = new ArrayList<>(typesCount); for (int i = 0; i < typesCount; i++) { types.add(new EntitySubtype(tenantId, EntityType.ALARM, "alarm_type_" + i)); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java index 373112293d..da1e57e348 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java @@ -122,7 +122,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest { @Test public void testDummyRequestWithEmptyResult() throws Exception { - var future = attributesService.find(new TenantId(UUID.randomUUID()), new DeviceId(UUID.randomUUID()), AttributeScope.SERVER_SCOPE, "TEST"); + var future = attributesService.find(TenantId.fromUUID(UUID.randomUUID()), new DeviceId(UUID.randomUUID()), AttributeScope.SERVER_SCOPE, "TEST"); Assert.assertNotNull(future); var result = future.get(10, TimeUnit.SECONDS); Assert.assertTrue(result.isEmpty()); @@ -130,7 +130,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest { @Test public void testConcurrentFetchAndUpdate() throws Exception { - var tenantId = new TenantId(UUID.randomUUID()); + var tenantId = TenantId.fromUUID(UUID.randomUUID()); ListeningExecutorService pool = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(2)); try { for (int i = 0; i < 100; i++) { @@ -144,7 +144,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest { @Test public void testConcurrentFetchAndUpdateMulti() throws Exception { - var tenantId = new TenantId(UUID.randomUUID()); + var tenantId = TenantId.fromUUID(UUID.randomUUID()); ListeningExecutorService pool = MoreExecutors.listeningDecorator(Executors.newFixedThreadPool(2)); try { for (int i = 0; i < 100; i++) { @@ -158,7 +158,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest { @Test public void testFetchAndUpdateEmpty() throws Exception { - var tenantId = new TenantId(UUID.randomUUID()); + var tenantId = TenantId.fromUUID(UUID.randomUUID()); var deviceId = new DeviceId(UUID.randomUUID()); var scope = AttributeScope.SERVER_SCOPE; var key = "TEST"; @@ -172,7 +172,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest { @Test public void testFetchAndUpdateMulti() throws Exception { - var tenantId = new TenantId(UUID.randomUUID()); + var tenantId = TenantId.fromUUID(UUID.randomUUID()); var deviceId = new DeviceId(UUID.randomUUID()); var scope = AttributeScope.SERVER_SCOPE; var key1 = "TEST1"; @@ -204,7 +204,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest { @Test public void testFindAllKeysByEntityId() { - var tenantId = new TenantId(UUID.randomUUID()); + var tenantId = TenantId.fromUUID(UUID.randomUUID()); var deviceId = new DeviceId(UUID.randomUUID()); saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key1", "123"); saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key2", "123"); @@ -217,7 +217,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest { @Test public void testFindAllKeysByEntityIdAndAttributeType() { - var tenantId = new TenantId(UUID.randomUUID()); + var tenantId = TenantId.fromUUID(UUID.randomUUID()); var deviceId = new DeviceId(UUID.randomUUID()); saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key1", "123"); saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key2", "123"); @@ -230,7 +230,7 @@ public abstract class BaseAttributesServiceTest extends AbstractServiceTest { @Test public void testFindAllByEntityIdAndAttributeType() { - var tenantId = new TenantId(UUID.randomUUID()); + var tenantId = TenantId.fromUUID(UUID.randomUUID()); var deviceId = new DeviceId(UUID.randomUUID()); saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key1", "123"); saveAttribute(tenantId, deviceId, AttributeScope.SERVER_SCOPE, "key2", "123"); diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java index 9d754f6150..2f33fae122 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java @@ -62,7 +62,7 @@ public abstract class BaseEventServiceTest extends AbstractServiceTest { @Test public void saveEvent() throws Exception { - TenantId tenantId = new TenantId(Uuids.timeBased()); + TenantId tenantId = TenantId.fromUUID(Uuids.timeBased()); DeviceId devId = new DeviceId(Uuids.timeBased()); RuleNodeDebugEvent event = generateEvent(tenantId, devId); eventService.saveAsync(event).get(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java index 3ddf318e2f..e03b161692 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java @@ -132,7 +132,7 @@ public class JpaBaseEventDaoTest extends AbstractJpaDaoTest { StatisticsEvent.StatisticsEventBuilder event = StatisticsEvent.builder(); event.id(eventId); event.ts(System.currentTimeMillis()); - event.tenantId(new TenantId(tenantId)); + event.tenantId(TenantId.fromUUID(tenantId)); event.entityId(entityId); event.serviceId("server A"); event.messagesProcessed(1); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java index e47ed5bfbf..a25d85aae6 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java @@ -57,7 +57,7 @@ public class DefaultQueryLogComponentTest { @Before public void setUp() { - tenantId = new TenantId(UUID.fromString("97275c1c-9cf2-4d25-a68d-933031158f84")); + tenantId = TenantId.fromUUID(UUID.fromString("97275c1c-9cf2-4d25-a68d-933031158f84")); ctx = new SqlQueryContext(new QueryContext(tenantId, null, EntityType.ALARM)); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java index dd0bedbf5a..31e4ab2ac8 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java @@ -103,7 +103,7 @@ public class JpaTenantDaoTest extends AbstractJpaDaoTest { //@DatabaseSetup("classpath:dbunit/empty_dataset.xml") public void testIsExistsTenantById() { final UUID uuid = Uuids.timeBased(); - final TenantId tenantId = new TenantId(uuid); + final TenantId tenantId = TenantId.fromUUID(uuid); assertThat(tenantDao.existsById(tenantId, uuid)).as("Is tenant exists before save").isFalse(); final Tenant tenant = new Tenant(); diff --git a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java index 164d59ecc0..0b6236196a 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java @@ -276,8 +276,8 @@ public class JpaWidgetsBundleDaoTest extends AbstractJpaDaoTest { widgetsBundles = widgetsBundleDao.find(TenantId.SYS_TENANT_ID).stream().sorted(Comparator.comparing(WidgetsBundle::getTitle)).collect(Collectors.toList());; assertEquals(100, widgetsBundles.size()); - var widgetType1 = createAndSaveWidgetType(new TenantId(tenantId1), 1, "Test widget type 1", "This is the widget type 1", new String[]{"tag1", "Tag2", "TEST_TAG"}); - var widgetType2 = createAndSaveWidgetType(new TenantId(tenantId2), 2, "Test widget type 2", "This is the widget type 2", new String[]{"tag3", "Tag5", "TEST_Tag2"}); + var widgetType1 = createAndSaveWidgetType(TenantId.fromUUID(tenantId1), 1, "Test widget type 1", "This is the widget type 1", new String[]{"tag1", "Tag2", "TEST_TAG"}); + var widgetType2 = createAndSaveWidgetType(TenantId.fromUUID(tenantId2), 2, "Test widget type 2", "This is the widget type 2", new String[]{"tag3", "Tag5", "TEST_Tag2"}); var widgetsBundle1 = widgetsBundles.stream().filter(widgetsBundle -> widgetsBundle.getTenantId().getId().equals(tenantId1)).collect(Collectors.toList()).get(10); widgetTypeDao.saveWidgetsBundleWidget(new WidgetsBundleWidget(widgetsBundle1.getId(), widgetType1.getId(), 0)); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java index 0db2d77c01..7f329b1411 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java @@ -97,7 +97,7 @@ class TbAssignToCustomerNodeTest extends AbstractRuleNodeUpgradeTest { private final Edge EDGE = new Edge(); private final Dashboard DASHBOARD = new Dashboard(); - private final TenantId TENANT_ID = new TenantId(UUID.fromString("c818385f-e661-407f-8c52-daf2dddf406d")); + private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("c818385f-e661-407f-8c52-daf2dddf406d")); private final RuleNodeId RULE_NODE_ID = new RuleNodeId(UUID.fromString("c3570bd0-c0bc-4609-97a4-6f57d7c8b809")); private static Stream givenUnsupportedOriginatorType_whenOnMsg_thenVerifyExceptionThrown() { diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java index 60924002da..50c54b91de 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java @@ -111,7 +111,7 @@ public class TbCreateRelationNodeTest extends AbstractRuleNodeUpgradeTest { return supportedEntityTypes.stream().filter(entityType -> !entityType.equals(EntityType.TENANT)).map(Arguments::of); } - private static final TenantId tenantId = new TenantId(UUID.fromString("6fc86fc9-b25c-4893-b340-51cf4e101ab2")); + private static final TenantId tenantId = TenantId.fromUUID(UUID.fromString("6fc86fc9-b25c-4893-b340-51cf4e101ab2")); private static final DeviceId deviceId = new DeviceId(UUID.fromString("191ab124-1d8d-4749-97c6-fc84c113c1f5")); private static final AssetId assetId = new AssetId(UUID.fromString("a47a5867-deab-4333-b845-88cb1695990c")); private static final CustomerId customerId = new CustomerId(UUID.fromString("4af69229-273d-40de-9fba-f49f87373d23")); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java index a8087cc40b..f6ef490aba 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java @@ -108,7 +108,7 @@ public class TbDeleteRelationNodeTest extends AbstractRuleNodeUpgradeTest { return supportedEntityTypes.stream().filter(entityType -> !entityType.equals(EntityType.TENANT)).map(Arguments::of); } - private static final TenantId tenantId = new TenantId(UUID.fromString("6fdb457d-0910-401c-8880-abc251e6a1e2")); + private static final TenantId tenantId = TenantId.fromUUID(UUID.fromString("6fdb457d-0910-401c-8880-abc251e6a1e2")); private static final DeviceId deviceId = new DeviceId(UUID.fromString("4eef91a7-8865-4c3c-837d-ed6f6577508b")); private static final AssetId assetId = new AssetId(UUID.fromString("f4fd3b10-3f36-4d46-a162-5e62050774cc")); private static final CustomerId customerId = new CustomerId(UUID.fromString("ab890af2-3622-41e0-ac94-14d50af84348")); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java index de891c13d4..dd1307b10a 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java @@ -98,7 +98,7 @@ class TbUnassignFromCustomerNodeTest extends AbstractRuleNodeUpgradeTest { private final Edge EDGE = new Edge(); private final Dashboard DASHBOARD = new Dashboard(); - private final TenantId TENANT_ID = new TenantId(UUID.fromString("06fcc15f-2677-436d-a1cb-7754bd0bcccf")); + private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("06fcc15f-2677-436d-a1cb-7754bd0bcccf")); private final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE; diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java index 557fb5b71d..b0788a1817 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java @@ -58,7 +58,7 @@ class TbAssetTypeSwitchNodeTest { @BeforeEach void setUp() throws TbNodeException { - TenantId tenantId = new TenantId(UUID.randomUUID()); + TenantId tenantId = TenantId.fromUUID(UUID.randomUUID()); assetId = new AssetId(UUID.randomUUID()); assetIdDeleted = new AssetId(UUID.randomUUID()); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java index d8a302ae92..9155221a26 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java @@ -50,7 +50,7 @@ import static org.mockito.Mockito.when; class TbCheckAlarmStatusNodeTest { - private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID()); + private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID()); private static final DeviceId DEVICE_ID = new DeviceId(UUID.randomUUID()); private static final AlarmId ALARM_ID = new AlarmId(UUID.randomUUID()); private static final DirectListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE; diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java index e6011c74d8..fb8ad655c0 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java @@ -63,7 +63,7 @@ import static org.mockito.Mockito.when; class TbCheckRelationNodeTest extends AbstractRuleNodeUpgradeTest { - private final TenantId TENANT_ID = new TenantId(UUID.randomUUID()); + private final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID()); private final DeviceId ORIGINATOR_ID = new DeviceId(UUID.randomUUID()); private final DirectListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE; private final TbMsg EMPTY_POST_ATTRIBUTES_MSG = TbMsg.newMsg() diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java index 55e9c33b7e..ebbdbe14c7 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java @@ -58,7 +58,7 @@ class TbDeviceTypeSwitchNodeTest { @BeforeEach void setUp() throws TbNodeException { - TenantId tenantId = new TenantId(UUID.randomUUID()); + TenantId tenantId = TenantId.fromUUID(UUID.randomUUID()); deviceId = new DeviceId(UUID.randomUUID()); deviceIdDeleted = new DeviceId(UUID.randomUUID()); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java index 3ae26e6560..963e25f6b6 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java @@ -64,7 +64,7 @@ import static org.mockito.Mockito.when; @ExtendWith(MockitoExtension.class) public class TbRuleChainInputNodeTest extends AbstractRuleNodeUpgradeTest { - private final TenantId TENANT_ID = new TenantId(UUID.fromString("4ba69ea5-6b27-42df-ab66-e7a727a67027")); + private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("4ba69ea5-6b27-42df-ab66-e7a727a67027")); private final DeviceId DEVICE_ID = new DeviceId(UUID.fromString("97731954-2147-4176-8f1a-d14f1b73e4e6")); private final AssetId ASSET_ID = new AssetId(UUID.fromString("841a47bd-4e8e-4ea5-88e6-420da0d70e51")); // A stable "current" rule chain ID: this node lives here. Must differ from any target used in tests. diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java index 5e9726ec97..3940ab56c4 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java @@ -76,7 +76,7 @@ import static org.mockito.Mockito.when; public class TbGetCustomerDetailsNodeTest { private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID()); - private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID()); + private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID()); private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE; @Mock private TbContext ctxMock; diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java index 4f267c0dfb..f9a230a437 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java @@ -60,7 +60,7 @@ import static org.mockito.BDDMockito.then; @ExtendWith(MockitoExtension.class) public class TbGetDeviceAttrNodeTest extends AbstractRuleNodeUpgradeTest { - private final TenantId TENANT_ID = new TenantId(UUID.fromString("5aea576c-66c4-4732-86b8-dc6bfcde7443")); + private final TenantId TENANT_ID = TenantId.fromUUID(UUID.fromString("5aea576c-66c4-4732-86b8-dc6bfcde7443")); private final DeviceId DEVICE_ID = new DeviceId(UUID.fromString("40b6b393-6ddf-47f9-973a-18550ca70384")); private final ListeningExecutor executor = DirectListeningExecutor.INSTANCE; diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java index fff7437fdf..a0d0a5a957 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java @@ -59,7 +59,7 @@ import static org.mockito.Mockito.when; public class TbGetOriginatorFieldsNodeTest { private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID()); - private static final TenantId DUMMY_TENANT_ID = new TenantId(UUID.randomUUID()); + private static final TenantId DUMMY_TENANT_ID = TenantId.fromUUID(UUID.randomUUID()); private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE; @Mock private TbContext ctxMock; diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java index a31d23db55..88195973e6 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java @@ -91,7 +91,7 @@ import static org.mockito.Mockito.when; public class TbGetRelatedAttributeNodeTest { private static final EntityId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID()); - private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID()); + private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID()); private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE; @Mock private TbContext ctxMock; @@ -427,7 +427,7 @@ public class TbGetRelatedAttributeNodeTest { @Test public void givenFetchTelemetryToMetaData_whenOnMsg_thenShouldFetchTelemetryToMetaData() { // GIVEN - var tenant = new Tenant(new TenantId(UUID.randomUUID())); + var tenant = new Tenant(TenantId.fromUUID(UUID.randomUUID())); var device = new Device(new DeviceId(UUID.randomUUID())); prepareMsgAndConfig(TbMsgSource.METADATA, DataToFetch.LATEST_TELEMETRY, tenant.getId()); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java index 88db3dc0cd..fa528a724c 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java @@ -70,7 +70,7 @@ import static org.mockito.Mockito.when; public class TbGetTenantAttributeNodeTest { private static final DeviceId DUMMY_DEVICE_ORIGINATOR = new DeviceId(UUID.randomUUID()); - private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID()); + private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID()); private static final DirectListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE; @Mock private TbContext ctxMock; diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java index b77bd263f8..7f476ea775 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java @@ -73,7 +73,7 @@ public class TbGetTenantDetailsNodeTest { config = new TbGetTenantDetailsNodeConfiguration().defaultConfiguration(); nodeConfiguration = new TbNodeConfiguration(JacksonUtil.valueToTree(config)); tenant = new Tenant(); - tenant.setId(new TenantId(UUID.randomUUID())); + tenant.setId(TenantId.fromUUID(UUID.randomUUID())); tenant.setTitle("Tenant title"); tenant.setCountry("Tenant country"); tenant.setCity("Tenant city"); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java index d1bcc4559e..75dc8d227a 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java @@ -104,7 +104,7 @@ public class EntitiesFieldsAsyncLoaderTest { @BeforeAll public static void setup() { RANDOM_UUID = UUID.randomUUID(); - TENANT_ID = new TenantId(UUID.randomUUID()); + TENANT_ID = TenantId.fromUUID(UUID.randomUUID()); SUPPORTED_ENTITY_TYPES = EnumSet.of( EntityType.TENANT, EntityType.CUSTOMER, @@ -172,7 +172,7 @@ public class EntitiesFieldsAsyncLoaderTest { private void initMocks(EntityType entityType, boolean entityDoesNotExist) { switch (entityType) { case TENANT: - var tenant = Futures.immediateFuture(entityDoesNotExist ? null : new Tenant(new TenantId(RANDOM_UUID))); + var tenant = Futures.immediateFuture(entityDoesNotExist ? null : new Tenant(TenantId.fromUUID(RANDOM_UUID))); when(ctxMock.getDbCallbackExecutor()).thenReturn(DB_EXECUTOR); when(ctxMock.getTenantService()).thenReturn(tenantServiceMock); diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java index 23e98dfc58..6a840a1ae3 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java @@ -48,7 +48,7 @@ import static org.mockito.Mockito.when; public class EntitiesRelatedDeviceIdAsyncLoaderTest { private static final EntityId DUMMY_ORIGINATOR = new DeviceId(UUID.randomUUID()); - private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID()); + private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID()); private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE; @Mock private TbContext ctxMock; diff --git a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java index 1131586a07..edeb72ba59 100644 --- a/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java +++ b/rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java @@ -55,7 +55,7 @@ import static org.thingsboard.common.util.DonAsynchron.withCallback; public class EntitiesRelatedEntityIdAsyncLoaderTest { private static final EntityId ASSET_ORIGINATOR_ID = new AssetId(UUID.randomUUID()); - private static final TenantId TENANT_ID = new TenantId(UUID.randomUUID()); + private static final TenantId TENANT_ID = TenantId.fromUUID(UUID.randomUUID()); private static final ListeningExecutor DB_EXECUTOR = DirectListeningExecutor.INSTANCE; private TbContext ctxMock;