Repository: wicket Updated Branches: refs/heads/master 3d43ab39a -> 273d479fa
WICKET-6524: do not require validation-api-2.0.0, keep support Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/273d479f Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/273d479f Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/273d479f Branch: refs/heads/master Commit: 273d479fa24783fd8182e2922bf7afee97933283 Parents: 3d43ab3 Author: Emond Papegaaij <papega...@apache.org> Authored: Fri Feb 2 16:19:19 2018 +0100 Committer: Emond Papegaaij <papega...@apache.org> Committed: Fri Feb 2 16:19:19 2018 +0100 ---------------------------------------------------------------------- pom.xml | 4 +-- .../bean/validation/PropertyValidator.java | 23 ++++++++++++++--- .../PropertyValidatorRequiredTest.java | 26 +++----------------- wicket-examples/pom.xml | 10 ++++++++ 4 files changed, 34 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/273d479f/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index b784a44..c51cf62 100644 --- a/pom.xml +++ b/pom.xml @@ -175,7 +175,7 @@ <dependency> <groupId>javax.validation</groupId> <artifactId>validation-api</artifactId> - <version>2.0.0.Final</version> + <version>1.1.0.Final</version> <scope>provided</scope> </dependency> <dependency> @@ -532,7 +532,7 @@ <dependency> <groupId>org.hibernate</groupId> <artifactId>hibernate-validator</artifactId> - <version>6.0.1.Final</version> + <version>5.4.2.Final</version> <scope>test</scope> </dependency> <dependency> http://git-wip-us.apache.org/repos/asf/wicket/blob/273d479f/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator.java ---------------------------------------------------------------------- diff --git a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator.java b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator.java index 5ae2314..9cee8f8 100644 --- a/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator.java +++ b/wicket-bean-validation/src/main/java/org/apache/wicket/bean/validation/PropertyValidator.java @@ -3,6 +3,7 @@ package org.apache.wicket.bean.validation; import java.lang.annotation.Annotation; import java.util.ArrayList; import java.util.Arrays; +import java.util.Collections; import java.util.HashSet; import java.util.Iterator; import java.util.List; @@ -10,8 +11,6 @@ import java.util.Set; import javax.validation.ConstraintViolation; import javax.validation.Validator; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import javax.validation.groups.Default; import javax.validation.metadata.ConstraintDescriptor; @@ -61,8 +60,24 @@ import org.apache.wicket.validation.IValidator; public class PropertyValidator<T> extends Behavior implements IValidator<T> { private static final Class<?>[] EMPTY = new Class<?>[0]; - private static final List<Class<? extends Annotation>> NOT_NULL_ANNOTATIONS = - Arrays.asList(NotNull.class, NotBlank.class, NotEmpty.class); + private static final List<Class<? extends Annotation>> NOT_NULL_ANNOTATIONS; + static + { + List<Class<? extends Annotation>> tmp = new ArrayList<>(); + tmp.add(NotNull.class); + try + { + tmp.add(Class.forName("javax.validation.constraints.NotBlank") + .asSubclass(Annotation.class)); + tmp.add(Class.forName("javax.validation.constraints.NotEmpty") + .asSubclass(Annotation.class)); + } + catch (ClassNotFoundException e) + { + // ignore exception, we are using bean validation 1.1 + } + NOT_NULL_ANNOTATIONS = Collections.unmodifiableList(tmp); + } private FormComponent<T> component; http://git-wip-us.apache.org/repos/asf/wicket/blob/273d479f/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java ---------------------------------------------------------------------- diff --git a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java index 2f84c01..118b3fa 100644 --- a/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java +++ b/wicket-bean-validation/src/test/java/org/apache/wicket/bean/validation/PropertyValidatorRequiredTest.java @@ -7,8 +7,6 @@ import java.util.Arrays; import java.util.List; import javax.validation.Valid; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; import org.apache.wicket.MarkupContainer; @@ -74,10 +72,6 @@ public class PropertyValidatorRequiredTest assertTrue(page.input21.isRequired()); - // NotEmpty + NotBlank - assertTrue(page.input22.isRequired()); - assertTrue(page.input23.isRequired()); - } /** @@ -112,7 +106,7 @@ public class PropertyValidatorRequiredTest private TestBean bean = new TestBean(); private FormComponent<String> input1, input2, input3, input4, input5, input6, input7, input8, input9, input10, input11, input12, input13, input14, input15, input16, input17, - input18, input19, input20, input21, input22, input23; + input18, input19, input20, input21; public TestPage() { @@ -170,16 +164,9 @@ public class PropertyValidatorRequiredTest input21 = new TextField<String>("input21", new PropertyModel<String>(this, "bean.subBeanList[0].property")).add(new PropertyValidator<>()); - input22 = new TextField<String>("input22", - new PropertyModel<String>(this, "bean.propertyNotEmpty")) - .add(new PropertyValidator<>()); - input23 = new TextField<String>("input23", - new PropertyModel<String>(this, "bean.propertyNotBlank")) - .add(new PropertyValidator<>()); - form.add(input1, input2, input3, input4, input5, input6, input7, input8, input9, input10, input11, input12, input13, input14, input15, input16, input17, input18, - input19, input20, input21, input22, input23); + input19, input20, input21); } @@ -188,7 +175,7 @@ public class PropertyValidatorRequiredTest Class<?> containerClass) { return new StringResourceStream( - "<form wicket:id='form'><input wicket:id='input1'/><input wicket:id='input2'/><input wicket:id='input3'/><input wicket:id='input4'/><input wicket:id='input5'/><input wicket:id='input6'/><input wicket:id='input7'/><input wicket:id='input8'/><input wicket:id='input9'/><input wicket:id='input10'/><input wicket:id='input11'/><input wicket:id='input12'/><input wicket:id='input13'/><input wicket:id='input14'/><input wicket:id='input15'/><input wicket:id='input16'/><input wicket:id='input17'/><input wicket:id='input18'/><input wicket:id='input19'/><input wicket:id='input20'/><input wicket:id='input21'/><input wicket:id='input22'/><input wicket:id='input23'/></form>"); + "<form wicket:id='form'><input wicket:id='input1'/><input wicket:id='input2'/><input wicket:id='input3'/><input wicket:id='input4'/><input wicket:id='input5'/><input wicket:id='input6'/><input wicket:id='input7'/><input wicket:id='input8'/><input wicket:id='input9'/><input wicket:id='input10'/><input wicket:id='input11'/><input wicket:id='input12'/><input wicket:id='input13'/><input wicket:id='input14'/><input wicket:id='input15'/><input wicket:id='input16'/><input wicket:id='input17'/><input wicket:id='input18'/><input wicket:id='input19'/><input wicket:id='input20'/><input wicket:id='input21'/></form>"); } } @@ -227,13 +214,6 @@ public class PropertyValidatorRequiredTest @NotNull(groups = { GroupOne.class, GroupTwo.class }) String propertyOneTwo; - - @NotEmpty - String propertyNotEmpty; - - @NotBlank - String propertyNotBlank; - } } http://git-wip-us.apache.org/repos/asf/wicket/blob/273d479f/wicket-examples/pom.xml ---------------------------------------------------------------------- diff --git a/wicket-examples/pom.xml b/wicket-examples/pom.xml index 25328bd..550a5f4 100644 --- a/wicket-examples/pom.xml +++ b/wicket-examples/pom.xml @@ -48,6 +48,11 @@ <version>1.0</version> </dependency> <dependency> + <groupId>javax.validation</groupId> + <artifactId>validation-api</artifactId> + <version>2.0.0.Final</version> + </dependency> + <dependency> <groupId>org.codelibs</groupId> <artifactId>jhighlight</artifactId> <version>1.0.3</version> @@ -58,6 +63,11 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-validator</artifactId> + <version>6.0.7.Final</version> + </dependency> </dependencies> </dependencyManagement> <dependencies>
