target NumberSignValidator+ classes to correct constraint types
Project: http://git-wip-us.apache.org/repos/asf/bval/repo Commit: http://git-wip-us.apache.org/repos/asf/bval/commit/00a882f7 Tree: http://git-wip-us.apache.org/repos/asf/bval/tree/00a882f7 Diff: http://git-wip-us.apache.org/repos/asf/bval/diff/00a882f7 Branch: refs/heads/bv2 Commit: 00a882f724a9c861102b1cd768f31ca8a94510eb Parents: cd6d9ca Author: Matt Benson <[email protected]> Authored: Wed Mar 21 16:24:17 2018 -0500 Committer: Matt Benson <[email protected]> Committed: Wed Mar 21 16:24:17 2018 -0500 ---------------------------------------------------------------------- .../apache/bval/constraints/NumberSignValidator.java | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/bval/blob/00a882f7/bval-jsr/src/main/java/org/apache/bval/constraints/NumberSignValidator.java ---------------------------------------------------------------------- diff --git a/bval-jsr/src/main/java/org/apache/bval/constraints/NumberSignValidator.java b/bval-jsr/src/main/java/org/apache/bval/constraints/NumberSignValidator.java index fe8f59c..48d20b9 100644 --- a/bval-jsr/src/main/java/org/apache/bval/constraints/NumberSignValidator.java +++ b/bval-jsr/src/main/java/org/apache/bval/constraints/NumberSignValidator.java @@ -18,20 +18,24 @@ */ package org.apache.bval.constraints; +import java.lang.annotation.Annotation; import java.util.function.IntPredicate; import javax.validation.ConstraintValidator; import javax.validation.ConstraintValidatorContext; import javax.validation.constraints.Negative; +import javax.validation.constraints.NegativeOrZero; +import javax.validation.constraints.Positive; +import javax.validation.constraints.PositiveOrZero; import org.apache.bval.util.Validate; /** * Description: validate positive/negative number values. */ -public abstract class NumberSignValidator implements ConstraintValidator<Negative, Number> { - public static class ForPositive extends NumberSignValidator { - public static class OrZero extends NumberSignValidator { +public abstract class NumberSignValidator<A extends Annotation> implements ConstraintValidator<A, Number> { + public static class ForPositive extends NumberSignValidator<Positive> { + public static class OrZero extends NumberSignValidator<PositiveOrZero> { public OrZero() { super(n -> n >= 0); } @@ -42,8 +46,8 @@ public abstract class NumberSignValidator implements ConstraintValidator<Negativ } } - public static class ForNegative extends NumberSignValidator { - public static class OrZero extends NumberSignValidator { + public static class ForNegative extends NumberSignValidator<Negative> { + public static class OrZero extends NumberSignValidator<NegativeOrZero> { public OrZero() { super(n -> n <= 0); }
