Skip to content

Commit b7d37b9

Browse files
committed
fixes #114
1 parent 25aefc0 commit b7d37b9

File tree

2 files changed

+22
-2
lines changed

2 files changed

+22
-2
lines changed

src/main/java/com/networknt/schema/JsonMetaSchema.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ private static class DraftV4 {
4646
public static final List<Format> BUILTIN_FORMATS = new ArrayList<Format>();
4747
static {
4848
BUILTIN_FORMATS.add(pattern("date-time",
49-
"^\\d{4}-(?:0[0-9]{1}|1[0-2]{1})-(0?[1-9]|[12][0-9]|3[01])[tT ]\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?([zZ]|[+-]\\d{2}:\\d{2})$"));
49+
"^\\d{4}-(?:0[0-9]{1}|1[0-2]{1})-(0?[1-9]|[12][0-9]|3[01])[tT ]\\d{2}:\\d{2}:\\d{2}(\\.\\d+)?([zZ]?|[+-]\\d{2}:\\d{2})$"));
5050
BUILTIN_FORMATS.add(pattern("date", "^\\d{4}-(?:0[0-9]{1}|1[0-2]{1})-(0?[1-9]|[12][0-9]|3[01])$"));
5151
BUILTIN_FORMATS.add(pattern("time", "^\\d{2}:\\d{2}:\\d{2}$"));
5252
BUILTIN_FORMATS.add(pattern("email", "^\\S+@\\S+$"));

src/test/resources/tests/optional/format.json

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,30 @@
2424
"valid": false
2525
},
2626
{
27-
"description": "an invalid date-time string",
27+
"description": "an valid date-time string",
2828
"data": "1963-12-31T08:30:06.283185Z",
2929
"valid": true
3030
},
31+
{
32+
"description": "an valid date-time string",
33+
"data": "1963-12-30T08:30:06.283Z",
34+
"valid": true
35+
},
36+
{
37+
"description": "an valid date-time string",
38+
"data": "1963-12-30T08:30:06.283",
39+
"valid": true
40+
},
41+
{
42+
"description": "an valid date-time string",
43+
"data": "1963-12-30T08:30:06",
44+
"valid": true
45+
},
46+
{
47+
"description": "an valid date-time string",
48+
"data": "1963-12-30T08:30:06Z",
49+
"valid": true
50+
},
3151
{
3252
"description": "only RFC3339 not all of ISO 8601 are valid",
3353
"data": "2013-350T01:01:01",

0 commit comments

Comments
 (0)