Updated implementation of the BindingResult interface

Author: chkal

core/src/main/java/org/mvcspec/ozark/binding/BindingResultImpl.java

@@ -18,17 +18,15 @@
 import javax.enterprise.inject.Vetoed;
 import javax.mvc.binding.BindingError;
 import javax.mvc.binding.BindingResult;
+import javax.mvc.binding.ParamError;
 import javax.mvc.binding.ValidationError;
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Objects;
 import java.util.Set;
 import java.util.stream.Collectors;
-
-import static java.util.stream.Collectors.collectingAndThen;
-import static java.util.stream.Collectors.toSet;
+import java.util.stream.Stream;
 
 /**
  * Implementation for {@link javax.mvc.binding.BindingResult} interface.
@@ -54,49 +52,25 @@ public boolean isFailed() {
     @Override
     public List<String> getAllMessages() {
         this.consumed = true;
-        final List<String> result = new ArrayList<>();
-        bindingErrors.forEach(error -> result.add(error.getMessage()));
-        validationErrors.forEach(violation -> result.add(violation.getMessage()));
-        return Collections.unmodifiableList(result);
-    }
-
-    @Override
-    public Set<BindingError> getAllBindingErrors() {
-        this.consumed = true;
-        return Collections.unmodifiableSet(bindingErrors);
-    }
-
-    @Override
-    public BindingError getBindingError(String param) {
-        this.consumed = true;
-        for (BindingError error : bindingErrors) {
-            if (param.equals(error.getParamName())) {
-                return error;
-            }
-        }
-        return null;
-    }
-
-    @Override
-    public Set<ValidationError> getAllValidationErrors() {
-        this.consumed = true;
-        return Collections.unmodifiableSet(validationErrors);
+        return Stream.concat(bindingErrors.stream(), validationErrors.stream())
+                .map(ParamError::getMessage)
+                .collect(Collectors.collectingAndThen(Collectors.toList(), Collections::unmodifiableList));
     }
 
     @Override
-    public Set<ValidationError> getValidationErrors(String param) {
+    public Set<ParamError> getAllErrors() {
         this.consumed = true;
-        return validationErrors.stream()
-                .filter(ve -> Objects.equals(ve.getParamName(), param))
-                .collect(collectingAndThen(toSet(), Collections::unmodifiableSet));
+        return Stream.concat(bindingErrors.stream(), validationErrors.stream())
+                .collect(Collectors.collectingAndThen(Collectors.toSet(), Collections::unmodifiableSet));
     }
 
     @Override
-    public ValidationError getValidationError(String param) {
+    public Set<ParamError> getErrors(String param) {
+        Objects.requireNonNull(param, "Parameter name is required");
         this.consumed = true;
-        return validationErrors.stream()
-                .filter(ve -> Objects.equals(ve.getParamName(), param))
-                .findFirst().orElse(null);
+        return Stream.concat(bindingErrors.stream(), validationErrors.stream())
+                .filter(paramError -> Objects.equals(paramError.getParamName(), param))
+                .collect(Collectors.collectingAndThen(Collectors.toSet(), Collections::unmodifiableSet));
     }
 
     public void addValidationErrors(Set<ValidationError> validationErrors) {

core/src/main/java/org/mvcspec/ozark/binding/validate/ValidationInterceptor.java

@@ -127,7 +127,7 @@ private void processViolations(InvocationContext ctx, Set<ConstraintViolation<Ob
                 }
 
                 boolean hasBindingError = paramName != null && !paramName.isEmpty() &&
-                        bindingResult.getBindingError(paramName) != null;
+                        bindingResult.getErrors(paramName).size() > 0;
 
                 // if there was a binding error, not the user's input but the default value got validated
                 if (!hasBindingError) {

test/validation-i18n/src/main/java/org/mvcspec/ozark/test/validation/ValidationController.java

@@ -16,10 +16,10 @@
 package org.mvcspec.ozark.test.validation;
 
 import javax.inject.Inject;
-import javax.mvc.Models;
 import javax.mvc.Controller;
+import javax.mvc.Models;
 import javax.mvc.binding.BindingResult;
-import javax.mvc.binding.ValidationError;
+import javax.mvc.binding.ParamError;
 import javax.validation.Valid;
 import javax.ws.rs.BeanParam;
 import javax.ws.rs.GET;
@@ -51,8 +51,8 @@ public String post(@Valid @BeanParam FormBean form) {
 
         if (bindingResult.isFailed()) {
 
-            List<String> errors = bindingResult.getAllValidationErrors().stream()
-                    .map(ValidationError::getMessage)
+            List<String> errors = bindingResult.getAllErrors().stream()
+                    .map(ParamError::getMessage)
                     .collect(Collectors.toList());
 
             models.put("errors", errors);

test/validation/src/main/java/org/mvcspec/ozark/test/validation/FormController.java

@@ -18,8 +18,8 @@
 import javax.enterprise.context.RequestScoped;
 import javax.inject.Inject;
 import javax.mvc.Controller;
-import javax.mvc.binding.BindingError;
 import javax.mvc.binding.BindingResult;
+import javax.mvc.binding.ParamError;
 import javax.mvc.binding.ValidationError;
 import javax.validation.ConstraintViolation;
 import javax.validation.Valid;
@@ -55,7 +55,7 @@ public class FormController {
     @Controller
     public Response formPost(@Valid @BeanParam FormDataBean form) {
         if (br.isFailed()) {
-            ValidationError validationError = br.getAllValidationErrors().iterator().next();
+            ValidationError validationError = (ValidationError) br.getAllErrors().iterator().next();
             final ConstraintViolation<?> cv = validationError.getViolation();
             final String property = cv.getPropertyPath().toString();
             error.setProperty(property.substring(property.lastIndexOf('.') + 1));
@@ -71,7 +71,7 @@ public Response formPost(@Valid @BeanParam FormDataBean form) {
     @Controller
     public Response get(@QueryParam("n") @DefaultValue("25") int n) {
         if (br.isFailed()) {
-            final BindingError be = br.getBindingError("n");
+            final ParamError be = br.getErrors("n").iterator().next();
             error.setProperty(be.getParamName());
             error.setMessage(be.getMessage());
             return Response.ok("binderror.jsp").build();

test/validation/src/main/java/org/mvcspec/ozark/test/validation/FormControllerProperty.java

@@ -48,7 +48,7 @@ public class FormControllerProperty extends FormControllerBase {
     public Response formPost(@Valid @BeanParam FormDataBean form) {
         final BindingResult vr = getVr();
         if (vr.isFailed()) {
-            ValidationError validationError = vr.getAllValidationErrors().iterator().next();
+            ValidationError validationError = (ValidationError) vr.getAllErrors().iterator().next();
             final ConstraintViolation<?> cv = validationError.getViolation();
             final String property = cv.getPropertyPath().toString();
             error.setProperty(property.substring(property.lastIndexOf('.') + 1));