Browse Source

WidgetTypeDataValidator - removed bundleAlias validation because it removed from WidgetTypeDetails

pull/9163/head
Sergey Matvienko 3 years ago
parent
commit
e69009c112
  1. 2
      dao/src/main/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidator.java
  2. 2
      dao/src/test/java/org/thingsboard/server/dao/service/validator/WidgetTypeDataValidatorTest.java

2
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<WidgetTypeDetails> {
@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!");
}

2
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());
}
}

Loading…
Cancel
Save