[hibernate-commits] Hibernate SVN: r16991 - in beanvalidation/trunk/validation-api/src/main/java/javax/validation: constraints and 1 other directory.

Author: epbernard Date: 2009-07-02 08:39:38 -0400 (Thu, 02 Jul 2009) New Revision: 16991 Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/Valid.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java Log: BVAL-170 BVAL-170 support constructor and parameter target for built-in annotations and recommend custom annotations to do so Also make @Valid support these targets Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/Valid.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/Valid.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/Valid.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -19,6 +19,8 @@ import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.PARAMETER; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; @@ -30,7 +32,7 @@ * @author Emmanuel Bernard * @author Hardy Ferentschik */ -@Target({ METHOD, FIELD }) +@Target({ METHOD, FIELD, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) public @interface Valid { } Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -21,6 +21,8 @@ import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import static java.lang.annotation.ElementType.FIELD; import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.ElementType.CONSTRUCTOR; +import static java.lang.annotation.ElementType.PARAMETER; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; @@ -35,7 +37,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -52,7 +54,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -18,12 +18,11 @@ package javax.validation.constraints; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -35,7 +34,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -52,7 +51,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMax.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -18,12 +18,11 @@ package javax.validation.constraints; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -46,7 +45,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = { }) @@ -71,7 +70,7 @@ * @author Emmanuel Bernard * @see DecimalMax */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/DecimalMin.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -18,12 +18,11 @@ package javax.validation.constraints; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -46,7 +45,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -70,7 +69,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -18,12 +18,11 @@ package javax.validation.constraints; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -42,7 +41,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -69,7 +68,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -18,12 +18,11 @@ package javax.validation.constraints; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -43,7 +42,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -60,7 +59,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -18,12 +18,11 @@ package javax.validation.constraints; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -45,7 +44,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -67,7 +66,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -18,12 +18,11 @@ package javax.validation.constraints; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -45,7 +44,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -67,7 +66,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -18,12 +18,11 @@ package javax.validation.constraints; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -33,7 +32,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -50,7 +49,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -18,12 +18,11 @@ package javax.validation.constraints; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -33,7 +32,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -50,7 +49,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -18,12 +18,11 @@ package javax.validation.constraints; import java.lang.annotation.Documented; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; import java.lang.annotation.Retention; import static java.lang.annotation.RetentionPolicy.RUNTIME; import java.lang.annotation.Target; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -43,7 +42,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -60,7 +59,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -20,10 +20,9 @@ import java.lang.annotation.Target; import java.lang.annotation.Retention; import java.lang.annotation.Documented; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -36,7 +35,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -134,7 +133,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List { Modified: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java 2009-07-01 22:55:25 UTC (rev 16990) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java 2009-07-02 12:39:38 UTC (rev 16991) @@ -20,10 +20,9 @@ import java.lang.annotation.Target; import java.lang.annotation.Retention; import java.lang.annotation.Documented; +import static java.lang.annotation.ElementType.*; +import static java.lang.annotation.ElementType.PARAMETER; import static java.lang.annotation.RetentionPolicy.RUNTIME; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.ANNOTATION_TYPE; import javax.validation.Constraint; import javax.validation.ConstraintPayload; @@ -41,7 +40,7 @@ * * @author Emmanuel Bernard */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) +@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @Constraint(validatedBy = {}) @@ -68,7 +67,7 @@ * * @author Emmanuel Bernard */ - @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER }) @Retention(RUNTIME) @Documented @interface List {