tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Technical cleanup of TenantId construction in tests and production code

pull/15663/head
Oleksandra Matviienko 1 month ago
parent
20d6b0f883
commit
90fc84ea31
34 changed files with 84 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
  2. 52
      application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java
  3. 2
      application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
  4. 14
      application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java
  5. 14
      application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java
  6. 4
      application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
  7. 2
      application/src/test/java/org/thingsboard/server/service/subscription/TbEntityLocalSubsInfoTest.java
  8. 2
      application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java
  9. 2
      common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
  10. 2
      dao/src/test/java/org/thingsboard/server/dao/service/TbCacheSerializationTest.java
  11. 16
      dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java
  12. 2
      dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
  13. 2
      dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
  14. 2
      dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
  15. 2
      dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java
  16. 4
      dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
  17. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
  18. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
  19. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
  20. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
  21. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
  22. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
  23. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
  24. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
  25. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
  26. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
  27. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
  28. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
  29. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
  30. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
  31. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
  32. 4
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java
  33. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java
  34. 2
      rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java

6
application/src/test/java/org/thingsboard/server/queue/discovery/HashPartitionServiceTest.java
View File

@ -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<TenantId, TenantProfileId> 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);

52
application/src/test/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldCacheTest.java
View File

@ -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);

2
application/src/test/java/org/thingsboard/server/service/device/provision/DeviceProvisionServiceTest.java
View File

@ -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;
}

14
application/src/test/java/org/thingsboard/server/service/profile/DefaultTbAssetProfileCacheTest.java
View File

@ -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());

14
application/src/test/java/org/thingsboard/server/service/profile/DefaultTbDeviceProfileCacheTest.java
View File

@ -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());

4
application/src/test/java/org/thingsboard/server/service/queue/DefaultTbClusterServiceTest.java
View File

@ -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);

2
application/src/test/java/org/thingsboard/server/service/subscription/TbEntityLocalSubsInfoTest.java
View File

@ -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<TbAttributeSubscription> expectedSubs, ComponentLifecycleEvent expectedType) {

2
application/src/test/java/org/thingsboard/server/service/ws/DefaultWebSocketServiceTest.java
View File

@ -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)

2
common/transport/mqtt/src/test/java/org/thingsboard/server/transport/mqtt/session/GatewaySessionHandlerTest.java
View File

@ -75,7 +75,7 @@ public class GatewaySessionHandlerTest {
ConcurrentHashMap<String, GatewayDeviceSessionContext> 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");

2
dao/src/test/java/org/thingsboard/server/dao/service/TbCacheSerializationTest.java
View File

@ -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<EntitySubtype> types = new ArrayList<>(typesCount);
for (int i = 0; i < typesCount; i++) {
types.add(new EntitySubtype(tenantId, EntityType.ALARM, "alarm_type_" + i));

16
dao/src/test/java/org/thingsboard/server/dao/service/attributes/BaseAttributesServiceTest.java
View File

@ -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");

2
dao/src/test/java/org/thingsboard/server/dao/service/event/BaseEventServiceTest.java
View File

@ -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();

2
dao/src/test/java/org/thingsboard/server/dao/sql/event/JpaBaseEventDaoTest.java
View File

@ -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);

2
dao/src/test/java/org/thingsboard/server/dao/sql/query/DefaultQueryLogComponentTest.java
View File

@ -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));
}

2
dao/src/test/java/org/thingsboard/server/dao/sql/tenant/JpaTenantDaoTest.java
View File

@ -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();

4
dao/src/test/java/org/thingsboard/server/dao/sql/widget/JpaWidgetsBundleDaoTest.java
View File

@ -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));

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbAssignToCustomerNodeTest.java
View File

@ -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<Arguments> givenUnsupportedOriginatorType_whenOnMsg_thenVerifyExceptionThrown() {

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbCreateRelationNodeTest.java
View File

@ -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"));

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbDeleteRelationNodeTest.java
View File

@ -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"));

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/action/TbUnassignFromCustomerNodeTest.java
View File

@ -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;

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbAssetTypeSwitchNodeTest.java
View File

@ -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());

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckAlarmStatusNodeTest.java
View File

@ -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;

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbCheckRelationNodeTest.java
View File

@ -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()

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/filter/TbDeviceTypeSwitchNodeTest.java
View File

@ -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());

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/flow/TbRuleChainInputNodeTest.java
View File

@ -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.

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetCustomerDetailsNodeTest.java
View File

@ -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;

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetDeviceAttrNodeTest.java
View File

@ -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;

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetOriginatorFieldsNodeTest.java
View File

@ -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;

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetRelatedAttributeNodeTest.java
View File

@ -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());

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantAttributeNodeTest.java
View File

@ -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;

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/metadata/TbGetTenantDetailsNodeTest.java
View File

@ -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");

4
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesFieldsAsyncLoaderTest.java
View File

@ -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);

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedDeviceIdAsyncLoaderTest.java
View File

@ -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;

2
rule-engine/rule-engine-components/src/test/java/org/thingsboard/rule/engine/util/EntitiesRelatedEntityIdAsyncLoaderTest.java
View File

@ -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;

Write Preview
Loading…
Cancel
Save