Author: epbernard Date: 2009-02-23 05:17:40 -0500 (Mon, 23 Feb 2009) New Revision: 16021 Removed: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalses.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrues.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Futures.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Maxs.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Mins.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNulls.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Nulls.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pasts.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Patterns.java beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Sizes.java Modified: 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/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-121 add plural forms 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalse.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -40,4 +40,17 @@ String message() default "{validator.assertFalse}"; Class<?>[] groups() default { }; + + /** + * Defines several @AssertFalse annotations on the same element + * @see javax.validation.constraints.AssertFalse + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + AssertFalse[] value(); + } } \ No newline at end of file Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalses.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalses.java 2009-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertFalses.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -1,22 +0,0 @@ -package javax.validation.constraints; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.Documented; -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; - -/** - * Defines several @AssertFalse annotations on the same element - * @see javax.validation.constraints.AssertFalse - * - * @author Emmanuel Bernard - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RUNTIME) -@Documented -public @interface AssertFalses { - AssertFalse[] value(); -} 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrue.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -40,4 +40,17 @@ String message() default "{validator.assertTrue}"; Class<?>[] groups() default { }; + + /** + * Defines several @AssertTrue annotations on the same element + * @see AssertTrue + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + AssertTrue[] value(); + } } \ No newline at end of file Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrues.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrues.java 2009-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/AssertTrues.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -1,22 +0,0 @@ -package javax.validation.constraints; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.Documented; -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; - -/** - * Defines several @AssertTrue annotations on the same element - * @see AssertTrue - * - * @author Emmanuel Bernard - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RUNTIME) -@Documented -public @interface AssertTrues { - AssertTrue[] value(); -} \ No newline at end of file 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Digits.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -60,4 +60,17 @@ * @return maximum number of fractional digits accepted for this number. */ int fraction(); + + /** + * Defines several @Digits annotations on the same element + * @see Digits + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + Size[] value(); + } } \ No newline at end of file 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Future.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -51,4 +51,17 @@ String message() default "{validator.future}"; Class<?>[] groups() default { }; + + /** + * Defines several @Future annotations on the same element + * @see javax.validation.constraints.Future + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + Future[] value(); + } } \ No newline at end of file Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Futures.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Futures.java 2009-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Futures.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -1,22 +0,0 @@ -package javax.validation.constraints; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.Documented; -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; - -/** - * Defines several @Future annotations on the same element - * @see javax.validation.constraints.Future - * - * @author Emmanuel Bernard - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RUNTIME) -@Documented -public @interface Futures { - Future[] value(); -} \ No newline at end of file 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Max.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -56,4 +56,17 @@ * @return Value the element must be lower or equal to */ long value(); + + /** + * Defines several @Max annotations on the same element + * @see Max + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + Max[] value(); + } } \ No newline at end of file Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Maxs.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Maxs.java 2009-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Maxs.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -1,22 +0,0 @@ -package javax.validation.constraints; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.Documented; -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; - -/** - * Defines several @Max annotations on the same element - * @see Max - * - * @author Emmanuel Bernard - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RUNTIME) -@Documented -public @interface Maxs { - public abstract Max[] value(); -} \ No newline at end of file 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Min.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -56,4 +56,17 @@ * @return Value the element must be higher or equal to */ long value(); + + /** + * Defines several @Min annotations on the same element + * @see javax.validation.constraints.Min + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + Min[] value(); + } } \ No newline at end of file Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Mins.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Mins.java 2009-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Mins.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -1,22 +0,0 @@ -package javax.validation.constraints; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.Documented; -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; - -/** - * Defines several @Min annotations on the same element - * @see javax.validation.constraints.Min - * - * @author Emmanuel Bernard - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RUNTIME) -@Documented -public @interface Mins { - public abstract Min[] value(); -} \ No newline at end of file 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNull.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -38,4 +38,17 @@ String message() default "{validator.notNull}"; Class<?>[] groups() default { }; + + /** + * Defines several @NotNull annotations on the same element + * @see javax.validation.constraints.NotNull + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + NotNull[] value(); + } } Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNulls.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNulls.java 2009-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/NotNulls.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -1,22 +0,0 @@ -package javax.validation.constraints; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.Documented; -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; - -/** - * Defines several @NotNull annotations on the same element - * @see javax.validation.constraints.NotNull - * - * @author Emmanuel Bernard - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RUNTIME) -@Documented -public @interface NotNulls { - public abstract NotNull[] value(); -} \ No newline at end of file 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Null.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -38,5 +38,18 @@ String message() default "{validator.null}"; Class<?>[] groups() default { }; + + /** + * Defines several @Null annotations on the same element + * @see javax.validation.constraints.Null + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + Null[] value(); + } } Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Nulls.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Nulls.java 2009-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Nulls.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -1,22 +0,0 @@ -package javax.validation.constraints; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.Documented; -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; - -/** - * Defines several @Null annotations on the same element - * @see javax.validation.constraints.Null - * - * @author Emmanuel Bernard - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RUNTIME) -@Documented -public @interface Nulls { - public abstract Null[] value(); -} \ No newline at end of file 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Past.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -51,4 +51,17 @@ String message() default "{validator.past}"; Class<?>[] groups() default { }; + + /** + * Defines several @NotNull annotations on the same element + * @see Past + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + Past[] value(); + } } \ No newline at end of file Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pasts.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pasts.java 2009-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pasts.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -1,22 +0,0 @@ -package javax.validation.constraints; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.Documented; -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; - -/** - * Defines several @NotNull annotations on the same element - * @see Past - * - * @author Emmanuel Bernard - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RUNTIME) -@Documented -public @interface Pasts { - public abstract Past[] value(); -} \ No newline at end of file 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Pattern.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -87,4 +87,17 @@ */ CANON_EQ, } + + /** + * Defines several @Pattern annotations on the same element + * @see javax.validation.constraints.Pattern + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + Pattern[] value(); + } } Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Patterns.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Patterns.java 2009-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Patterns.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -1,22 +0,0 @@ -package javax.validation.constraints; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.Documented; -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; - -/** - * Defines several @Pattern annotations on the same element - * @see javax.validation.constraints.Pattern - * - * @author Emmanuel Bernard - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RUNTIME) -@Documented -public @interface Patterns { - public abstract Pattern[] value(); -} \ No newline at end of file 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-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Size.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -55,4 +55,17 @@ * @return size the element must be lower or equal to */ int max() default Integer.MAX_VALUE; + + /** + * Defines several @Size annotations on the same element + * @see Size + * + * @author Emmanuel Bernard + */ + @Target({ METHOD, FIELD, ANNOTATION_TYPE }) + @Retention(RUNTIME) + @Documented + @interface List { + Size[] value(); + } } \ No newline at end of file Deleted: beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Sizes.java =================================================================== --- beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Sizes.java 2009-02-23 09:40:29 UTC (rev 16020) +++ beanvalidation/trunk/validation-api/src/main/java/javax/validation/constraints/Sizes.java 2009-02-23 10:17:40 UTC (rev 16021) @@ -1,22 +0,0 @@ -package javax.validation.constraints; - -import java.lang.annotation.Target; -import java.lang.annotation.Retention; -import java.lang.annotation.Documented; -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; - -/** - * Defines several @Size annotations on the same element - * @see Size - * - * @author Emmanuel Bernard - */ -@Target({ METHOD, FIELD, ANNOTATION_TYPE }) -@Retention(RUNTIME) -@Documented -public @interface Sizes { - public abstract Size[] value(); -} \ No newline at end of file