From e69009c1128a8a1c8368282a176529f25cacfc51 Mon Sep 17 00:00:00 2001 From: Sergey Matvienko Date: Tue, 5 Sep 2023 14:02:22 +0200 Subject: [PATCH] WidgetTypeDataValidator - removed bundleAlias validation because it removed from WidgetTypeDetails --- .../server/dao/service/validator/WidgetTypeDataValidator.java | 2 -- .../dao/service/validator/WidgetTypeDataValidatorTest.java | 2 -- 2 files changed, 4 deletions(-) diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidator.java index f364a4a40a..27728025e6 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidator.java +++ b/dao/src/main/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidator.java @@ -20,7 +20,6 @@ import org.springframework.stereotype.Component; import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.widget.WidgetType; import org.thingsboard.server.common.data.widget.WidgetTypeDetails; -import org.thingsboard.server.common.data.widget.WidgetsBundle; import org.thingsboard.server.dao.exception.DataValidationException; import org.thingsboard.server.dao.model.ModelConstants; import org.thingsboard.server.dao.service.DataValidator; @@ -39,7 +38,6 @@ public class WidgetTypeDataValidator extends DataValidator { @Override protected void validateDataImpl(TenantId tenantId, WidgetTypeDetails widgetTypeDetails) { validateName("Widgets type name", widgetTypeDetails.getName()); - validateName("Widgets type bundle alias", widgetTypeDetails.getBundleAlias()); if (widgetTypeDetails.getDescriptor() == null || widgetTypeDetails.getDescriptor().size() == 0) { throw new DataValidationException("Widgets type descriptor can't be empty!"); } diff --git a/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java b/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java index 5ef17f9c35..2e0be61949 100644 --- a/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java +++ b/dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java @@ -53,13 +53,11 @@ class WidgetTypeDataValidatorTest { void testValidateNameInvocation() { WidgetTypeDetails widgetTypeDetails = new WidgetTypeDetails(); widgetTypeDetails.setName("widget type gas"); - widgetTypeDetails.setBundleAlias("Widget bundle fuel"); widgetTypeDetails.setDescriptor(JacksonUtil.toJsonNode("{\"content\":\"empty\"}")); widgetTypeDetails.setTenantId(tenantId); validator.validateDataImpl(tenantId, widgetTypeDetails); verify(validator).validateName("Widgets type name", widgetTypeDetails.getName()); - verify(validator).validateName("Widgets type bundle alias", widgetTypeDetails.getBundleAlias()); } }