dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into release-3.4

Browse Source
This commit is contained in:
Igor Kulikov 2022-12-21 13:29:17 +02:00
commit 491d05b4a2
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dao/src/main/java/org/thingsboard/server/dao/service/ConstraintValidator.java
View File

@ -53,8 +53,13 @@ public class ConstraintValidator {
public static List<String> getConstraintsViolations(Object data) { public static List<String> getConstraintsViolations(Object data) {
return fieldsValidator.validate(data).stream() return fieldsValidator.validate(data).stream()
.map(constraintViolation -> { .map(constraintViolation -> {
String property;
if (constraintViolation.getConstraintDescriptor().getAttributes().containsKey("fieldName")) {
property = constraintViolation.getConstraintDescriptor().getAttributes().get("fieldName").toString();
} else {
Path propertyPath = constraintViolation.getPropertyPath(); Path propertyPath = constraintViolation.getPropertyPath();
String property = Iterators.getLast(propertyPath.iterator()).toString(); property = Iterators.getLast(propertyPath.iterator()).toString();
}
return property + " " + constraintViolation.getMessage(); return property + " " + constraintViolation.getMessage();
}) })
.distinct() .distinct()