Skip to content

Commit 0728a4d

Browse files
committed
fix: email validation parsing
1 parent 7398dfb commit 0728a4d

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

src/main/antlr4/io.zenwave360.zdl.antlr/Zdl.g4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ field_initialization: EQUALS field_initial_value;
208208
field_initial_value: simple;
209209
//field_validations: REQUIRED | UNIQUE | min_validation | max_validation | minlength_validation | maxlength_validation | pattern_validation;
210210
field_validations: field_validation_name (LPAREN field_validation_value RPAREN)?;
211-
field_validation_name: REQUIRED | UNIQUE | MIN | MAX | MINLENGTH | MAXLENGTH | PATTERN;
211+
field_validation_name: REQUIRED | UNIQUE | MIN | MAX | MINLENGTH | MAXLENGTH | PATTERN | EMAIL;
212212
field_validation_value: INT | ID | PATTERN_REGEX;
213213
nested_field_validations: nested_field_validation_name (LPAREN nested_field_validation_value RPAREN)?;
214214
nested_field_validation_name: REQUIRED | UNIQUE | MINLENGTH | MAXLENGTH;

src/test/java/io/zenwave360/zdl/antlr/ZdlListenerTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@ public void parseZdl_CompleteZdl() throws Exception {
122122
assertEquals(true, get(model, "$.entities.CustomerOrder.fields.customerDetails.isComplexType"));
123123
assertNotNull(get(model, "$.entities.CustomerOrder.fields.customerDetails.options.auditing"));
124124
assertNotNull(get(model, "$.entities.CustomerOrder.fields.customerDetails.options.ref"));
125+
assertNotNull(get(model, "$.entities.Customer.fields.email.validations.email"));
125126

126127
assertEquals("OrderItem", get(model, "$.entities.CustomerOrder.fields.orderItems.type"));
127128
assertNull(get(model, "$.entities.CustomerOrder.fields.orderItems.initialValue"));

src/test/resources/complete.zdl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ entity CustomerOrder {
8686
customerId String required
8787
firstName String required
8888
lastName String required
89-
email String required
89+
email String required email
9090
phone String required
9191
avatar byte[]
9292
address Address {

0 commit comments

Comments
 (0)