From 827da31d92bf52a3a25e06ecaf83a2497395b0b6 Mon Sep 17 00:00:00 2001
From: Swoq <misha.kratukl@gmail.com>
Date: Thu, 2 Sep 2021 10:23:02 +0300
Subject: [PATCH] Validation fixes

---
 .../src/main/java/org/thingsboard/server/common/data/User.java  | 2 +-
 .../thingsboard/server/common/data/widget/WidgetsBundle.java    | 1 +
 .../thingsboard/server/dao/service/StringLengthValidator.java   | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/User.java b/common/data/src/main/java/org/thingsboard/server/common/data/User.java
index a7135ea56f..ab334dfeab 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/User.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/User.java
@@ -36,7 +36,7 @@ public class User extends SearchTextBasedWithAdditionalInfo<UserId> implements H
     private String email;
     private Authority authority;
     @NoXss
-    @Length(fieldName = "firs name")
+    @Length(fieldName = "first name")
     private String firstName;
     @NoXss
     @Length(fieldName = "last name")
diff --git a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
index fcf3eb9fac..468b409c3e 100644
--- a/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
+++ b/common/data/src/main/java/org/thingsboard/server/common/data/widget/WidgetsBundle.java
@@ -28,6 +28,7 @@ public class WidgetsBundle extends SearchTextBased<WidgetsBundleId> implements H
 
     private TenantId tenantId;
     @NoXss
+    @Length(fieldName = "alias")
     private String alias;
     @NoXss
     @Length(fieldName = "title")
diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/StringLengthValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/StringLengthValidator.java
index 1efa0192e0..b7d9d3991e 100644
--- a/dao/src/main/java/org/thingsboard/server/dao/service/StringLengthValidator.java
+++ b/dao/src/main/java/org/thingsboard/server/dao/service/StringLengthValidator.java
@@ -31,7 +31,7 @@ public class StringLengthValidator implements ConstraintValidator<Length, String
         if (StringUtils.isEmpty(value)) {
             return true;
         }
-        return value.trim().length() <= max;
+        return value.length() <= max;
     }
 
     @Override