Leap seconds are handled even better (#508) (#525)

aznan2 · Matti Hansson · web-flow · commit 1c68e2cbf462 · 2022-02-28T11:25:59.000-05:00
Co-authored-by: Matti Hansson &lt;matti.hansson@lm.se&gt;
diff --git a/pom.xml b/pom.xml
@@ -71,7 +71,7 @@
         <version.mockito>2.7.21</version.mockito>
         <version.hamcrest>2.2</version.hamcrest>
         <version.undertow>2.2.14.Final</version.undertow>
-        <version.itu>1.3.0</version.itu>
+        <version.itu>1.5.1</version.itu>
     </properties>
     <dependencies>
         <dependency>
diff --git a/src/main/java/com/networknt/schema/DateTimeValidator.java b/src/main/java/com/networknt/schema/DateTimeValidator.java
@@ -65,7 +65,11 @@ private boolean isLegalDateTime(String string) {
             return tryParse(() -> {
                 try {
                     ITU.parseDateTime(string);
-                } catch (LeapSecondException ignored) {}
+                } catch (LeapSecondException ex) {
+                    if(!ex.isVerifiedValidLeapYearMonth()) {
+                        throw ex;
+                    }
+                }
             });
         } else {
             throw new IllegalStateException("Unknown format: " + formatName);
diff --git a/src/test/resources/draft2019-09/optional/format/date-time.json b/src/test/resources/draft2019-09/optional/format/date-time.json
@@ -72,7 +72,7 @@
       },
       {
         "description": "an invalid date-time string with leap second",
-        "data": "1998-10-31T23:59:60Z",
+        "data": "1997-12-31T23:59:60Z",
         "valid": false
       }
     ]
diff --git a/src/test/resources/draft7/optional/format/date-time.json b/src/test/resources/draft7/optional/format/date-time.json
@@ -72,7 +72,7 @@
       },
       {
         "description": "an invalid date-time string with leap second",
-        "data": "1998-10-31T23:59:60Z",
+        "data": "1997-12-31T23:59:60Z",
         "valid": false
       }
     ]

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@`
`72`	`72`	`},`
`73`	`73`	`{`
`74`	`74`	`"description": "an invalid date-time string with leap second",`
`75`		`- "data": "1998-10-31T23:59:60Z",`
	`75`	`+ "data": "1997-12-31T23:59:60Z",`
`76`	`76`	`"valid": false`
`77`	`77`	`}`
`78`	`78`	`]`