Use short message keys for known validators

validator-constraints/src/main/java/io/avaje/validation/constraints/AssertFalse.java

@@ -6,7 +6,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(AssertFalse.List.class)
 public @interface AssertFalse {
-    String message() default "{avaje.validation.constraints.AssertFalse.message}";
+    String message() default "{avaje.AssertFalse.message}";
 
     Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/AssertTrue.java

@@ -6,7 +6,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(AssertTrue.List.class)
 public @interface AssertTrue {
-    String message() default "{avaje.validation.constraints.AssertTrue.message}";
+    String message() default "{avaje.AssertTrue.message}";
 
     Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/DecimalMax.java

@@ -15,7 +15,7 @@
 @Repeatable(List.class)
 public @interface DecimalMax {
 
-  String message() default "{avaje.validation.constraints.DecimalMax.message}";
+  String message() default "{avaje.DecimalMax.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/DecimalMin.java

@@ -41,7 +41,7 @@
 @Repeatable(List.class)
 public @interface DecimalMin {
 
-  String message() default "{avaje.validation.constraints.DecimalMin.message}";
+  String message() default "{avaje.DecimalMin.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Digits.java

@@ -6,7 +6,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(Digits.List.class)
 public @interface Digits {
-    String message() default "{avaje.validation.constraints.Digits.message}";
+    String message() default "{avaje.Digits.message}";
 
     Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Email.java

@@ -23,7 +23,7 @@
 @Documented
 public @interface Email {
 
-  String message() default "{avaje.validation.constraints.Email.message}";
+  String message() default "{avaje.Email.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Future.java

@@ -17,7 +17,7 @@
 @Repeatable(List.class)
 public @interface Future {
 
-  String message() default "{avaje.validation.constraints.Future.message}";
+  String message() default "{avaje.Future.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Max.java

@@ -6,7 +6,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(Max.List.class)
 public @interface Max {
-    String message() default "{avaje.validation.constraints.Max.message}";
+    String message() default "{avaje.Max.message}";
 
     Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Min.java

@@ -6,7 +6,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(Min.List.class)
 public @interface Min {
-    String message() default "{avaje.validation.constraints.Min.message}";
+    String message() default "{avaje.Min.message}";
 
     Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Negative.java

@@ -17,7 +17,7 @@
 @Documented
 public @interface Negative {
 
-  String message() default "{avaje.validation.constraints.Negative.message}";
+  String message() default "{avaje.Negative.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/NegativeOrZero.java

@@ -17,7 +17,7 @@
 @Documented
 public @interface NegativeOrZero {
 
-  String message() default "{avaje.validation.constraints.NegativeOrZero.message}";
+  String message() default "{avaje.NegativeOrZero.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/NotBlank.java

@@ -17,7 +17,7 @@
 @Repeatable(List.class)
 public @interface NotBlank {
 
-  String message() default "{avaje.validation.constraints.NotBlank.message}";
+  String message() default "{avaje.NotBlank.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/NotEmpty.java

@@ -17,7 +17,7 @@
 @Repeatable(List.class)
 public @interface NotEmpty {
 
-  String message() default "{avaje.validation.constraints.NotEmpty.message}";
+  String message() default "{avaje.NotEmpty.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/NotNull.java

@@ -17,7 +17,7 @@
 @Repeatable(List.class)
 public @interface NotNull {
 
-  String message() default "{avaje.validation.constraints.NotNull.message}";
+  String message() default "{avaje.NotNull.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Null.java

@@ -17,7 +17,7 @@
 @Repeatable(List.class)
 public @interface Null {
 
-  String message() default "{avaje.validation.constraints.Null.message}";
+  String message() default "{avaje.Null.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Past.java

@@ -17,7 +17,7 @@
 @Repeatable(List.class)
 public @interface Past {
 
-  String message() default "{avaje.validation.constraints.Past.message}";
+  String message() default "{avaje.Past.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Pattern.java

@@ -30,7 +30,7 @@
   RegexFlag[] flags() default {};
 
   /** @return the error message template */
-  String message() default "{avaje.validation.constraints.Pattern.message}";
+  String message() default "{avaje.Pattern.message}";
 
   /** @return the groups the constraint belongs to */
   Class<?>[] groups() default {};

validator-constraints/src/main/java/io/avaje/validation/constraints/Positive.java

@@ -17,7 +17,7 @@
 @Documented
 public @interface Positive {
 
-  String message() default "{avaje.validation.constraints.Positive.message}";
+  String message() default "{avaje.Positive.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/PositiveOrZero.java

@@ -17,7 +17,7 @@
 @Documented
 public @interface PositiveOrZero {
 
-  String message() default "{avaje.validation.constraints.PositiveOrZero.message}";
+  String message() default "{avaje.PositiveOrZero.message}";
 
   Class<?>[] groups() default {};
 

validator-constraints/src/main/java/io/avaje/validation/constraints/Size.java

@@ -11,7 +11,7 @@
 @Retention(RetentionPolicy.RUNTIME)
 @Repeatable(Size.List.class)
 public @interface Size {
-    String message() default "{avaje.validation.constraints.Size.message}";
+    String message() default "{avaje.Size.message}";
 
     Class<?>[] groups() default {};
 

validator/src/main/java/io/avaje/validation/core/adapters/BasicAdapters.java

@@ -19,18 +19,18 @@ private BasicAdapters() {}
   public static final ValidationContext.AnnotationFactory FACTORY = (annotationType, context, attributes) ->
     switch (annotationType.getSimpleName()) {
         case "Email" -> new EmailAdapter(context.message("Email", attributes), attributes);
-        case "Null" -> new NullAdapter(context.message2("{avaje.validation.constraints.Null.message}", attributes));
-        case "NotNull", "NonNull" -> new NotNullAdapter(context.message2("{avaje.validation.constraints.NotNull.message}", attributes));
-        case "AssertTrue" -> new AssertBooleanAdapter(context.message2("{avaje.validation.constraints.AssertTrue.message}", attributes), false);
-        case "AssertFalse" -> new AssertBooleanAdapter(context.message2("{avaje.validation.constraints.AssertFalse.message}", attributes), true);
-        case "NotBlank" -> new NotBlankAdapter(context.message2("{avaje.validation.constraints.NotBlank.message}", attributes));
-        case "NotEmpty" -> new NotEmptyAdapter(context.message2("{avaje.validation.constraints.NotEmpty.message}", attributes));
+        case "Null" -> new NullAdapter(context.message2("{avaje.Null.message}", attributes));
+        case "NotNull", "NonNull" -> new NotNullAdapter(context.message2("{avaje.NotNull.message}", attributes));
+        case "AssertTrue" -> new AssertBooleanAdapter(context.message2("{avaje.AssertTrue.message}", attributes), false);
+        case "AssertFalse" -> new AssertBooleanAdapter(context.message2("{avaje.AssertFalse.message}", attributes), true);
+        case "NotBlank" -> new NotBlankAdapter(context.message2("{avaje.NotBlank.message}", attributes));
+        case "NotEmpty" -> new NotEmptyAdapter(context.message2("{avaje.NotEmpty.message}", attributes));
         case "Past" -> new FuturePastAdapter(context.message("Past", attributes), true, false);
         case "PastOrPresent" -> new FuturePastAdapter(context.message("PastOrPresent", attributes), true, true);
         case "Future" -> new FuturePastAdapter(context.message("Future", attributes), false, false);
         case "FutureOrPresent" -> new FuturePastAdapter(context.message("FutureOrPresent", attributes), false, true);
-        case "Pattern" -> new PatternAdapter(context.message2("{avaje.validation.constraints.Pattern.message}", attributes), attributes);
-        case "Size" -> new SizeAdapter(context.message2("{avaje.validation.constraints.Size.message}", attributes), attributes);
+        case "Pattern" -> new PatternAdapter(context.message2("{avaje.Pattern.message}", attributes), attributes);
+        case "Size" -> new SizeAdapter(context.message2("{avaje.Size.message}", attributes), attributes);
         default -> null;
       };
 

validator/src/main/resources/io/avaje/validation/Messages.properties

@@ -1,46 +1,46 @@
-avaje.validation.constraints.AssertFalse.message     = must be false
-avaje.validation.constraints.AssertTrue.message      = must be true
-avaje.validation.constraints.DecimalMax.message      = must be less than ${inclusive == true ? 'or equal to ' : ''}{value}
-avaje.validation.constraints.DecimalMin.message      = must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}
-avaje.validation.constraints.Digits.message          = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
-avaje.validation.constraints.Email.message           = must be a well-formed email address
-avaje.validation.constraints.Future.message          = must be a future date
-avaje.validation.constraints.FutureOrPresent.message = must be a date in the present or in the future
-avaje.validation.constraints.Max.message             = must be less than or equal to {value}
-avaje.validation.constraints.Min.message             = must be greater than or equal to {value}
-avaje.validation.constraints.Negative.message        = must be less than 0
-avaje.validation.constraints.NegativeOrZero.message  = must be less than or equal to 0
-avaje.validation.constraints.NotBlank.message        = must not be blank
-avaje.validation.constraints.NotEmpty.message        = must not be empty
-avaje.validation.constraints.NotNull.message         = must not be null
-avaje.validation.constraints.Null.message            = must be null
-avaje.validation.constraints.Past.message            = must be a past date
-avaje.validation.constraints.PastOrPresent.message   = must be a date in the past or in the present
-avaje.validation.constraints.Pattern.message         = must match "{regexp}"
-avaje.validation.constraints.Positive.message        = must be greater than 0
-avaje.validation.constraints.PositiveOrZero.message  = must be greater than or equal to 0
-avaje.validation.constraints.Size.message            = size must be between {min} and {max}
+avaje.AssertFalse.message     = must be false
+avaje.AssertTrue.message      = must be true
+avaje.DecimalMax.message      = must be less than ${inclusive == true ? 'or equal to ' : ''}{value}
+avaje.DecimalMin.message      = must be greater than ${inclusive == true ? 'or equal to ' : ''}{value}
+avaje.Digits.message          = numeric value out of bounds (<{integer} digits>.<{fraction} digits> expected)
+avaje.Email.message           = must be a well-formed email address
+avaje.Future.message          = must be a future date
+avaje.FutureOrPresent.message = must be a date in the present or in the future
+avaje.Max.message             = must be less than or equal to {value}
+avaje.Min.message             = must be greater than or equal to {value}
+avaje.Negative.message        = must be less than 0
+avaje.NegativeOrZero.message  = must be less than or equal to 0
+avaje.NotBlank.message        = must not be blank
+avaje.NotEmpty.message        = must not be empty
+avaje.NotNull.message         = must not be null
+avaje.Null.message            = must be null
+avaje.Past.message            = must be a past date
+avaje.PastOrPresent.message   = must be a date in the past or in the present
+avaje.Pattern.message         = must match "{regexp}"
+avaje.Positive.message        = must be greater than 0
+avaje.PositiveOrZero.message  = must be greater than or equal to 0
+avaje.Size.message            = size must be between {min} and {max}
 
-avaje.validation.constraints.ext.CreditCardNumber.message        = invalid credit card number
-avaje.validation.constraints.ext.Currency.message                = invalid currency (must be one of {value})
-avaje.validation.constraints.ext.EAN.message                     = invalid {type} barcode
-avaje.validation.constraints.ext.Email.message                   = not a well-formed email address
-avaje.validation.constraints.ext.ISBN.message                    = invalid ISBN
-avaje.validation.constraints.ext.Length.message                  = length must be between {min} and {max}
-avaje.validation.constraints.ext.CodePointLength.message         = length must be between {min} and {max}
-avaje.validation.constraints.ext.LuhnCheck.message               = the check digit for {validatedValue} is invalid, Luhn Modulo 10 checksum failed
-avaje.validation.constraints.ext.Mod10Check.message              = the check digit for {validatedValue} is invalid, Modulo 10 checksum failed
-avaje.validation.constraints.ext.Mod11Check.message              = the check digit for {validatedValue} is invalid, Modulo 11 checksum failed
-avaje.validation.constraints.ext.ModCheck.message                = the check digit for {validatedValue} is invalid, {modType} checksum failed
-avaje.validation.constraints.ext.Normalized.message              = must be normalized
-avaje.validation.constraints.ext.NotBlank.message                = may not be empty
-avaje.validation.constraints.ext.NotEmpty.message                = may not be empty
-avaje.validation.constraints.ext.ParametersScriptAssert.message  = script expression "{script}" didn't evaluate to true
-avaje.validation.constraints.ext.Range.message                   = must be between {min} and {max}
-avaje.validation.constraints.ext.ScriptAssert.message            = script expression "{script}" didn't evaluate to true
-avaje.validation.constraints.ext.UniqueElements.message          = must only contain unique elements
-avaje.validation.constraints.ext.URL.message                     = must be a valid URL
-avaje.validation.constraints.ext.UUID.message                     = must be a valid UUID
+avaje.ext.CreditCardNumber.message        = invalid credit card number
+avaje.ext.Currency.message                = invalid currency (must be one of {value})
+avaje.ext.EAN.message                     = invalid {type} barcode
+avaje.ext.Email.message                   = not a well-formed email address
+avaje.ext.ISBN.message                    = invalid ISBN
+avaje.ext.Length.message                  = length must be between {min} and {max}
+avaje.ext.CodePointLength.message         = length must be between {min} and {max}
+avaje.ext.LuhnCheck.message               = the check digit for {validatedValue} is invalid, Luhn Modulo 10 checksum failed
+avaje.ext.Mod10Check.message              = the check digit for {validatedValue} is invalid, Modulo 10 checksum failed
+avaje.ext.Mod11Check.message              = the check digit for {validatedValue} is invalid, Modulo 11 checksum failed
+avaje.ext.ModCheck.message                = the check digit for {validatedValue} is invalid, {modType} checksum failed
+avaje.ext.Normalized.message              = must be normalized
+avaje.ext.NotBlank.message                = may not be empty
+avaje.ext.NotEmpty.message                = may not be empty
+avaje.ext.ParametersScriptAssert.message  = script expression "{script}" didn't evaluate to true
+avaje.ext.Range.message                   = must be between {min} and {max}
+avaje.ext.ScriptAssert.message            = script expression "{script}" didn't evaluate to true
+avaje.ext.UniqueElements.message          = must only contain unique elements
+avaje.ext.URL.message                     = must be a valid URL
+avaje.ext.UUID.message                     = must be a valid UUID
 
-avaje.validation.constraints.ext.time.DurationMax.message        = must be shorter than${inclusive == true ? ' or equal to' : ''}${days == 0 ? '' : days == 1 ? ' 1 day' : ' ' += days += ' days'}${hours == 0 ? '' : hours == 1 ? ' 1 hour' : ' ' += hours += ' hours'}${minutes == 0 ? '' : minutes == 1 ? ' 1 minute' : ' ' += minutes += ' minutes'}${seconds == 0 ? '' : seconds == 1 ? ' 1 second' : ' ' += seconds += ' seconds'}${millis == 0 ? '' : millis == 1 ? ' 1 milli' : ' ' += millis += ' millis'}${nanos == 0 ? '' : nanos == 1 ? ' 1 nano' : ' ' += nanos += ' nanos'}
-avaje.validation.constraints.ext.time.DurationMin.message        = must be longer than${inclusive == true ? ' or equal to' : ''}${days == 0 ? '' : days == 1 ? ' 1 day' : ' ' += days += ' days'}${hours == 0 ? '' : hours == 1 ? ' 1 hour' : ' ' += hours += ' hours'}${minutes == 0 ? '' : minutes == 1 ? ' 1 minute' : ' ' += minutes += ' minutes'}${seconds == 0 ? '' : seconds == 1 ? ' 1 second' : ' ' += seconds += ' seconds'}${millis == 0 ? '' : millis == 1 ? ' 1 milli' : ' ' += millis += ' millis'}${nanos == 0 ? '' : nanos == 1 ? ' 1 nano' : ' ' += nanos += ' nanos'}
+avaje.ext.time.DurationMax.message        = must be shorter than${inclusive == true ? ' or equal to' : ''}${days == 0 ? '' : days == 1 ? ' 1 day' : ' ' += days += ' days'}${hours == 0 ? '' : hours == 1 ? ' 1 hour' : ' ' += hours += ' hours'}${minutes == 0 ? '' : minutes == 1 ? ' 1 minute' : ' ' += minutes += ' minutes'}${seconds == 0 ? '' : seconds == 1 ? ' 1 second' : ' ' += seconds += ' seconds'}${millis == 0 ? '' : millis == 1 ? ' 1 milli' : ' ' += millis += ' millis'}${nanos == 0 ? '' : nanos == 1 ? ' 1 nano' : ' ' += nanos += ' nanos'}
+avaje.ext.time.DurationMin.message        = must be longer than${inclusive == true ? ' or equal to' : ''}${days == 0 ? '' : days == 1 ? ' 1 day' : ' ' += days += ' days'}${hours == 0 ? '' : hours == 1 ? ' 1 hour' : ' ' += hours += ' hours'}${minutes == 0 ? '' : minutes == 1 ? ' 1 minute' : ' ' += minutes += ' minutes'}${seconds == 0 ? '' : seconds == 1 ? ' 1 second' : ' ' += seconds += ' seconds'}${millis == 0 ? '' : millis == 1 ? ' 1 milli' : ' ' += millis += ' millis'}${nanos == 0 ? '' : nanos == 1 ? ' 1 nano' : ' ' += nanos += ' nanos'}