Skip to content

Commit 6245077

Browse files
authored
Merge pull request #89 from avaje/feature/tidy-messages
Trim Messages.properties, remove unused avaje.ext.NotBlank, avaje.ext…
2 parents f5242b3 + b028770 commit 6245077

File tree

3 files changed

+1
-10
lines changed

3 files changed

+1
-10
lines changed

validator-inject-plugin/src/main/java/io/avaje/validation/inject/spi/DefaultValidatorProvider.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ public Class<?>[] providesAspects() {
3030

3131
@Override
3232
public void apply(BeanScopeBuilder builder) {
33-
3433
validator(builder);
35-
3634
paramAspect(builder);
3735
}
3836

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,11 @@ avaje.ext.Mod10Check.message = the check digit for {validatedValue}
3535
avaje.ext.Mod11Check.message = the check digit for {validatedValue} is invalid, Modulo 11 checksum failed
3636
avaje.ext.ModCheck.message = the check digit for {validatedValue} is invalid, {modType} checksum failed
3737
avaje.ext.Normalized.message = must be normalized
38-
avaje.ext.NotBlank.message = may not be empty
39-
avaje.ext.NotEmpty.message = may not be empty
40-
avaje.ext.ParametersScriptAssert.message = script expression "{script}" didn't evaluate to true
4138
avaje.ext.Range.message = must be between {min} and {max}
4239
avaje.ext.ScriptAssert.message = script expression "{script}" didn't evaluate to true
4340
avaje.ext.UniqueElements.message = must only contain unique elements
4441
avaje.ext.URL.message = must be a valid URL
45-
avaje.ext.UUID.message = must be a valid UUID
42+
avaje.ext.UUID.message = must be a valid UUID
4643
4744
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'}
4845
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'}

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

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ avaje.ext.LuhnCheck.message = die Pr\u00fcfziffer f\u00fcr {valida
3434
avaje.ext.Mod10Check.message = die Pr\u00fcfziffer f\u00fcr {validatedValue} ist ung\u00fcltig, Modulo 10-Kontrollsumme ist fehlgeschlagen
3535
avaje.ext.Mod11Check.message = die Pr\u00fcfziffer f\u00fcr {validatedValue} ist ung\u00fcltig, Modulo 11-Kontrollsumme ist fehlgeschlagen
3636
avaje.ext.ModCheck.message = die Pr\u00fcfziffer f\u00fcr {validatedValue} ist ung\u00fcltig, {modType}-Kontrollsumme ist fehlgeschlagen
37-
avaje.ext.NotBlank.message = darf nicht leer sein
38-
avaje.ext.NotEmpty.message = darf nicht leer sein
39-
avaje.ext.ParametersScriptAssert.message = die Evaluierung des Scriptausdrucks "{script}" ergab nicht true
4037
avaje.ext.Range.message = muss zwischen {min} und {max} sein
41-
avaje.ext.ScriptAssert.message = die Evaluierung des Scriptausdrucks "{script}" ergab nicht true
4238
avaje.ext.UniqueElements.message = darf nur eindeutige Elemente enthalten
4339
avaje.ext.URL.message = muss eine g\u00fcltige URL sein
4440
avaje.ext.UUID.message = muss eine g\u00fcltige UUID sein

0 commit comments

Comments
 (0)