From 115f3c322f49948a31910e55c8909c67233ea623 Mon Sep 17 00:00:00 2001 From: Jonathan Cobb Date: Mon, 6 Jan 2020 18:47:15 -0500 Subject: [PATCH] ValidationResult.addViolation now returns this --- .../wizard/validation/ValidationResult.java | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/wizard-common/src/main/java/org/cobbzilla/wizard/validation/ValidationResult.java b/wizard-common/src/main/java/org/cobbzilla/wizard/validation/ValidationResult.java index d04d2db..d1f9591 100644 --- a/wizard-common/src/main/java/org/cobbzilla/wizard/validation/ValidationResult.java +++ b/wizard-common/src/main/java/org/cobbzilla/wizard/validation/ValidationResult.java @@ -52,28 +52,39 @@ public class ValidationResult { @JsonIgnore public List getViolations() { return violations.get(); } - public void addViolation(ConstraintViolation violation) { synchronized (violations) { violations.get().add(violation); } } - public void addViolation(ConstraintViolationBean violation) { synchronized (beans) { beans.get().add(violation); } } + public ValidationResult addViolation(ConstraintViolation violation) { + synchronized (violations) { violations.get().add(violation); } + return this; + } + public ValidationResult addViolation(ConstraintViolationBean violation) { + synchronized (beans) { beans.get().add(violation); } + return this; + } - public void addViolation(String messageTemplate) { addViolation(messageTemplate, null, null); } + public ValidationResult addViolation(String messageTemplate) { + return addViolation(messageTemplate, null, null); + } - public void addViolation(String messageTemplate, String message) { addViolation(messageTemplate, message, null); } + public ValidationResult addViolation(String messageTemplate, String message) { + return addViolation(messageTemplate, message, null); + } - public void addViolation(String messageTemplate, String message, String invalidValue) { - addViolation(messageTemplate, message, invalidValue, null); + public ValidationResult addViolation(String messageTemplate, String message, String invalidValue) { + return addViolation(messageTemplate, message, invalidValue, null); } - public void addViolation(String messageTemplate, String message, String invalidValue, - NameAndValue[] params) { + public ValidationResult addViolation(String messageTemplate, String message, String invalidValue, + NameAndValue[] params) { final ConstraintViolationBean err = new ConstraintViolationBean(messageTemplate, message, invalidValue, params); synchronized (beans) { for (ConstraintViolationBean bean : beans.get()) { if (bean.equals(err)) { - return; // already exists + return this; } } beans.get().add(err); } + return this; } public void addAll(ConstraintViolationBean[] violations) {