diff --git a/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java b/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java index ee1e42f0dc..7f26c6e909 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java +++ b/dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java @@ -53,8 +53,13 @@ public class ConstraintValidator { public static List getConstraintsViolations(Object data) { return fieldsValidator.validate(data).stream() .map(constraintViolation -> { - Path propertyPath = constraintViolation.getPropertyPath(); - String property = Iterators.getLast(propertyPath.iterator()).toString(); + String property; + if (constraintViolation.getConstraintDescriptor().getAttributes().containsKey("fieldName")) { + property = constraintViolation.getConstraintDescriptor().getAttributes().get("fieldName").toString(); + } else { + Path propertyPath = constraintViolation.getPropertyPath(); + property = Iterators.getLast(propertyPath.iterator()).toString(); + } return property + " " + constraintViolation.getMessage(); }) .distinct()