Skip to content

Commit ec917c0

Browse files
authored
version 0.0.3 (#5)
1 parent 3a044cd commit ec917c0

File tree

5 files changed

+24
-7
lines changed

5 files changed

+24
-7
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
<groupId>com.bvilela.lib</groupId>
99
<artifactId>java-util-validation</artifactId>
10-
<version>0.0.2</version>
10+
<version>0.0.3</version>
1111
<name>java-util-validation</name>
1212

1313
<properties>

src/main/java/com/bvilela/utils/annotation/javax/ValidParseDate.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,7 @@
6565
boolean parse() default false;
6666

6767
boolean required() default true;
68+
69+
String messageRequired() default "{bvilela.lib.util.validation.ValidParseDate.messageRequired}";
6870

6971
}

src/main/java/com/bvilela/utils/annotation/javax/impl/ValidParseDateImpl.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,14 @@ public class ValidParseDateImpl implements ConstraintValidator<ValidParseDate, O
1515
private String pattern;
1616
private Locale locale;
1717
private boolean isRequired;
18+
private String messageRequired;
1819

1920
@Override
2021
public void initialize(ValidParseDate annotation) {
2122
this.pattern = annotation.pattern();
2223
this.locale = AppUtils.getLocale(annotation.locale());
2324
this.isRequired = annotation.required();
25+
this.messageRequired = annotation.messageRequired();
2426
}
2527

2628
@Override
@@ -54,8 +56,7 @@ public boolean isValid(Object value, ConstraintValidatorContext context) {
5456

5557
private void overriteMessage(ConstraintValidatorContext context) {
5658
context.disableDefaultConstraintViolation();
57-
context.buildConstraintViolationWithTemplate(
58-
"{bvilela.lib.util.validation.ValidParseDate.messageRequired}").addConstraintViolation();
59+
context.buildConstraintViolationWithTemplate(this.messageRequired).addConstraintViolation();
5960
}
6061

6162
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
bvilela.lib.util.validation.ValidParseDate.message=Value is a invalid date
2-
bvilela.lib.util.validation.ValidParseDate.messageRequired=Field is required
1+
bvilela.lib.util.validation.ValidParseDate.message=Value is a invalid date.
2+
bvilela.lib.util.validation.ValidParseDate.messageRequired=Field is required.

src/test/java/com/bvilela/utils/annotation/javax/ValidDateTest.java

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,20 @@ void shouldExceptionRequiredDateBlank() {
5959
baseRequiredException(new MyTestDTO1(" "));
6060
}
6161

62+
@AllArgsConstructor
63+
private class CustomRequiredMessageDTO {
64+
@ValidParseDate(messageRequired = "My Custom Message for Required Field.")
65+
private String date;
66+
}
67+
68+
@Test
69+
void shouldExceptionRequiredDateNullCustomRequiredMessage() {
70+
List<ConstraintViolation<Object>> errors = ValidationUtils.validateDto(new CustomRequiredMessageDTO(null));
71+
assertEquals(1, errors.size());
72+
assertEquals("My Custom Message for Required Field.", errors.get(0).getMessage());
73+
assertEquals("date", errors.get(0).getPropertyPath().toString());
74+
}
75+
6276
@AllArgsConstructor
6377
private class MyTestDTO1NoRequired {
6478
@ValidParseDate(required = false)
@@ -105,13 +119,13 @@ private <T> void baseRequiredException(T dto) {
105119

106120
private void checkMessageInvalidDate(List<ConstraintViolation<Object>> errors) {
107121
assertEquals(1, errors.size());
108-
assertEquals("Value is a invalid date", errors.get(0).getMessage());
122+
assertEquals("Value is a invalid date.", errors.get(0).getMessage());
109123
assertEquals("date", errors.get(0).getPropertyPath().toString());
110124
}
111125

112126
private void checkMessageRequiredDate(List<ConstraintViolation<Object>> errors) {
113127
assertEquals(1, errors.size());
114-
assertEquals("Field is required", errors.get(0).getMessage());
128+
assertEquals("Field is required.", errors.get(0).getMessage());
115129
assertEquals("date", errors.get(0).getPropertyPath().toString());
116130
}
117131

0 commit comments

Comments
 (0)