From ba030b07b16805372025433159f871e5b153f821 Mon Sep 17 00:00:00 2001 From: desoliture Date: Thu, 13 Jan 2022 14:12:59 +0200 Subject: [PATCH] add todo notes --- .../java/org/thingsboard/server/dao/alarm/BaseAlarmService.java | 1 + .../java/org/thingsboard/server/dao/asset/BaseAssetService.java | 2 +- .../thingsboard/server/dao/customer/CustomerServiceImpl.java | 1 + .../thingsboard/server/dao/dashboard/DashboardServiceImpl.java | 2 +- .../thingsboard/server/dao/device/DeviceProfileServiceImpl.java | 1 + .../org/thingsboard/server/dao/device/DeviceServiceImpl.java | 1 + .../java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java | 1 + .../server/dao/entityview/EntityViewServiceImpl.java | 1 + 8 files changed, 8 insertions(+), 2 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java index e2e1d54935..e6df02c854 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmService.java @@ -431,6 +431,7 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ throw new DataValidationException("Alarm should be assigned to tenant!"); } else { Tenant tenant = tenantService.findTenantById(alarm.getTenantId()); + // TODO: 13.01.22 Instead of finding and checking for null need to create and use tenantService.exists() if (tenant == null) { throw new DataValidationException("Alarm is referencing to non-existent tenant!"); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java index d9f337841b..94477635af 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java +++ b/dao/src/main/java/org/thingsboard/server/dao/asset/BaseAssetService.java @@ -417,7 +417,7 @@ public class BaseAssetService extends AbstractEntityService implements AssetServ throw new DataValidationException("Asset should be assigned to tenant!"); } else { Tenant tenant = tenantService.findTenantById(asset.getTenantId()); - // FIXME: 12.01.22 + // TODO: 13.01.22 Instead of finding and checking for null need to create and use tenantService.exists() if (tenant == null) { throw new DataValidationException("Asset is referencing to non-existent tenant!"); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java index 3b2376f98d..f8726e9d16 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/customer/CustomerServiceImpl.java @@ -211,6 +211,7 @@ public class CustomerServiceImpl extends AbstractEntityService implements Custom throw new DataValidationException("Customer should be assigned to tenant!"); } else { Tenant tenant = tenantService.findTenantById(customer.getTenantId()); + // TODO: 13.01.22 Instead of finding and checking for null need to create and use tenantService.exists() if (tenant == null) { throw new DataValidationException("Customer is referencing to non-existent tenant!"); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java index c2a6813eda..aaf5e5d584 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/dashboard/DashboardServiceImpl.java @@ -309,7 +309,7 @@ public class DashboardServiceImpl extends AbstractEntityService implements Dashb throw new DataValidationException("Dashboard should be assigned to tenant!"); } else { Tenant tenant = tenantService.findTenantById(dashboard.getTenantId()); - // FIXME: 12.01.22 + // TODO: 13.01.22 Instead of finding and checking for null need to create and use tenantService.exists() if (tenant == null) { throw new DataValidationException("Dashboard is referencing to non-existent tenant!"); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java index 254b84889b..b71822907d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceProfileServiceImpl.java @@ -376,6 +376,7 @@ public class DeviceProfileServiceImpl extends AbstractEntityService implements D throw new DataValidationException("Device profile should be assigned to tenant!"); } else { Tenant tenant = tenantService.findTenantById(deviceProfile.getTenantId()); + // TODO: 13.01.22 Instead of finding and checking for null need to create and use tenantService.exists() if (tenant == null) { throw new DataValidationException("Device profile is referencing to non-existent tenant!"); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java index fbc7f5a23a..0f1f830a4d 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/device/DeviceServiceImpl.java @@ -742,6 +742,7 @@ public class DeviceServiceImpl extends AbstractEntityService implements DeviceSe throw new DataValidationException("Device should be assigned to tenant!"); } else { Tenant tenant = tenantService.findTenantById(device.getTenantId()); + // TODO: 13.01.22 Instead of finding and checking for null need to create and use tenantService.exists() if (tenant == null) { throw new DataValidationException("Device is referencing to non-existent tenant!"); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java index 281848a68d..7e9bd64741 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java @@ -414,6 +414,7 @@ public class EdgeServiceImpl extends AbstractEntityService implements EdgeServic throw new DataValidationException("Edge should be assigned to tenant!"); } else { Tenant tenant = tenantService.findTenantById(edge.getTenantId()); + // TODO: 13.01.22 Instead of finding and checking for null need to create and use tenantService.exists() if (tenant == null) { throw new DataValidationException("Edge is referencing to non-existent tenant!"); } diff --git a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java index f2aa6423fa..7c3d16dd1a 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java @@ -433,6 +433,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti throw new DataValidationException("Entity view should be assigned to tenant!"); } else { Tenant tenant = tenantService.findTenantById(entityView.getTenantId()); + // TODO: 13.01.22 Instead of finding and checking for null need to create and use tenantService.exists() if (tenant == null) { throw new DataValidationException("Entity view is referencing to non-existent tenant!"); }