From 7aaf5065b91615f29ff6280edc3c5f85355b2da9 Mon Sep 17 00:00:00 2001 From: Keith Donald Date: Thu, 11 Jun 2009 20:56:47 +0000 Subject: [PATCH] polish git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@1361 50f2f4bb-b051-0410-bef5-90022cba6387 --- .../springframework/ui/WebBindAndValidateLifecycle.java | 8 +++++--- .../org/springframework/ui/binding/BindingResults.java | 2 +- .../springframework/ui/binding/support/GenericBinder.java | 1 + .../ui/binding/support/GenericBinderTests.java | 1 + .../springframework/ui/validation/ValidateResults.java | 5 +++++ .../java/org/springframework/ui/validation/Validator.java | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) create mode 100644 org.springframework.context/src/test/java/org/springframework/ui/validation/ValidateResults.java diff --git a/org.springframework.context/src/main/java/org/springframework/ui/WebBindAndValidateLifecycle.java b/org.springframework.context/src/main/java/org/springframework/ui/WebBindAndValidateLifecycle.java index 2e913ef1353..69e1cd7aeee 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/WebBindAndValidateLifecycle.java +++ b/org.springframework.context/src/main/java/org/springframework/ui/WebBindAndValidateLifecycle.java @@ -21,6 +21,7 @@ import org.springframework.ui.binding.BindingResults; import org.springframework.ui.binding.UserValues; import org.springframework.ui.binding.support.WebBinder; import org.springframework.ui.message.MessageContext; +import org.springframework.ui.validation.ValidateResults; import org.springframework.ui.validation.Validator; public class WebBindAndValidateLifecycle { @@ -40,10 +41,11 @@ public class WebBindAndValidateLifecycle { public void execute(Map userMap) { UserValues values = binder.createUserValues(userMap); - BindingResults results = binder.bind(values); - if (validationDecider.shouldValidateAfter(results)) { - validator.validate(binder.getModel(), results.successes().properties()); + BindingResults bindingResults = binder.bind(values); + if (validationDecider.shouldValidateAfter(bindingResults)) { + ValidateResults validationResults = validator.validate(binder.getModel(), bindingResults.successes().properties()); } + // TODO translate binding and validation results into messages } public interface ValidationDecider { diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/BindingResults.java b/org.springframework.context/src/main/java/org/springframework/ui/binding/BindingResults.java index c4dbfa57c5b..5fa5ecae40a 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/BindingResults.java +++ b/org.springframework.context/src/main/java/org/springframework/ui/binding/BindingResults.java @@ -46,7 +46,7 @@ public interface BindingResults extends Iterable { BindingResult get(int index); /** - * The list of properties for which binding was attempted. + * The ordered list of properties for which a {@link BindingResult} was returned. */ List properties(); diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/GenericBinder.java b/org.springframework.context/src/main/java/org/springframework/ui/binding/support/GenericBinder.java index c982325b03d..fe1886fb79a 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/support/GenericBinder.java +++ b/org.springframework.context/src/main/java/org/springframework/ui/binding/support/GenericBinder.java @@ -197,6 +197,7 @@ public class GenericBinder implements Binder { } + class BindingImpl implements Binding { private Expression property; diff --git a/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java b/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java index e368e13f113..4fa62d94e9e 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java +++ b/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java @@ -36,6 +36,7 @@ import org.springframework.ui.format.number.IntegerFormatter; public class GenericBinderTests { private TestBean bean; + private Binder binder; @Before diff --git a/org.springframework.context/src/test/java/org/springframework/ui/validation/ValidateResults.java b/org.springframework.context/src/test/java/org/springframework/ui/validation/ValidateResults.java new file mode 100644 index 00000000000..ad01b8fc004 --- /dev/null +++ b/org.springframework.context/src/test/java/org/springframework/ui/validation/ValidateResults.java @@ -0,0 +1,5 @@ +package org.springframework.ui.validation; + +public interface ValidateResults { + +} diff --git a/org.springframework.context/src/test/java/org/springframework/ui/validation/Validator.java b/org.springframework.context/src/test/java/org/springframework/ui/validation/Validator.java index 2bb132c7459..14605d6a881 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/validation/Validator.java +++ b/org.springframework.context/src/test/java/org/springframework/ui/validation/Validator.java @@ -4,6 +4,6 @@ import java.util.List; public interface Validator { - void validate(Object model, List properties); + ValidateResults validate(Object model, List properties); }