ThingsboardErrorResponseHandler now work with:

- IllegalArgumentException, IncorrectParameterException, DataValidationException, MessagingException.
They aren't considered to be an internal server error now.

application/src/main/java/org/thingsboard/server/controller/BaseController.java

@@ -281,9 +281,6 @@ public abstract class BaseController {
     @Autowired
     protected RuleEngineEntityActionService ruleEngineEntityActionService;
 
-    @Autowired
-    protected ThingsboardErrorResponseHandler thingsboardErrorResponseHandler;
-
     @Value("${server.log_controller_error_stack_trace}")
     @Getter
     private boolean logControllerErrorStackTrace;
@@ -302,7 +299,25 @@ public abstract class BaseController {
     }
 
     private ThingsboardException handleException(Exception exception, boolean logException) {
-        return thingsboardErrorResponseHandler.castToThingsboardException(exception, logException);
+        if (logException && logControllerErrorStackTrace) {
+            log.error("Error [{}]", exception.getMessage(), exception);
+        }
+
+        String cause = "";
+        if (exception.getCause() != null) {
+            cause = exception.getCause().getClass().getCanonicalName();
+        }
+
+        if (exception instanceof ThingsboardException) {
+            return (ThingsboardException) exception;
+        } else if (exception instanceof IllegalArgumentException || exception instanceof IncorrectParameterException
+                || exception instanceof DataValidationException || cause.contains("IncorrectParameterException")) {
+            return new ThingsboardException(exception.getMessage(), ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+        } else if (exception instanceof MessagingException) {
+            return new ThingsboardException("Unable to send mail: " + exception.getMessage(), ThingsboardErrorCode.GENERAL);
+        } else {
+            return new ThingsboardException(exception.getMessage(), ThingsboardErrorCode.GENERAL);
+        }
     }
 
     <T> T checkNotNull(T reference) throws ThingsboardException {

application/src/main/java/org/thingsboard/server/controller/TelemetryController.java

@@ -138,11 +138,7 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> getAttributeKeys(
             @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr) throws ThingsboardException {
-        try {
+        return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr, this::getAttributeKeysCallback);
-            return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr, this::getAttributeKeysCallback);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -151,12 +147,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> getAttributeKeysByScope(
             @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr
             , @PathVariable("scope") String scope) throws ThingsboardException {
-        try {
+        return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
-            return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
+                (result, tenantId, entityId) -> getAttributeKeysCallback(result, tenantId, entityId, scope));
-                    (result, tenantId, entityId) -> getAttributeKeysCallback(result, tenantId, entityId, scope));
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -165,13 +157,9 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> getAttributes(
             @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr,
             @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
-        try {
+        SecurityUser user = getCurrentUser();
-            SecurityUser user = getCurrentUser();
+        return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
-            return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
+                (result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, null, keysStr));
-                    (result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, null, keysStr));
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -181,13 +169,9 @@ public class TelemetryController extends BaseController {
             @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr,
             @PathVariable("scope") String scope,
             @RequestParam(name = "keys", required = false) String keysStr) throws ThingsboardException {
-        try {
+        SecurityUser user = getCurrentUser();
-            SecurityUser user = getCurrentUser();
+        return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
-            return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_ATTRIBUTES, entityType, entityIdStr,
+                (result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr));
-                    (result, tenantId, entityId) -> getAttributeValuesCallback(result, user, entityId, scope, keysStr));
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -195,12 +179,8 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> getTimeseriesKeys(
             @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr) throws ThingsboardException {
-        try {
+        return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
-            return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
+                (result, tenantId, entityId) -> Futures.addCallback(tsService.findAllLatest(tenantId, entityId), getTsKeysToResponseCallback(result), MoreExecutors.directExecutor()));
-                    (result, tenantId, entityId) -> Futures.addCallback(tsService.findAllLatest(tenantId, entityId), getTsKeysToResponseCallback(result), MoreExecutors.directExecutor()));
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -210,14 +190,10 @@ public class TelemetryController extends BaseController {
             @PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr,
             @RequestParam(name = "keys", required = false) String keysStr,
             @RequestParam(name = "useStrictDataTypes", required = false, defaultValue = "false") Boolean useStrictDataTypes) throws ThingsboardException {
-        try {
+        SecurityUser user = getCurrentUser();
-            SecurityUser user = getCurrentUser();
 
-            return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
+        return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
-                    (result, tenantId, entityId) -> getLatestTimeseriesValuesCallback(result, user, entityId, keysStr, useStrictDataTypes));
+                (result, tenantId, entityId) -> getLatestTimeseriesValuesCallback(result, user, entityId, keysStr, useStrictDataTypes));
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
 
@@ -235,19 +211,15 @@ public class TelemetryController extends BaseController {
             @RequestParam(name = "agg", defaultValue = "NONE") String aggStr,
             @RequestParam(name = "orderBy", defaultValue = "DESC") String orderBy,
             @RequestParam(name = "useStrictDataTypes", required = false, defaultValue = "false") Boolean useStrictDataTypes) throws ThingsboardException {
-        try {
+        return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
-            return accessValidator.validateEntityAndCallback(getCurrentUser(), Operation.READ_TELEMETRY, entityType, entityIdStr,
+                (result, tenantId, entityId) -> {
-                    (result, tenantId, entityId) -> {
+                    // If interval is 0, convert this to a NONE aggregation, which is probably what the user really wanted
-                        // If interval is 0, convert this to a NONE aggregation, which is probably what the user really wanted
+                    Aggregation agg = interval == 0L ? Aggregation.valueOf(Aggregation.NONE.name()) : Aggregation.valueOf(aggStr);
-                        Aggregation agg = interval == 0L ? Aggregation.valueOf(Aggregation.NONE.name()) : Aggregation.valueOf(aggStr);
+                    List<ReadTsKvQuery> queries = toKeysList(keys).stream().map(key -> new BaseReadTsKvQuery(key, startTs, endTs, interval, limit, agg, orderBy))
-                        List<ReadTsKvQuery> queries = toKeysList(keys).stream().map(key -> new BaseReadTsKvQuery(key, startTs, endTs, interval, limit, agg, orderBy))
+                            .collect(Collectors.toList());
-                                .collect(Collectors.toList());
+
-
+                    Futures.addCallback(tsService.findAll(tenantId, entityId, queries), getTsKvListCallback(result, useStrictDataTypes), MoreExecutors.directExecutor());
-                        Futures.addCallback(tsService.findAll(tenantId, entityId, queries), getTsKvListCallback(result, useStrictDataTypes), MoreExecutors.directExecutor());
+                });
-                    });
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -255,12 +227,8 @@ public class TelemetryController extends BaseController {
     @ResponseBody
     public DeferredResult<ResponseEntity> saveDeviceAttributes(@PathVariable("deviceId") String deviceIdStr, @PathVariable("scope") String scope,
                                                                @RequestBody JsonNode request) throws ThingsboardException {
-        try {
+        EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
-            EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
+        return saveAttributes(getTenantId(), entityId, scope, request);
-            return saveAttributes(getTenantId(), entityId, scope, request);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -279,12 +247,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityAttributesV2(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr,
                                                                  @PathVariable("scope") String scope,
                                                                  @RequestBody JsonNode request) throws ThingsboardException {
-        try {
+        EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
-            EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
+        return saveAttributes(getTenantId(), entityId, scope, request);
-            return saveAttributes(getTenantId(), entityId, scope, request);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -293,12 +257,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityTelemetry(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr,
                                                               @PathVariable("scope") String scope,
                                                               @RequestBody String requestBody) throws ThingsboardException {
-        try {
+        EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
-            EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
+        return saveTelemetry(getTenantId(), entityId, requestBody, 0L);
-            return saveTelemetry(getTenantId(), entityId, requestBody, 0L);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -307,12 +267,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> saveEntityTelemetryWithTTL(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr,
                                                                      @PathVariable("scope") String scope, @PathVariable("ttl") Long ttl,
                                                                      @RequestBody String requestBody) throws ThingsboardException {
-        try {
+        EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
-            EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
+        return saveTelemetry(getTenantId(), entityId, requestBody, ttl);
-            return saveTelemetry(getTenantId(), entityId, requestBody, ttl);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -324,12 +280,8 @@ public class TelemetryController extends BaseController {
                                                                  @RequestParam(name = "startTs", required = false) Long startTs,
                                                                  @RequestParam(name = "endTs", required = false) Long endTs,
                                                                  @RequestParam(name = "rewriteLatestIfDeleted", defaultValue = "false") boolean rewriteLatestIfDeleted) throws ThingsboardException {
-        try {
+        EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
-            EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
+        return deleteTimeseries(entityId, keysStr, deleteAllDataForKeys, startTs, endTs, rewriteLatestIfDeleted);
-            return deleteTimeseries(entityId, keysStr, deleteAllDataForKeys, startTs, endTs, rewriteLatestIfDeleted);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     private DeferredResult<ResponseEntity> deleteTimeseries(EntityId entityIdStr, String keysStr, boolean deleteAllDataForKeys,
@@ -383,12 +335,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> deleteEntityAttributes(@PathVariable("deviceId") String deviceIdStr,
                                                                  @PathVariable("scope") String scope,
                                                                  @RequestParam(name = "keys") String keysStr) throws ThingsboardException {
-        try {
+        EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
-            EntityId entityId = EntityIdFactory.getByTypeAndUuid(EntityType.DEVICE, deviceIdStr);
+        return deleteAttributes(entityId, scope, keysStr);
-            return deleteAttributes(entityId, scope, keysStr);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     @PreAuthorize("hasAnyAuthority('SYS_ADMIN', 'TENANT_ADMIN', 'CUSTOMER_USER')")
@@ -397,12 +345,8 @@ public class TelemetryController extends BaseController {
     public DeferredResult<ResponseEntity> deleteEntityAttributes(@PathVariable("entityType") String entityType, @PathVariable("entityId") String entityIdStr,
                                                                  @PathVariable("scope") String scope,
                                                                  @RequestParam(name = "keys") String keysStr) throws ThingsboardException {
-        try {
+        EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
-            EntityId entityId = EntityIdFactory.getByTypeAndId(entityType, entityIdStr);
+        return deleteAttributes(entityId, scope, keysStr);
-            return deleteAttributes(entityId, scope, keysStr);
-        } catch (Exception e) {
-            throw handleException(e);
-        }
     }
 
     private DeferredResult<ResponseEntity> deleteAttributes(EntityId entityIdSrc, String scope, String keysStr) throws ThingsboardException {

application/src/main/java/org/thingsboard/server/exception/ThingsboardErrorResponseHandler.java

@@ -74,6 +74,17 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
             try {
                 response.setContentType(MediaType.APPLICATION_JSON_VALUE);
 
+                String cause = "";
+                if (exception.getCause() != null) {
+                    cause = exception.getCause().getClass().getCanonicalName();
+                }
+                if (exception instanceof IllegalArgumentException || exception instanceof IncorrectParameterException
+                        || exception instanceof DataValidationException || cause.contains("IncorrectParameterException")) {
+                    exception = new ThingsboardException(exception.getMessage(), ThingsboardErrorCode.BAD_REQUEST_PARAMS);
+                } else if (exception instanceof MessagingException) {
+                    exception = new ThingsboardException("Unable to send mail: " + exception.getMessage(), ThingsboardErrorCode.GENERAL);
+                }
+
                 if (exception instanceof ThingsboardException) {
                     ThingsboardException thingsboardException = (ThingsboardException) exception;
                     if (thingsboardException.getErrorCode() == ThingsboardErrorCode.SUBSCRIPTION_VIOLATION) {
@@ -88,7 +99,9 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
                 } else if (exception instanceof AuthenticationException) {
                     handleAuthenticationException((AuthenticationException) exception, response);
                 } else {
-                    handle(castToThingsboardException(exception, true), response);
+                    response.setStatus(HttpStatus.INTERNAL_SERVER_ERROR.value());
+                    mapper.writeValue(response.getWriter(), ThingsboardErrorResponse.of(exception.getMessage(),
+                            ThingsboardErrorCode.GENERAL, HttpStatus.INTERNAL_SERVER_ERROR));
                 }
             } catch (IOException e) {
                 log.error("Can't handle exception", e);
@@ -96,27 +109,6 @@ public class ThingsboardErrorResponseHandler extends ResponseEntityExceptionHand
         }
     }
 
-    public ThingsboardException castToThingsboardException(Exception exception, boolean logException) {
-        if (logException) {
-            log.error("Error [{}]", exception.getMessage(), exception);
-        }
-
-        String cause = "";
-        if (exception.getCause() != null) {
-            cause = exception.getCause().getClass().getCanonicalName();
-        }
-
-        if (exception instanceof IllegalArgumentException || exception instanceof IncorrectParameterException
-                || exception instanceof DataValidationException || cause.contains("IncorrectParameterException")) {
-            return new ThingsboardException(exception.getMessage(), ThingsboardErrorCode.BAD_REQUEST_PARAMS);
-        } else if (exception instanceof MessagingException) {
-            return new ThingsboardException("Unable to send mail: " + exception.getMessage(), ThingsboardErrorCode.GENERAL);
-        } else {
-            return new ThingsboardException(exception.getMessage(), ThingsboardErrorCode.GENERAL);
-        }
-    }
-
-
     private void handleThingsboardException(ThingsboardException thingsboardException, HttpServletResponse response) throws IOException {
 
         ThingsboardErrorCode errorCode = thingsboardException.getErrorCode();

application/src/test/java/org/thingsboard/server/controller/BaseAssetControllerTest.java

@@ -104,13 +104,13 @@ public abstract class BaseAssetControllerTest extends AbstractControllerTest {
         Asset asset = new Asset();
         asset.setName(RandomStringUtils.randomAlphabetic(300));
         asset.setType("default");
-        doPost("/api/asset", asset).andExpect(statusReason(containsString("length of name should be equals or less than 255")));
+        doPost("/api/asset", asset).andExpect(statusReason(containsString("length of name must be equal or less than 255")));
         asset.setName("Normal name");
         asset.setType(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/asset", asset).andExpect(statusReason(containsString("length of type should be equals or less than 255")));
+        doPost("/api/asset", asset).andExpect(statusReason(containsString("length of type must be equal or less than 255")));
         asset.setType("default");
         asset.setLabel(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/asset", asset).andExpect(statusReason(containsString("length of label should be equals or less than 255")));
+        doPost("/api/asset", asset).andExpect(statusReason(containsString("length of label must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseCustomerControllerTest.java

@@ -94,22 +94,22 @@ public abstract class BaseCustomerControllerTest extends AbstractControllerTest
     public void testSaveCustomerWithViolationOfValidation() throws Exception {
         Customer customer = new Customer();
         customer.setTitle(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of title should be equals or less than 255")));
+        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of title must be equal or less than 255")));
         customer.setTitle("Normal title");
         customer.setCity(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of city should be equals or less than 255")));
+        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of city must be equal or less than 255")));
         customer.setCity("Normal city");
         customer.setCountry(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of country should be equals or less than 255")));
+        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of country must be equal or less than 255")));
         customer.setCountry("Ukraine");
         customer.setPhone(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of phone should be equals or less than 255")));
+        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of phone must be equal or less than 255")));
         customer.setPhone("+3892555554512");
         customer.setState(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of state should be equals or less than 255")));
+        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of state must be equal or less than 255")));
         customer.setState("Normal state");
         customer.setZip(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of zip or postal code should be equals or less than 255")));
+        doPost("/api/customer", customer).andExpect(statusReason(containsString("length of zip or postal code must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseDashboardControllerTest.java

@@ -97,7 +97,7 @@ public abstract class BaseDashboardControllerTest extends AbstractControllerTest
     public void testSaveDashboardInfoWithViolationOfValidation() throws Exception {
         Dashboard dashboard = new Dashboard();
         dashboard.setTitle(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/dashboard", dashboard).andExpect(statusReason(containsString("length of title should be equals or less than 255")));
+        doPost("/api/dashboard", dashboard).andExpect(statusReason(containsString("length of title must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseDeviceControllerTest.java

@@ -119,13 +119,13 @@ public abstract class BaseDeviceControllerTest extends AbstractControllerTest {
         Device device = new Device();
         device.setName(RandomStringUtils.randomAlphabetic(300));
         device.setType("default");
-        doPost("/api/device", device).andExpect(statusReason(containsString("length of name should be equals or less than 255")));
+        doPost("/api/device", device).andExpect(statusReason(containsString("length of name must be equal or less than 255")));
         device.setName("Normal Name");
         device.setType(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/device", device).andExpect(statusReason(containsString("length of type should be equals or less than 255")));
+        doPost("/api/device", device).andExpect(statusReason(containsString("length of type must be equal or less than 255")));
         device.setType("Normal type");
         device.setLabel(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/device", device).andExpect(statusReason(containsString("length of label should be equals or less than 255")));
+        doPost("/api/device", device).andExpect(statusReason(containsString("length of label must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseDeviceProfileControllerTest.java

@@ -113,7 +113,7 @@ public abstract class BaseDeviceProfileControllerTest extends AbstractController
     @Test
     public void saveDeviceProfileWithViolationOfValidation() throws Exception {
         doPost("/api/deviceProfile", this.createDeviceProfile(RandomStringUtils.randomAlphabetic(300), null))
-                .andExpect(statusReason(containsString("length of name should be equals or less than 255")));
+                .andExpect(statusReason(containsString("length of name must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseEdgeControllerTest.java

@@ -116,13 +116,13 @@ public abstract class BaseEdgeControllerTest extends AbstractControllerTest {
     @Test
     public void testSaveEdgeWithViolationOfLengthValidation() throws Exception {
         Edge edge = constructEdge(RandomStringUtils.randomAlphabetic(300), "default");
-        doPost("/api/edge", edge).andExpect(statusReason(containsString("length of name should be equals or less than 255")));
+        doPost("/api/edge", edge).andExpect(statusReason(containsString("length of name must be equal or less than 255")));
         edge.setName("normal name");
         edge.setType(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/edge", edge).andExpect(statusReason(containsString("length of type should be equals or less than 255")));
+        doPost("/api/edge", edge).andExpect(statusReason(containsString("length of type must be equal or less than 255")));
         edge.setType("normal type");
         edge.setLabel(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/edge", edge).andExpect(statusReason(containsString("length of label should be equals or less than 255")));
+        doPost("/api/edge", edge).andExpect(statusReason(containsString("length of label must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseEntityViewControllerTest.java

@@ -136,10 +136,10 @@ public abstract class BaseEntityViewControllerTest extends AbstractControllerTes
     @Test
     public void testSaveEntityViewWithViolationOfValidation() throws Exception {
         EntityView entityView = createEntityView(RandomStringUtils.randomAlphabetic(300), 0, 0);
-        doPost("/api/entityView", entityView).andExpect(statusReason(containsString("length of name should be equals or less than 255")));
+        doPost("/api/entityView", entityView).andExpect(statusReason(containsString("length of name must be equal or less than 255")));
         entityView.setName("Normal name");
         entityView.setType(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/entityView", entityView).andExpect(statusReason(containsString("length of type should be equals or less than 255")));
+        doPost("/api/entityView", entityView).andExpect(statusReason(containsString("length of type must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseOtaPackageControllerTest.java

@@ -127,14 +127,14 @@ public abstract class BaseOtaPackageControllerTest extends AbstractControllerTes
         firmwareInfo.setTitle(RandomStringUtils.randomAlphabetic(300));
         firmwareInfo.setVersion(VERSION);
         firmwareInfo.setUsesUrl(false);
-        doPost("/api/otaPackage", firmwareInfo).andExpect(statusReason(containsString("length of title should be equals or less than 255")));
+        doPost("/api/otaPackage", firmwareInfo).andExpect(statusReason(containsString("length of title must be equal or less than 255")));
         firmwareInfo.setTitle(TITLE);
         firmwareInfo.setVersion(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/otaPackage", firmwareInfo).andExpect(statusReason(containsString("length of version should be equals or less than 255")));
+        doPost("/api/otaPackage", firmwareInfo).andExpect(statusReason(containsString("length of version must be equal or less than 255")));
         firmwareInfo.setVersion(VERSION);
         firmwareInfo.setUsesUrl(true);
         firmwareInfo.setUrl(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/otaPackage", firmwareInfo).andExpect(statusReason(containsString("length of url should be equals or less than 255")));
+        doPost("/api/otaPackage", firmwareInfo).andExpect(statusReason(containsString("length of url must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseRuleChainControllerTest.java

@@ -90,7 +90,7 @@ public abstract class BaseRuleChainControllerTest extends AbstractControllerTest
     public void testSaveRuleChainWithViolationOfLengthValidation() throws Exception {
         RuleChain ruleChain = new RuleChain();
         ruleChain.setName(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/ruleChain", ruleChain).andExpect(statusReason(containsString("length of name should be equals or less than 255")));
+        doPost("/api/ruleChain", ruleChain).andExpect(statusReason(containsString("length of name must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseTbResourceControllerTest.java

@@ -107,7 +107,7 @@ public abstract class BaseTbResourceControllerTest extends AbstractControllerTes
         resource.setTitle(RandomStringUtils.randomAlphabetic(300));
         resource.setFileName(DEFAULT_FILE_NAME);
         resource.setData("Test Data");
-        doPost("/api/resource", resource).andExpect(statusReason(containsString("length of title should be equals or less than 255")));
+        doPost("/api/resource", resource).andExpect(statusReason(containsString("length of title must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseTenantControllerTest.java

@@ -58,7 +58,7 @@ public abstract class BaseTenantControllerTest extends AbstractControllerTest {
         loginSysAdmin();
         Tenant tenant = new Tenant();
         tenant.setTitle(RandomStringUtils.randomAlphanumeric(300));
-        doPost("/api/tenant", tenant).andExpect(statusReason(containsString("length of title should be equals or less than 255")));
+        doPost("/api/tenant", tenant).andExpect(statusReason(containsString("length of title must be equal or less than 255")));
     }
 
     public static void main(String[] args) {

application/src/test/java/org/thingsboard/server/controller/BaseTenantProfileControllerTest.java

@@ -79,7 +79,7 @@ public abstract class BaseTenantProfileControllerTest extends AbstractController
     public void testSaveTenantProfileWithViolationOfLengthValidation() throws Exception {
         loginSysAdmin();
         TenantProfile tenantProfile = this.createTenantProfile(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/tenantProfile", tenantProfile).andExpect(statusReason(containsString("length of name should be equals or less than 255")));
+        doPost("/api/tenantProfile", tenantProfile).andExpect(statusReason(containsString("length of name must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseUserControllerTest.java

@@ -121,10 +121,10 @@ public abstract class BaseUserControllerTest extends AbstractControllerTest {
         user.setEmail(email);
         user.setFirstName(RandomStringUtils.randomAlphabetic(300));
         user.setLastName("Downs");
-        doPost("/api/user", user).andExpect(statusReason(containsString("Validation error: length of firs name should be equals or less than 255")));
+        doPost("/api/user", user).andExpect(statusReason(containsString("Validation error: length of firs name must be equal or less than 255")));
         user.setFirstName("Normal name");
         user.setLastName(RandomStringUtils.randomAlphabetic(300));
-        doPost("/api/user", user).andExpect(statusReason(containsString("length of last name should be equals or less than 255")));
+        doPost("/api/user", user).andExpect(statusReason(containsString("length of last name must be equal or less than 255")));
     }
 
     @Test

application/src/test/java/org/thingsboard/server/controller/BaseWidgetsBundleControllerTest.java

@@ -93,7 +93,7 @@ public abstract class BaseWidgetsBundleControllerTest extends AbstractController
      public void testSaveWidgetBundleWithViolationOfLengthValidation() throws Exception {
          WidgetsBundle widgetsBundle = new WidgetsBundle();
          widgetsBundle.setTitle(RandomStringUtils.randomAlphabetic(300));
-         doPost("/api/widgetsBundle", widgetsBundle).andExpect(statusReason(containsString("length of title should be equals or less than 255")));
+         doPost("/api/widgetsBundle", widgetsBundle).andExpect(statusReason(containsString("length of title must be equal or less than 255")));
      }
 
     @Test

common/data/src/main/java/org/thingsboard/server/common/data/OtaPackageInfo.java

@@ -25,6 +25,7 @@ import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.ota.ChecksumAlgorithm;
 import org.thingsboard.server.common.data.ota.OtaPackageType;
 import org.thingsboard.server.common.data.validation.Length;
+import org.thingsboard.server.common.data.validation.NoXss;
 
 @Slf4j
 @Data
@@ -37,14 +38,20 @@ public class OtaPackageInfo extends SearchTextBasedWithAdditionalInfo<OtaPackage
     private DeviceProfileId deviceProfileId;
     private OtaPackageType type;
     @Length(fieldName = "title")
+    @NoXss
     private String title;
     @Length(fieldName = "version")
+    @NoXss
     private String version;
     @Length(fieldName = "url")
+    @NoXss
     private String url;
+    @Length(fieldName = "tag")
+    @NoXss
     private String tag;
     private boolean hasData;
     @Length(fieldName = "file name")
+    @NoXss
     private String fileName;
     private String contentType;
     private ChecksumAlgorithm checksumAlgorithm;

common/data/src/main/java/org/thingsboard/server/common/data/validation/Length.java

@@ -26,7 +26,7 @@ import java.lang.annotation.Target;
 @Target(ElementType.FIELD)
 @Constraint(validatedBy = {})
 public @interface Length {
-    String message() default "length of {fieldName} should be equals or less than {max}";
+    String message() default "length of {fieldName} must be equal or less than {max}";
 
     String fieldName();