BVAL-616 Extracting @PositiveOrZero/@NegativeOrZero from @Positive/@Negative

Author: gunnarmorling

src/main/java/javax/validation/constraints/Negative.java

@@ -24,7 +24,7 @@
 import javax.validation.constraints.Negative.List;
 
 /**
- * The annotated element must be a negative number.
+ * The annotated element must be a strictly negative number (i.e. 0 is considered as an invalid value).
  * <p>
  * Supported types are:
  * <ul>
@@ -52,14 +52,6 @@
 
 	Class<? extends Payload>[] payload() default { };
 
-	/**
-	 * Whether the annotated element must be strictly negative (0 is considered as an invalid value) or not (0 is a
-	 * valid value).
-	 *
-	 * @return whether the annotated element must be strictly negative
-	 */
-	boolean strict() default false;
-
 	/**
 	 * Defines several {@link Negative} constraints on the same element.
 	 *

src/main/java/javax/validation/constraints/NegativeOrZero.java

@@ -0,0 +1,67 @@
+/*
+ * Bean Validation API
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package javax.validation.constraints;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE_USE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.constraints.NegativeOrZero.List;
+
+/**
+ * The annotated element must be a negative number or 0.
+ * <p>
+ * Supported types are:
+ * <ul>
+ *     <li>{@code BigDecimal}</li>
+ *     <li>{@code BigInteger}</li>
+ *     <li>{@code byte}, {@code short}, {@code int}, {@code long}, {@code float}, {@code double} and their respective
+ *     wrappers</li>
+ * </ul>
+ * <p>
+ * {@code null} elements are considered valid.
+ *
+ * @author Gunnar Morling
+ * @since 2.0
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE })
+@Retention(RUNTIME)
+@Repeatable(List.class)
+@Documented
+@Constraint(validatedBy = { })
+public @interface NegativeOrZero {
+
+	String message() default "{javax.validation.constraints.NegativeOrZero.message}";
+
+	Class<?>[] groups() default { };
+
+	Class<? extends Payload>[] payload() default { };
+
+	/**
+	 * Defines several {@link NegativeOrZero} constraints on the same element.
+	 *
+	 * @see NegativeOrZero
+	 */
+	@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE })
+	@Retention(RUNTIME)
+	@Documented
+	@interface List {
+
+		NegativeOrZero[] value();
+	}
+}

src/main/java/javax/validation/constraints/Positive.java

@@ -24,7 +24,7 @@
 import javax.validation.constraints.Positive.List;
 
 /**
- * The annotated element must be a positive number.
+ * The annotated element must be a strictly positive number (i.e. 0 is considered as an invalid value).
  * <p>
  * Supported types are:
  * <ul>
@@ -52,14 +52,6 @@
 
 	Class<? extends Payload>[] payload() default { };
 
-	/**
-	 * Whether the annotated element must be strictly positive (0 is considered as an invalid value) or not (0 is a
-	 * valid value).
-	 *
-	 * @return whether the annotated element must be strictly positive
-	 */
-	boolean strict() default false;
-
 	/**
 	 * Defines several {@link Positive} constraints on the same element.
 	 *

src/main/java/javax/validation/constraints/PositiveOrZero.java

@@ -0,0 +1,67 @@
+/*
+ * Bean Validation API
+ *
+ * License: Apache License, Version 2.0
+ * See the license.txt file in the root directory or <http://www.apache.org/licenses/LICENSE-2.0>.
+ */
+package javax.validation.constraints;
+
+import static java.lang.annotation.ElementType.ANNOTATION_TYPE;
+import static java.lang.annotation.ElementType.CONSTRUCTOR;
+import static java.lang.annotation.ElementType.FIELD;
+import static java.lang.annotation.ElementType.METHOD;
+import static java.lang.annotation.ElementType.PARAMETER;
+import static java.lang.annotation.ElementType.TYPE_USE;
+import static java.lang.annotation.RetentionPolicy.RUNTIME;
+
+import java.lang.annotation.Documented;
+import java.lang.annotation.Repeatable;
+import java.lang.annotation.Retention;
+import java.lang.annotation.Target;
+
+import javax.validation.Constraint;
+import javax.validation.Payload;
+import javax.validation.constraints.PositiveOrZero.List;
+
+/**
+ * The annotated element must be a positive number or 0.
+ * <p>
+ * Supported types are:
+ * <ul>
+ *     <li>{@code BigDecimal}</li>
+ *     <li>{@code BigInteger}</li>
+ *     <li>{@code byte}, {@code short}, {@code int}, {@code long}, {@code float}, {@code double} and their respective
+ *     wrappers</li>
+ * </ul>
+ * <p>
+ * {@code null} elements are considered valid.
+ *
+ * @author Gunnar Morling
+ * @since 2.0
+ */
+@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE })
+@Retention(RUNTIME)
+@Repeatable(List.class)
+@Documented
+@Constraint(validatedBy = { })
+public @interface PositiveOrZero {
+
+	String message() default "{javax.validation.constraints.PositiveOrZero.message}";
+
+	Class<?>[] groups() default { };
+
+	Class<? extends Payload>[] payload() default { };
+
+	/**
+	 * Defines several {@link PositiveOrZero} constraints on the same element.
+	 *
+	 * @see PositiveOrZero
+	 */
+	@Target({ METHOD, FIELD, ANNOTATION_TYPE, CONSTRUCTOR, PARAMETER, TYPE_USE })
+	@Retention(RUNTIME)
+	@Documented
+	@interface List {
+
+		PositiveOrZero[] value();
+	}
+}