HV-1135 Add support for orPresent option in @past and @future

hibernate · Dec 23, 2016 · 0cf4405 · 0cf4405
1 parent f2ed01c
commit 0cf4405
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 12 deletions.
diff --git a/...nate/validator/internal/constraintvalidators/bv/time/AbstractEpochBasedTimeValidator.java b/...nate/validator/internal/constraintvalidators/bv/time/AbstractEpochBasedTimeValidator.java
@@ -26,10 +26,6 @@ public abstract class AbstractEpochBasedTimeValidator<C extends Annotation, T> i
 
 	private static final Log LOG = LoggerFactory.make();
 
-	@Override
-	public void initialize(C constraintAnnotation) {
-	}
-
 	@Override
 	public boolean isValid(T value, ConstraintValidatorContext context) {
 		// null values are valid

diff --git a/.../hibernate/validator/internal/constraintvalidators/bv/time/AbstractJavaTimeValidator.java b/.../hibernate/validator/internal/constraintvalidators/bv/time/AbstractJavaTimeValidator.java
@@ -27,10 +27,6 @@ public abstract class AbstractJavaTimeValidator<C extends Annotation, T extends
 
 	private static final Log LOG = LoggerFactory.make();
 
-	@Override
-	public void initialize(C constraintAnnotation) {
-	}
-
 	@Override
 	public boolean isValid(T value, ConstraintValidatorContext context) {
 		// null values are valid

diff --git a/...dator/internal/constraintvalidators/bv/time/future/AbstractFutureEpochBasedValidator.java b/...dator/internal/constraintvalidators/bv/time/future/AbstractFutureEpochBasedValidator.java
@@ -18,9 +18,16 @@
  */
 public abstract class AbstractFutureEpochBasedValidator<T> extends AbstractEpochBasedTimeValidator<Future, T> {
 
+	private boolean isPresentValid;
+
+	@Override
+	public void initialize(Future constraintAnnotation) {
+		isPresentValid = constraintAnnotation.orPresent();
+	}
+
 	@Override
 	protected boolean isValid(int result) {
-		return result > 0;
+		return isPresentValid ? ( result >= 0 ) : ( result > 0 );
 	}
 
 }
diff --git a/...lidator/internal/constraintvalidators/bv/time/future/AbstractFutureJavaTimeValidator.java b/...lidator/internal/constraintvalidators/bv/time/future/AbstractFutureJavaTimeValidator.java
@@ -20,9 +20,16 @@
  */
 public abstract class AbstractFutureJavaTimeValidator<T extends TemporalAccessor & Comparable<? super T>> extends AbstractJavaTimeValidator<Future, T> {
 
+	private boolean isPresentValid;
+
+	@Override
+	public void initialize(Future constraintAnnotation) {
+		isPresentValid = constraintAnnotation.orPresent();
+	}
+
 	@Override
 	protected boolean isValid(int result) {
-		return result > 0;
+		return isPresentValid ? ( result >= 0 ) : ( result > 0 );
 	}
 
 }
diff --git a/...validator/internal/constraintvalidators/bv/time/past/AbstractPastEpochBasedValidator.java b/...validator/internal/constraintvalidators/bv/time/past/AbstractPastEpochBasedValidator.java
@@ -18,9 +18,16 @@
  */
 public abstract class AbstractPastEpochBasedValidator<T> extends AbstractEpochBasedTimeValidator<Past, T> {
 
+	private boolean isPresentValid;
+
+	@Override
+	public void initialize(Past constraintAnnotation) {
+		isPresentValid = constraintAnnotation.orPresent();
+	}
+
 	@Override
 	protected boolean isValid(int result) {
-		return result < 0;
+		return isPresentValid ? ( result <= 0 ) : ( result < 0 );
 	}
 
 }
diff --git a/...e/validator/internal/constraintvalidators/bv/time/past/AbstractPastJavaTimeValidator.java b/...e/validator/internal/constraintvalidators/bv/time/past/AbstractPastJavaTimeValidator.java
@@ -20,9 +20,16 @@
  */
 public abstract class AbstractPastJavaTimeValidator<T extends TemporalAccessor & Comparable<? super T>> extends AbstractJavaTimeValidator<Past, T> {
 
+	private boolean isPresentValid;
+
+	@Override
+	public void initialize(Past constraintAnnotation) {
+		isPresentValid = constraintAnnotation.orPresent();
+	}
+
 	@Override
 	protected boolean isValid(int result) {
-		return result < 0;
+		return isPresentValid ? ( result <= 0 ) : ( result < 0 );
 	}
 
 }