Fixed code review issues

dropwizard · Nov 2, 2017 · f08aae5 · f08aae5
1 parent c3f38e4
commit f08aae5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 10 deletions.
diff --git a/dropwizard-validation/src/main/java/io/dropwizard/validation/MaxDuration.java b/dropwizard-validation/src/main/java/io/dropwizard/validation/MaxDuration.java
@@ -26,7 +26,7 @@
 @Documented
 @Constraint(validatedBy = MaxDurationValidator.class)
 public @interface MaxDuration {
-    String message() default "must be less than (or equal if in 'inclusive' mode) to {value} {unit}";
+    String message() default "must be less than (or equal to, if in 'inclusive' mode) to {value} {unit}";
 
     Class<?>[] groups() default { };
 
@@ -43,7 +43,9 @@
     TimeUnit unit() default TimeUnit.SECONDS;
 
     /**
-     * @return if the validation should include the set value (default is true).
+     * @return {@code true} if the validation is to allow values equal to {@link #value()}.
+     * False if the validation is to be exclusive.
+     * Defaults to {@code true}.
      */
     boolean inclusive() default true;
 }
diff --git a/dropwizard-validation/src/main/java/io/dropwizard/validation/MinDuration.java b/dropwizard-validation/src/main/java/io/dropwizard/validation/MinDuration.java
@@ -26,7 +26,7 @@
 @Documented
 @Constraint(validatedBy = MinDurationValidator.class)
 public @interface MinDuration {
-    String message() default "must be greater than (or equal if in 'inclusive' mode) to {value} {unit}";
+    String message() default "must be greater than (or equal to, if in 'inclusive' mode) to {value} {unit}";
 
     Class<?>[] groups() default { };
 
@@ -43,7 +43,9 @@
     TimeUnit unit() default TimeUnit.SECONDS;
 
     /**
-     * @return if the validation should include the set value (default is true).
+     * @return {@code true} if the validation is to allow values equal to {@link #value()}.
+     * False if the validation is to be exclusive.
+     * Defaults to {@code true}.
      */
     boolean inclusive() default true;
 }
diff --git a/dropwizard-validation/src/test/java/io/dropwizard/validation/DurationValidatorTest.java b/dropwizard-validation/src/test/java/io/dropwizard/validation/DurationValidatorTest.java
@@ -79,12 +79,12 @@ public void returnsASetOfErrorsForAnObject() throws Exception {
             assertThat(errors)
                     .containsOnly(
                             "outOfRange must be between 10 MINUTES and 30 MINUTES",
-                            "tooBig must be less than (or equal if in 'inclusive' mode) to 30 SECONDS",
-                            "tooBigExclusive must be less than (or equal if in 'inclusive' mode) to 30 SECONDS",
-                            "tooSmall must be greater than (or equal if in 'inclusive' mode) to 30 SECONDS",
-                            "tooSmallExclusive must be greater than (or equal if in 'inclusive' mode) to 30 SECONDS",
-                            "maxDurs[0].<collection element> must be less than (or equal if in 'inclusive' mode) to 30 SECONDS",
-                            "minDurs[0].<collection element> must be greater than (or equal if in 'inclusive' mode) to 30 SECONDS",
+                            "tooBig must be less than (or equal to, if in 'inclusive' mode) to 30 SECONDS",
+                            "tooBigExclusive must be less than (or equal to, if in 'inclusive' mode) to 30 SECONDS",
+                            "tooSmall must be greater than (or equal to, if in 'inclusive' mode) to 30 SECONDS",
+                            "tooSmallExclusive must be greater than (or equal to, if in 'inclusive' mode) to 30 SECONDS",
+                            "maxDurs[0].<collection element> must be less than (or equal to, if in 'inclusive' mode) to 30 SECONDS",
+                            "minDurs[0].<collection element> must be greater than (or equal to, if in 'inclusive' mode) to 30 SECONDS",
                             "rangeDurs[0].<collection element> must be between 10 MINUTES and 30 MINUTES");
         }
     }