Test case
2 generated files · +6 −6test/inputs/graphql/github1.graphql
Mgraphql-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mgraphql-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/graphql/github2.graphql
Mgraphql-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mgraphql-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/graphql/github3.graphql
Mgraphql-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mgraphql-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/graphql/github4.graphql
Mgraphql-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mgraphql-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/graphql/github5.graphql
Mgraphql-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mgraphql-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/graphql/github6.graphql
Mgraphql-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mgraphql-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/graphql/github7.graphql
Mgraphql-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mgraphql-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/graphql/github8.graphql
Mgraphql-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mgraphql-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/graphql/github9.graphql
Mgraphql-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mgraphql-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/00c36.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/00ec5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/010b1.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/016af.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/033b1.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/050b0.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/06bee.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/07540.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/0779f.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/07c75.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/09f54.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/0a358.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -182,11 +182,23 @@ extension Result { | ||
| 182 | 182 | |
| 183 | 183 | // MARK: - Helper functions for creating encoders and decoders |
| 184 | 184 | |
| 185 | +private func isValidDate(_ value: String) -> Bool { | |
| 186 | + let formatter = DateFormatter() | |
| 187 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 188 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 189 | + formatter.dateFormat = "u-MM-dd" | |
| 190 | + formatter.isLenient = false | |
| 191 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 192 | +} | |
| 193 | + | |
| 185 | 194 | func newJSONDecoder() -> JSONDecoder { |
| 186 | 195 | let decoder = JSONDecoder() |
| 187 | 196 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 188 | 197 | let container = try decoder.singleValueContainer() |
| 189 | 198 | let dateStr = try container.decode(String.self).uppercased() |
| 199 | + guard isValidDate(dateStr) else { | |
| 200 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 201 | + } | |
| 190 | 202 | |
| 191 | 203 | let formatter = DateFormatter() |
| 192 | 204 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
3 generated files · +20 −6test/inputs/json/misc/0a91a.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -1238,11 +1238,23 @@ extension Array where Element == TopLevel.Element { | ||
| 1238 | 1238 | |
| 1239 | 1239 | // MARK: - Helper functions for creating encoders and decoders |
| 1240 | 1240 | |
| 1241 | +private func isValidDate(_ value: String) -> Bool { | |
| 1242 | + let formatter = DateFormatter() | |
| 1243 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 1244 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 1245 | + formatter.dateFormat = "u-MM-dd" | |
| 1246 | + formatter.isLenient = false | |
| 1247 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 1248 | +} | |
| 1249 | + | |
| 1241 | 1250 | func newJSONDecoder() -> JSONDecoder { |
| 1242 | 1251 | let decoder = JSONDecoder() |
| 1243 | 1252 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 1244 | 1253 | let container = try decoder.singleValueContainer() |
| 1245 | 1254 | let dateStr = try container.decode(String.self).uppercased() |
| 1255 | + guard isValidDate(dateStr) else { | |
| 1256 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 1257 | + } | |
| 1246 | 1258 | |
| 1247 | 1259 | let formatter = DateFormatter() |
| 1248 | 1260 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/0b91a.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/0cffa.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/0e0c2.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/0fecf.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/10be4.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/112b5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/127a1.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/13d8d.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/14d38.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/167d6.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/16bc5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -807,11 +807,23 @@ extension Wind { | ||
| 807 | 807 | |
| 808 | 808 | // MARK: - Helper functions for creating encoders and decoders |
| 809 | 809 | |
| 810 | +private func isValidDate(_ value: String) -> Bool { | |
| 811 | + let formatter = DateFormatter() | |
| 812 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 813 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 814 | + formatter.dateFormat = "u-MM-dd" | |
| 815 | + formatter.isLenient = false | |
| 816 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 817 | +} | |
| 818 | + | |
| 810 | 819 | func newJSONDecoder() -> JSONDecoder { |
| 811 | 820 | let decoder = JSONDecoder() |
| 812 | 821 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 813 | 822 | let container = try decoder.singleValueContainer() |
| 814 | 823 | let dateStr = try container.decode(String.self).uppercased() |
| 824 | + guard isValidDate(dateStr) else { | |
| 825 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 826 | + } | |
| 815 | 827 | |
| 816 | 828 | let formatter = DateFormatter() |
| 817 | 829 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/176f1.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/1a7f5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/1b28c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/1b409.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/2465e.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/24f52.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/262f0.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -813,11 +813,23 @@ extension Wind { | ||
| 813 | 813 | |
| 814 | 814 | // MARK: - Helper functions for creating encoders and decoders |
| 815 | 815 | |
| 816 | +private func isValidDate(_ value: String) -> Bool { | |
| 817 | + let formatter = DateFormatter() | |
| 818 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 819 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 820 | + formatter.dateFormat = "u-MM-dd" | |
| 821 | + formatter.isLenient = false | |
| 822 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 823 | +} | |
| 824 | + | |
| 816 | 825 | func newJSONDecoder() -> JSONDecoder { |
| 817 | 826 | let decoder = JSONDecoder() |
| 818 | 827 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 819 | 828 | let container = try decoder.singleValueContainer() |
| 820 | 829 | let dateStr = try container.decode(String.self).uppercased() |
| 830 | + guard isValidDate(dateStr) else { | |
| 831 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 832 | + } | |
| 821 | 833 | |
| 822 | 834 | let formatter = DateFormatter() |
| 823 | 835 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/26b49.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/26c9c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/27332.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/29f47.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/2d4e2.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/2df80.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/31189.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/32431.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/32d5c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -106,11 +106,23 @@ extension Array where Element == TopLevel.Element { | ||
| 106 | 106 | |
| 107 | 107 | // MARK: - Helper functions for creating encoders and decoders |
| 108 | 108 | |
| 109 | +private func isValidDate(_ value: String) -> Bool { | |
| 110 | + let formatter = DateFormatter() | |
| 111 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 112 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 113 | + formatter.dateFormat = "u-MM-dd" | |
| 114 | + formatter.isLenient = false | |
| 115 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 116 | +} | |
| 117 | + | |
| 109 | 118 | func newJSONDecoder() -> JSONDecoder { |
| 110 | 119 | let decoder = JSONDecoder() |
| 111 | 120 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 112 | 121 | let container = try decoder.singleValueContainer() |
| 113 | 122 | let dateStr = try container.decode(String.self).uppercased() |
| 123 | + guard isValidDate(dateStr) else { | |
| 124 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 125 | + } | |
| 114 | 126 | |
| 115 | 127 | let formatter = DateFormatter() |
| 116 | 128 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
3 generated files · +20 −6test/inputs/json/misc/337ed.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -374,11 +374,23 @@ enum ResultType: String, Codable { | ||
| 374 | 374 | |
| 375 | 375 | // MARK: - Helper functions for creating encoders and decoders |
| 376 | 376 | |
| 377 | +private func isValidDate(_ value: String) -> Bool { | |
| 378 | + let formatter = DateFormatter() | |
| 379 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 380 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 381 | + formatter.dateFormat = "u-MM-dd" | |
| 382 | + formatter.isLenient = false | |
| 383 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 384 | +} | |
| 385 | + | |
| 377 | 386 | func newJSONDecoder() -> JSONDecoder { |
| 378 | 387 | let decoder = JSONDecoder() |
| 379 | 388 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 380 | 389 | let container = try decoder.singleValueContainer() |
| 381 | 390 | let dateStr = try container.decode(String.self).uppercased() |
| 391 | + guard isValidDate(dateStr) else { | |
| 392 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 393 | + } | |
| 382 | 394 | |
| 383 | 395 | let formatter = DateFormatter() |
| 384 | 396 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/33d2e.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/34702.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/3536b.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/3659d.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/36d5d.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/3a6b3.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/3e9a3.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/3f1ce.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -811,11 +811,23 @@ extension Wind { | ||
| 811 | 811 | |
| 812 | 812 | // MARK: - Helper functions for creating encoders and decoders |
| 813 | 813 | |
| 814 | +private func isValidDate(_ value: String) -> Bool { | |
| 815 | + let formatter = DateFormatter() | |
| 816 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 817 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 818 | + formatter.dateFormat = "u-MM-dd" | |
| 819 | + formatter.isLenient = false | |
| 820 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 821 | +} | |
| 822 | + | |
| 814 | 823 | func newJSONDecoder() -> JSONDecoder { |
| 815 | 824 | let decoder = JSONDecoder() |
| 816 | 825 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 817 | 826 | let container = try decoder.singleValueContainer() |
| 818 | 827 | let dateStr = try container.decode(String.self).uppercased() |
| 828 | + guard isValidDate(dateStr) else { | |
| 829 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 830 | + } | |
| 819 | 831 | |
| 820 | 832 | let formatter = DateFormatter() |
| 821 | 833 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/421d4.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/437e7.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/43970.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/43eaf.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/458db.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/4961a.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/4a0d7.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/4a455.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/4c547.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -807,11 +807,23 @@ extension Wind { | ||
| 807 | 807 | |
| 808 | 808 | // MARK: - Helper functions for creating encoders and decoders |
| 809 | 809 | |
| 810 | +private func isValidDate(_ value: String) -> Bool { | |
| 811 | + let formatter = DateFormatter() | |
| 812 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 813 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 814 | + formatter.dateFormat = "u-MM-dd" | |
| 815 | + formatter.isLenient = false | |
| 816 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 817 | +} | |
| 818 | + | |
| 810 | 819 | func newJSONDecoder() -> JSONDecoder { |
| 811 | 820 | let decoder = JSONDecoder() |
| 812 | 821 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 813 | 822 | let container = try decoder.singleValueContainer() |
| 814 | 823 | let dateStr = try container.decode(String.self).uppercased() |
| 824 | + guard isValidDate(dateStr) else { | |
| 825 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 826 | + } | |
| 815 | 827 | |
| 816 | 828 | let formatter = DateFormatter() |
| 817 | 829 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/4d6fb.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/4e336.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/54147.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/54d32.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -187,11 +187,23 @@ enum Status: String, Codable { | ||
| 187 | 187 | |
| 188 | 188 | // MARK: - Helper functions for creating encoders and decoders |
| 189 | 189 | |
| 190 | +private func isValidDate(_ value: String) -> Bool { | |
| 191 | + let formatter = DateFormatter() | |
| 192 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 193 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 194 | + formatter.dateFormat = "u-MM-dd" | |
| 195 | + formatter.isLenient = false | |
| 196 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 197 | +} | |
| 198 | + | |
| 190 | 199 | func newJSONDecoder() -> JSONDecoder { |
| 191 | 200 | let decoder = JSONDecoder() |
| 192 | 201 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 193 | 202 | let container = try decoder.singleValueContainer() |
| 194 | 203 | let dateStr = try container.decode(String.self).uppercased() |
| 204 | + guard isValidDate(dateStr) else { | |
| 205 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 206 | + } | |
| 195 | 207 | |
| 196 | 208 | let formatter = DateFormatter() |
| 197 | 209 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/570ec.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/5dd0d.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/5eae5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -90,11 +90,23 @@ extension Array where Element == TopLevel.Element { | ||
| 90 | 90 | |
| 91 | 91 | // MARK: - Helper functions for creating encoders and decoders |
| 92 | 92 | |
| 93 | +private func isValidDate(_ value: String) -> Bool { | |
| 94 | + let formatter = DateFormatter() | |
| 95 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 96 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 97 | + formatter.dateFormat = "u-MM-dd" | |
| 98 | + formatter.isLenient = false | |
| 99 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 100 | +} | |
| 101 | + | |
| 93 | 102 | func newJSONDecoder() -> JSONDecoder { |
| 94 | 103 | let decoder = JSONDecoder() |
| 95 | 104 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 96 | 105 | let container = try decoder.singleValueContainer() |
| 97 | 106 | let dateStr = try container.decode(String.self).uppercased() |
| 107 | + guard isValidDate(dateStr) else { | |
| 108 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 109 | + } | |
| 98 | 110 | |
| 99 | 111 | let formatter = DateFormatter() |
| 100 | 112 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/5eb20.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/5f3a1.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/5f7fe.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/617e8.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/61b66.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/6260a.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/65dec.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/66121.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/6617c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/67c03.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/68c30.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/6c155.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/6de06.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/6dec6.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -813,11 +813,23 @@ extension Wind { | ||
| 813 | 813 | |
| 814 | 814 | // MARK: - Helper functions for creating encoders and decoders |
| 815 | 815 | |
| 816 | +private func isValidDate(_ value: String) -> Bool { | |
| 817 | + let formatter = DateFormatter() | |
| 818 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 819 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 820 | + formatter.dateFormat = "u-MM-dd" | |
| 821 | + formatter.isLenient = false | |
| 822 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 823 | +} | |
| 824 | + | |
| 816 | 825 | func newJSONDecoder() -> JSONDecoder { |
| 817 | 826 | let decoder = JSONDecoder() |
| 818 | 827 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 819 | 828 | let container = try decoder.singleValueContainer() |
| 820 | 829 | let dateStr = try container.decode(String.self).uppercased() |
| 830 | + guard isValidDate(dateStr) else { | |
| 831 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 832 | + } | |
| 821 | 833 | |
| 822 | 834 | let formatter = DateFormatter() |
| 823 | 835 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/6eb00.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/70c77.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/734ad.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -395,11 +395,23 @@ enum Status: String, Codable { | ||
| 395 | 395 | |
| 396 | 396 | // MARK: - Helper functions for creating encoders and decoders |
| 397 | 397 | |
| 398 | +private func isValidDate(_ value: String) -> Bool { | |
| 399 | + let formatter = DateFormatter() | |
| 400 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 401 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 402 | + formatter.dateFormat = "u-MM-dd" | |
| 403 | + formatter.isLenient = false | |
| 404 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 405 | +} | |
| 406 | + | |
| 398 | 407 | func newJSONDecoder() -> JSONDecoder { |
| 399 | 408 | let decoder = JSONDecoder() |
| 400 | 409 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 401 | 410 | let container = try decoder.singleValueContainer() |
| 402 | 411 | let dateStr = try container.decode(String.self).uppercased() |
| 412 | + guard isValidDate(dateStr) else { | |
| 413 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 414 | + } | |
| 403 | 415 | |
| 404 | 416 | let formatter = DateFormatter() |
| 405 | 417 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/75912.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/7681c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/76ae1.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/77392.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -132,11 +132,23 @@ extension Array where Element == TopLevel.Element { | ||
| 132 | 132 | |
| 133 | 133 | // MARK: - Helper functions for creating encoders and decoders |
| 134 | 134 | |
| 135 | +private func isValidDate(_ value: String) -> Bool { | |
| 136 | + let formatter = DateFormatter() | |
| 137 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 138 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 139 | + formatter.dateFormat = "u-MM-dd" | |
| 140 | + formatter.isLenient = false | |
| 141 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 142 | +} | |
| 143 | + | |
| 135 | 144 | func newJSONDecoder() -> JSONDecoder { |
| 136 | 145 | let decoder = JSONDecoder() |
| 137 | 146 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 138 | 147 | let container = try decoder.singleValueContainer() |
| 139 | 148 | let dateStr = try container.decode(String.self).uppercased() |
| 149 | + guard isValidDate(dateStr) else { | |
| 150 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 151 | + } | |
| 140 | 152 | |
| 141 | 153 | let formatter = DateFormatter() |
| 142 | 154 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/7d397.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/7d722.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/7df41.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/7dfa6.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/7eb30.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/7f568.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -206,11 +206,23 @@ extension Array where Element == TopLevel.Element { | ||
| 206 | 206 | |
| 207 | 207 | // MARK: - Helper functions for creating encoders and decoders |
| 208 | 208 | |
| 209 | +private func isValidDate(_ value: String) -> Bool { | |
| 210 | + let formatter = DateFormatter() | |
| 211 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 212 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 213 | + formatter.dateFormat = "u-MM-dd" | |
| 214 | + formatter.isLenient = false | |
| 215 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 216 | +} | |
| 217 | + | |
| 209 | 218 | func newJSONDecoder() -> JSONDecoder { |
| 210 | 219 | let decoder = JSONDecoder() |
| 211 | 220 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 212 | 221 | let container = try decoder.singleValueContainer() |
| 213 | 222 | let dateStr = try container.decode(String.self).uppercased() |
| 223 | + guard isValidDate(dateStr) else { | |
| 224 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 225 | + } | |
| 214 | 226 | |
| 215 | 227 | let formatter = DateFormatter() |
| 216 | 228 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/7fbfb.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/80aff.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -186,11 +186,23 @@ extension Result { | ||
| 186 | 186 | |
| 187 | 187 | // MARK: - Helper functions for creating encoders and decoders |
| 188 | 188 | |
| 189 | +private func isValidDate(_ value: String) -> Bool { | |
| 190 | + let formatter = DateFormatter() | |
| 191 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 192 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 193 | + formatter.dateFormat = "u-MM-dd" | |
| 194 | + formatter.isLenient = false | |
| 195 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 196 | +} | |
| 197 | + | |
| 189 | 198 | func newJSONDecoder() -> JSONDecoder { |
| 190 | 199 | let decoder = JSONDecoder() |
| 191 | 200 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 192 | 201 | let container = try decoder.singleValueContainer() |
| 193 | 202 | let dateStr = try container.decode(String.self).uppercased() |
| 203 | + guard isValidDate(dateStr) else { | |
| 204 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 205 | + } | |
| 194 | 206 | |
| 195 | 207 | let formatter = DateFormatter() |
| 196 | 208 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/82509.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/8592b.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/88130.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -807,11 +807,23 @@ extension Wind { | ||
| 807 | 807 | |
| 808 | 808 | // MARK: - Helper functions for creating encoders and decoders |
| 809 | 809 | |
| 810 | +private func isValidDate(_ value: String) -> Bool { | |
| 811 | + let formatter = DateFormatter() | |
| 812 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 813 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 814 | + formatter.dateFormat = "u-MM-dd" | |
| 815 | + formatter.isLenient = false | |
| 816 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 817 | +} | |
| 818 | + | |
| 810 | 819 | func newJSONDecoder() -> JSONDecoder { |
| 811 | 820 | let decoder = JSONDecoder() |
| 812 | 821 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 813 | 822 | let container = try decoder.singleValueContainer() |
| 814 | 823 | let dateStr = try container.decode(String.self).uppercased() |
| 824 | + guard isValidDate(dateStr) else { | |
| 825 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 826 | + } | |
| 815 | 827 | |
| 816 | 828 | let formatter = DateFormatter() |
| 817 | 829 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/8a62c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/908db.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/9617f.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/96f7c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/9847b.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/9929c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -807,11 +807,23 @@ extension Wind { | ||
| 807 | 807 | |
| 808 | 808 | // MARK: - Helper functions for creating encoders and decoders |
| 809 | 809 | |
| 810 | +private func isValidDate(_ value: String) -> Bool { | |
| 811 | + let formatter = DateFormatter() | |
| 812 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 813 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 814 | + formatter.dateFormat = "u-MM-dd" | |
| 815 | + formatter.isLenient = false | |
| 816 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 817 | +} | |
| 818 | + | |
| 810 | 819 | func newJSONDecoder() -> JSONDecoder { |
| 811 | 820 | let decoder = JSONDecoder() |
| 812 | 821 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 813 | 822 | let container = try decoder.singleValueContainer() |
| 814 | 823 | let dateStr = try container.decode(String.self).uppercased() |
| 824 | + guard isValidDate(dateStr) else { | |
| 825 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 826 | + } | |
| 815 | 827 | |
| 816 | 828 | let formatter = DateFormatter() |
| 817 | 829 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/996bd.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/9a503.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/9ac3b.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -212,11 +212,23 @@ enum Title: String, Codable { | ||
| 212 | 212 | |
| 213 | 213 | // MARK: - Helper functions for creating encoders and decoders |
| 214 | 214 | |
| 215 | +private func isValidDate(_ value: String) -> Bool { | |
| 216 | + let formatter = DateFormatter() | |
| 217 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 218 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 219 | + formatter.dateFormat = "u-MM-dd" | |
| 220 | + formatter.isLenient = false | |
| 221 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 222 | +} | |
| 223 | + | |
| 215 | 224 | func newJSONDecoder() -> JSONDecoder { |
| 216 | 225 | let decoder = JSONDecoder() |
| 217 | 226 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 218 | 227 | let container = try decoder.singleValueContainer() |
| 219 | 228 | let dateStr = try container.decode(String.self).uppercased() |
| 229 | + guard isValidDate(dateStr) else { | |
| 230 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 231 | + } | |
| 220 | 232 | |
| 221 | 233 | let formatter = DateFormatter() |
| 222 | 234 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/9eed5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/a0496.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -193,11 +193,23 @@ extension Errors { | ||
| 193 | 193 | |
| 194 | 194 | // MARK: - Helper functions for creating encoders and decoders |
| 195 | 195 | |
| 196 | +private func isValidDate(_ value: String) -> Bool { | |
| 197 | + let formatter = DateFormatter() | |
| 198 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 199 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 200 | + formatter.dateFormat = "u-MM-dd" | |
| 201 | + formatter.isLenient = false | |
| 202 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 203 | +} | |
| 204 | + | |
| 196 | 205 | func newJSONDecoder() -> JSONDecoder { |
| 197 | 206 | let decoder = JSONDecoder() |
| 198 | 207 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 199 | 208 | let container = try decoder.singleValueContainer() |
| 200 | 209 | let dateStr = try container.decode(String.self).uppercased() |
| 210 | + guard isValidDate(dateStr) else { | |
| 211 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 212 | + } | |
| 201 | 213 | |
| 202 | 214 | let formatter = DateFormatter() |
| 203 | 215 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
3 generated files · +20 −6test/inputs/json/misc/a1eca.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -807,11 +807,23 @@ extension Wind { | ||
| 807 | 807 | |
| 808 | 808 | // MARK: - Helper functions for creating encoders and decoders |
| 809 | 809 | |
| 810 | +private func isValidDate(_ value: String) -> Bool { | |
| 811 | + let formatter = DateFormatter() | |
| 812 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 813 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 814 | + formatter.dateFormat = "u-MM-dd" | |
| 815 | + formatter.isLenient = false | |
| 816 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 817 | +} | |
| 818 | + | |
| 810 | 819 | func newJSONDecoder() -> JSONDecoder { |
| 811 | 820 | let decoder = JSONDecoder() |
| 812 | 821 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 813 | 822 | let container = try decoder.singleValueContainer() |
| 814 | 823 | let dateStr = try container.decode(String.self).uppercased() |
| 824 | + guard isValidDate(dateStr) else { | |
| 825 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 826 | + } | |
| 815 | 827 | |
| 816 | 828 | let formatter = DateFormatter() |
| 817 | 829 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/a3d8c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/a45b0.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/a71df.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/a9691.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/ab0d1.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/abb4b.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/ac944.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/ad8be.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/ae7f0.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/ae9ca.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/af2d1.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/b4865.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -183,11 +183,23 @@ extension Array where Element == TopLevel.Element { | ||
| 183 | 183 | |
| 184 | 184 | // MARK: - Helper functions for creating encoders and decoders |
| 185 | 185 | |
| 186 | +private func isValidDate(_ value: String) -> Bool { | |
| 187 | + let formatter = DateFormatter() | |
| 188 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 189 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 190 | + formatter.dateFormat = "u-MM-dd" | |
| 191 | + formatter.isLenient = false | |
| 192 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 193 | +} | |
| 194 | + | |
| 186 | 195 | func newJSONDecoder() -> JSONDecoder { |
| 187 | 196 | let decoder = JSONDecoder() |
| 188 | 197 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 189 | 198 | let container = try decoder.singleValueContainer() |
| 190 | 199 | let dateStr = try container.decode(String.self).uppercased() |
| 200 | + guard isValidDate(dateStr) else { | |
| 201 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 202 | + } | |
| 191 | 203 | |
| 192 | 204 | let formatter = DateFormatter() |
| 193 | 205 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/b6f2c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/b6fe5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/b9f64.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/bb1ec.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/be234.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/c0356.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/c0a3a.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/c3303.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/c6cfd.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/c8c7e.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/cb0cc.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/cb81e.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/ccd18.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/cd238.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/cd463.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/cda6c.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/cf0d8.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -807,11 +807,23 @@ extension Wind { | ||
| 807 | 807 | |
| 808 | 808 | // MARK: - Helper functions for creating encoders and decoders |
| 809 | 809 | |
| 810 | +private func isValidDate(_ value: String) -> Bool { | |
| 811 | + let formatter = DateFormatter() | |
| 812 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 813 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 814 | + formatter.dateFormat = "u-MM-dd" | |
| 815 | + formatter.isLenient = false | |
| 816 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 817 | +} | |
| 818 | + | |
| 810 | 819 | func newJSONDecoder() -> JSONDecoder { |
| 811 | 820 | let decoder = JSONDecoder() |
| 812 | 821 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 813 | 822 | let container = try decoder.singleValueContainer() |
| 814 | 823 | let dateStr = try container.decode(String.self).uppercased() |
| 824 | + guard isValidDate(dateStr) else { | |
| 825 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 826 | + } | |
| 815 | 827 | |
| 816 | 828 | let formatter = DateFormatter() |
| 817 | 829 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/cfbce.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/d0908.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/d23d5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -182,11 +182,23 @@ extension Result { | ||
| 182 | 182 | |
| 183 | 183 | // MARK: - Helper functions for creating encoders and decoders |
| 184 | 184 | |
| 185 | +private func isValidDate(_ value: String) -> Bool { | |
| 186 | + let formatter = DateFormatter() | |
| 187 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 188 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 189 | + formatter.dateFormat = "u-MM-dd" | |
| 190 | + formatter.isLenient = false | |
| 191 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 192 | +} | |
| 193 | + | |
| 185 | 194 | func newJSONDecoder() -> JSONDecoder { |
| 186 | 195 | let decoder = JSONDecoder() |
| 187 | 196 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 188 | 197 | let container = try decoder.singleValueContainer() |
| 189 | 198 | let dateStr = try container.decode(String.self).uppercased() |
| 199 | + guard isValidDate(dateStr) else { | |
| 200 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 201 | + } | |
| 190 | 202 | |
| 191 | 203 | let formatter = DateFormatter() |
| 192 | 204 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
3 generated files · +20 −6test/inputs/json/misc/dbfb3.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -812,11 +812,23 @@ extension Wind { | ||
| 812 | 812 | |
| 813 | 813 | // MARK: - Helper functions for creating encoders and decoders |
| 814 | 814 | |
| 815 | +private func isValidDate(_ value: String) -> Bool { | |
| 816 | + let formatter = DateFormatter() | |
| 817 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 818 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 819 | + formatter.dateFormat = "u-MM-dd" | |
| 820 | + formatter.isLenient = false | |
| 821 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 822 | +} | |
| 823 | + | |
| 815 | 824 | func newJSONDecoder() -> JSONDecoder { |
| 816 | 825 | let decoder = JSONDecoder() |
| 817 | 826 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 818 | 827 | let container = try decoder.singleValueContainer() |
| 819 | 828 | let dateStr = try container.decode(String.self).uppercased() |
| 829 | + guard isValidDate(dateStr) else { | |
| 830 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 831 | + } | |
| 820 | 832 | |
| 821 | 833 | let formatter = DateFormatter() |
| 822 | 834 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/dc44f.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/dd1ce.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/dec3a.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/df957.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -807,11 +807,23 @@ extension Wind { | ||
| 807 | 807 | |
| 808 | 808 | // MARK: - Helper functions for creating encoders and decoders |
| 809 | 809 | |
| 810 | +private func isValidDate(_ value: String) -> Bool { | |
| 811 | + let formatter = DateFormatter() | |
| 812 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 813 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 814 | + formatter.dateFormat = "u-MM-dd" | |
| 815 | + formatter.isLenient = false | |
| 816 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 817 | +} | |
| 818 | + | |
| 810 | 819 | func newJSONDecoder() -> JSONDecoder { |
| 811 | 820 | let decoder = JSONDecoder() |
| 812 | 821 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 813 | 822 | let container = try decoder.singleValueContainer() |
| 814 | 823 | let dateStr = try container.decode(String.self).uppercased() |
| 824 | + guard isValidDate(dateStr) else { | |
| 825 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 826 | + } | |
| 815 | 827 | |
| 816 | 828 | let formatter = DateFormatter() |
| 817 | 829 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/e0ac7.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/misc/e2915.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -811,11 +811,23 @@ extension Wind { | ||
| 811 | 811 | |
| 812 | 812 | // MARK: - Helper functions for creating encoders and decoders |
| 813 | 813 | |
| 814 | +private func isValidDate(_ value: String) -> Bool { | |
| 815 | + let formatter = DateFormatter() | |
| 816 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 817 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 818 | + formatter.dateFormat = "u-MM-dd" | |
| 819 | + formatter.isLenient = false | |
| 820 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 821 | +} | |
| 822 | + | |
| 814 | 823 | func newJSONDecoder() -> JSONDecoder { |
| 815 | 824 | let decoder = JSONDecoder() |
| 816 | 825 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 817 | 826 | let container = try decoder.singleValueContainer() |
| 818 | 827 | let dateStr = try container.decode(String.self).uppercased() |
| 828 | + guard isValidDate(dateStr) else { | |
| 829 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 830 | + } | |
| 819 | 831 | |
| 820 | 832 | let formatter = DateFormatter() |
| 821 | 833 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/misc/e2a58.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/e324e.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/e53b5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/e64a0.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/e8a0b.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/e8b04.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/ed095.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/f22f5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/f3139.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/f3edf.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/f466a.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/f6a65.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/f74d5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/f82d9.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/f974d.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/faff5.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/fcca3.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/misc/fd329.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/blns-object.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/bug2037.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/bug2521.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/priority/bug2590.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -103,11 +103,23 @@ extension Invoice { | ||
| 103 | 103 | |
| 104 | 104 | // MARK: - Helper functions for creating encoders and decoders |
| 105 | 105 | |
| 106 | +private func isValidDate(_ value: String) -> Bool { | |
| 107 | + let formatter = DateFormatter() | |
| 108 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 109 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 110 | + formatter.dateFormat = "u-MM-dd" | |
| 111 | + formatter.isLenient = false | |
| 112 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 113 | +} | |
| 114 | + | |
| 106 | 115 | func newJSONDecoder() -> JSONDecoder { |
| 107 | 116 | let decoder = JSONDecoder() |
| 108 | 117 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 109 | 118 | let container = try decoder.singleValueContainer() |
| 110 | 119 | let dateStr = try container.decode(String.self).uppercased() |
| 120 | + guard isValidDate(dateStr) else { | |
| 121 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 122 | + } | |
| 111 | 123 | |
| 112 | 124 | let formatter = DateFormatter() |
| 113 | 125 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
3 generated files · +20 −6test/inputs/json/priority/bug2663.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -59,11 +59,23 @@ extension TopLevel { | ||
| 59 | 59 | |
| 60 | 60 | // MARK: - Helper functions for creating encoders and decoders |
| 61 | 61 | |
| 62 | +private func isValidDate(_ value: String) -> Bool { | |
| 63 | + let formatter = DateFormatter() | |
| 64 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 65 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 66 | + formatter.dateFormat = "u-MM-dd" | |
| 67 | + formatter.isLenient = false | |
| 68 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 69 | +} | |
| 70 | + | |
| 62 | 71 | func newJSONDecoder() -> JSONDecoder { |
| 63 | 72 | let decoder = JSONDecoder() |
| 64 | 73 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 65 | 74 | let container = try decoder.singleValueContainer() |
| 66 | 75 | let dateStr = try container.decode(String.self).uppercased() |
| 76 | + guard isValidDate(dateStr) else { | |
| 77 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 78 | + } | |
| 67 | 79 | |
| 68 | 80 | let formatter = DateFormatter() |
| 69 | 81 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/priority/bug2793.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/bug427.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/bug790.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/bug855-short.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/bug863.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/coin-pairs.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
4 generated files · +12 −12test/inputs/json/priority/combinations1.json
Mjava-lombokarray-type-array__lombok-true--0be7469ef837 / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavaarray-type-array--eed288b23e27 / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
4 generated files · +12 −12test/inputs/json/priority/combinations2.json
Mjava-lombokarray-type-array__lombok-true--0be7469ef837 / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavaarray-type-array--eed288b23e27 / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
4 generated files · +12 −12test/inputs/json/priority/combinations3.json
Mjava-lombokarray-type-array__lombok-true--0be7469ef837 / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavaarray-type-array--eed288b23e27 / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
4 generated files · +12 −12test/inputs/json/priority/combinations4.json
Mjava-lombokarray-type-array__lombok-true--0be7469ef837 / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavaarray-type-array--eed288b23e27 / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/combined-enum.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/direct-recursive.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/empty-enum.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/identifiers.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/issue2680-object-array.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/issue2680-scalar-array.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
6 generated files · +56 −6test/inputs/json/priority/keywords.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -17480,11 +17480,23 @@ extension Yield { | ||
| 17480 | 17480 | |
| 17481 | 17481 | // MARK: - Helper functions for creating encoders and decoders |
| 17482 | 17482 | |
| 17483 | +private func isValidDate(_ value: String) -> Bool { | |
| 17484 | + let formatter = DateFormatter() | |
| 17485 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 17486 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 17487 | + formatter.dateFormat = "u-MM-dd" | |
| 17488 | + formatter.isLenient = false | |
| 17489 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 17490 | +} | |
| 17491 | + | |
| 17483 | 17492 | func newJSONDecoder() -> JSONDecoder { |
| 17484 | 17493 | let decoder = JSONDecoder() |
| 17485 | 17494 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 17486 | 17495 | let container = try decoder.singleValueContainer() |
| 17487 | 17496 | let dateStr = try container.decode(String.self).uppercased() |
| 17497 | + guard isValidDate(dateStr) else { | |
| 17498 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 17499 | + } | |
| 17488 | 17500 | |
| 17489 | 17501 | let formatter = DateFormatter() |
| 17490 | 17502 | formatter.calendar = Calendar(identifier: .iso8601) |
Mswiftobjective-c-support-true__struct-or-class-class--f14372afa3e4 / quicktype.swift+12 −0
| @@ -19663,11 +19663,23 @@ extension Yield { | ||
| 19663 | 19663 | |
| 19664 | 19664 | // MARK: - Helper functions for creating encoders and decoders |
| 19665 | 19665 | |
| 19666 | +private func isValidDate(_ value: String) -> Bool { | |
| 19667 | + let formatter = DateFormatter() | |
| 19668 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 19669 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 19670 | + formatter.dateFormat = "u-MM-dd" | |
| 19671 | + formatter.isLenient = false | |
| 19672 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 19673 | +} | |
| 19674 | + | |
| 19666 | 19675 | func newJSONDecoder() -> JSONDecoder { |
| 19667 | 19676 | let decoder = JSONDecoder() |
| 19668 | 19677 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 19669 | 19678 | let container = try decoder.singleValueContainer() |
| 19670 | 19679 | let dateStr = try container.decode(String.self).uppercased() |
| 19680 | + guard isValidDate(dateStr) else { | |
| 19681 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 19682 | + } | |
| 19671 | 19683 | |
| 19672 | 19684 | let formatter = DateFormatter() |
| 19673 | 19685 | formatter.calendar = Calendar(identifier: .iso8601) |
Mswiftprotocol-equatable--bd9068f466c1 / quicktype.swift+12 −0
| @@ -19664,11 +19664,23 @@ extension Yield { | ||
| 19664 | 19664 | |
| 19665 | 19665 | // MARK: - Helper functions for creating encoders and decoders |
| 19666 | 19666 | |
| 19667 | +private func isValidDate(_ value: String) -> Bool { | |
| 19668 | + let formatter = DateFormatter() | |
| 19669 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 19670 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 19671 | + formatter.dateFormat = "u-MM-dd" | |
| 19672 | + formatter.isLenient = false | |
| 19673 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 19674 | +} | |
| 19675 | + | |
| 19667 | 19676 | func newJSONDecoder() -> JSONDecoder { |
| 19668 | 19677 | let decoder = JSONDecoder() |
| 19669 | 19678 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 19670 | 19679 | let container = try decoder.singleValueContainer() |
| 19671 | 19680 | let dateStr = try container.decode(String.self).uppercased() |
| 19681 | + guard isValidDate(dateStr) else { | |
| 19682 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 19683 | + } | |
| 19672 | 19684 | |
| 19673 | 19685 | let formatter = DateFormatter() |
| 19674 | 19686 | formatter.calendar = Calendar(identifier: .iso8601) |
Mswiftsendable-true--1c3982c78639 / quicktype.swift+12 −0
| @@ -17480,11 +17480,23 @@ extension Yield { | ||
| 17480 | 17480 | |
| 17481 | 17481 | // MARK: - Helper functions for creating encoders and decoders |
| 17482 | 17482 | |
| 17483 | +private func isValidDate(_ value: String) -> Bool { | |
| 17484 | + let formatter = DateFormatter() | |
| 17485 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 17486 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 17487 | + formatter.dateFormat = "u-MM-dd" | |
| 17488 | + formatter.isLenient = false | |
| 17489 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 17490 | +} | |
| 17491 | + | |
| 17483 | 17492 | func newJSONDecoder() -> JSONDecoder { |
| 17484 | 17493 | let decoder = JSONDecoder() |
| 17485 | 17494 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 17486 | 17495 | let container = try decoder.singleValueContainer() |
| 17487 | 17496 | let dateStr = try container.decode(String.self).uppercased() |
| 17497 | + guard isValidDate(dateStr) else { | |
| 17498 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 17499 | + } | |
| 17488 | 17500 | |
| 17489 | 17501 | let formatter = DateFormatter() |
| 17490 | 17502 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/priority/kotlin-enum-class-case-collision.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/list.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/name-style.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/nbl-stats.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/nested-objects.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/no-classes.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/nst-test-suite.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/number-map.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/omit-empty.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/optional-union.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/php-mixed-union.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/php-validation.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/recursive.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/simple-identifiers.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/union-constructor-clash.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/unions.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/url.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/priority/uuids.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/samples/bitcoin-block.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/samples/copy-with-property.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/samples/getting-started.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/samples/github-events.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -1659,11 +1659,23 @@ extension Array where Element == TopLevel.Element { | ||
| 1659 | 1659 | |
| 1660 | 1660 | // MARK: - Helper functions for creating encoders and decoders |
| 1661 | 1661 | |
| 1662 | +private func isValidDate(_ value: String) -> Bool { | |
| 1663 | + let formatter = DateFormatter() | |
| 1664 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 1665 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 1666 | + formatter.dateFormat = "u-MM-dd" | |
| 1667 | + formatter.isLenient = false | |
| 1668 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 1669 | +} | |
| 1670 | + | |
| 1662 | 1671 | func newJSONDecoder() -> JSONDecoder { |
| 1663 | 1672 | let decoder = JSONDecoder() |
| 1664 | 1673 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 1665 | 1674 | let container = try decoder.singleValueContainer() |
| 1666 | 1675 | let dateStr = try container.decode(String.self).uppercased() |
| 1676 | + guard isValidDate(dateStr) else { | |
| 1677 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 1678 | + } | |
| 1667 | 1679 | |
| 1668 | 1680 | let formatter = DateFormatter() |
| 1669 | 1681 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/samples/kitchen-sink.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/json/samples/null-safe.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mjavadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mswiftdefault / quicktype.swift+12 −0
| @@ -159,11 +159,23 @@ extension Address { | ||
| 159 | 159 | |
| 160 | 160 | // MARK: - Helper functions for creating encoders and decoders |
| 161 | 161 | |
| 162 | +private func isValidDate(_ value: String) -> Bool { | |
| 163 | + let formatter = DateFormatter() | |
| 164 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 165 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 166 | + formatter.dateFormat = "u-MM-dd" | |
| 167 | + formatter.isLenient = false | |
| 168 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 169 | +} | |
| 170 | + | |
| 162 | 171 | func newJSONDecoder() -> JSONDecoder { |
| 163 | 172 | let decoder = JSONDecoder() |
| 164 | 173 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 165 | 174 | let container = try decoder.singleValueContainer() |
| 166 | 175 | let dateStr = try container.decode(String.self).uppercased() |
| 176 | + guard isValidDate(dateStr) else { | |
| 177 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 178 | + } | |
| 167 | 179 | |
| 168 | 180 | let formatter = DateFormatter() |
| 169 | 181 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/json/samples/objc-control-characters.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/samples/pokedex.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/samples/reddit.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/samples/simple-object.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/samples/spotify-album.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/samples/us-avg-temperatures.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/json/samples/us-senators.json
Mjava-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mjavadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/accessors.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/all-of-additional-properties-false.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/any.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/bool-string.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/boolean-subschema.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/camelCase.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/class-map-union.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/class-with-additional.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/comment-injection-enum-nested-comment.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/comment-injection-enum.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/comment-injection-nested-comment.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/comment-injection.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/const-non-string.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/constructor.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/cut-enum.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/schema/date-time-or-string.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mschema-swiftdefault / quicktype.swift+12 −0
| @@ -87,11 +87,23 @@ enum BarEnum: String, Codable { | ||
| 87 | 87 | |
| 88 | 88 | // MARK: - Helper functions for creating encoders and decoders |
| 89 | 89 | |
| 90 | +private func isValidDate(_ value: String) -> Bool { | |
| 91 | + let formatter = DateFormatter() | |
| 92 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 93 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 94 | + formatter.dateFormat = "u-MM-dd" | |
| 95 | + formatter.isLenient = false | |
| 96 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 97 | +} | |
| 98 | + | |
| 90 | 99 | func newJSONDecoder() -> JSONDecoder { |
| 91 | 100 | let decoder = JSONDecoder() |
| 92 | 101 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 93 | 102 | let container = try decoder.singleValueContainer() |
| 94 | 103 | let dateStr = try container.decode(String.self).uppercased() |
| 104 | + guard isValidDate(dateStr) else { | |
| 105 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 106 | + } | |
| 95 | 107 | |
| 96 | 108 | let formatter = DateFormatter() |
| 97 | 109 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
3 generated files · +20 −6test/inputs/schema/date-time.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mschema-swiftdefault / quicktype.swift+12 −0
| @@ -248,11 +248,23 @@ extension OffsetTime { | ||
| 248 | 248 | |
| 249 | 249 | // MARK: - Helper functions for creating encoders and decoders |
| 250 | 250 | |
| 251 | +private func isValidDate(_ value: String) -> Bool { | |
| 252 | + let formatter = DateFormatter() | |
| 253 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 254 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 255 | + formatter.dateFormat = "u-MM-dd" | |
| 256 | + formatter.isLenient = false | |
| 257 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 258 | +} | |
| 259 | + | |
| 251 | 260 | func newJSONDecoder() -> JSONDecoder { |
| 252 | 261 | let decoder = JSONDecoder() |
| 253 | 262 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 254 | 263 | let container = try decoder.singleValueContainer() |
| 255 | 264 | let dateStr = try container.decode(String.self).uppercased() |
| 265 | + guard isValidDate(dateStr) else { | |
| 266 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 267 | + } | |
| 256 | 268 | |
| 257 | 269 | let formatter = DateFormatter() |
| 258 | 270 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/schema/default-value.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/description-with-double-quotes.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/description.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/direct-union.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/empty-object.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/enum-large.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/enum-with-null.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/enum-with-values.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/enum.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/fractional-bounds.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/go-schema-pattern-properties.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/haskell-enum-forbidden.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/id-no-address.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/id-root.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/ie-suffix-singularization.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/implicit-all-of.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/implicit-class-array-union.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/implicit-one-of.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/integer-before-number.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/integer-float-union.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/integer-string.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/integer-type.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/intersection-nested.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/intersection.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/issue2680-top-level-array.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/keyword-enum.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/keyword-unions.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/light.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/list.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/min-max-items.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/minmax-integer.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/minmax.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/minmaxlength.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/multi-type-enum.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/mutually-recursive.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/nested-intersection-union.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/non-standard-ref.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/nullable-optional-one-of.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/object-type-required.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/optional-any.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/optional-const-ref.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/optional-constraints.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
3 generated files · +20 −6test/inputs/schema/optional-date-time.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+4 −3
| @@ -37,10 +37,11 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | + .withResolverStyle(java.time.format.ResolverStyle.STRICT) | |
| 44 | 45 | .withZone(ZoneOffset.UTC); |
| 45 | 46 | |
| 46 | 47 | public static OffsetDateTime parseDateTimeString(String str) { |
Mschema-swiftdefault / quicktype.swift+12 −0
| @@ -71,11 +71,23 @@ extension TopLevel { | ||
| 71 | 71 | |
| 72 | 72 | // MARK: - Helper functions for creating encoders and decoders |
| 73 | 73 | |
| 74 | +private func isValidDate(_ value: String) -> Bool { | |
| 75 | + let formatter = DateFormatter() | |
| 76 | + formatter.locale = Locale(identifier: "en_US_POSIX") | |
| 77 | + formatter.timeZone = TimeZone(secondsFromGMT: 0) | |
| 78 | + formatter.dateFormat = "u-MM-dd" | |
| 79 | + formatter.isLenient = false | |
| 80 | + return formatter.date(from: String(value.prefix(10))) != nil | |
| 81 | +} | |
| 82 | + | |
| 74 | 83 | func newJSONDecoder() -> JSONDecoder { |
| 75 | 84 | let decoder = JSONDecoder() |
| 76 | 85 | decoder.dateDecodingStrategy = .custom({ (decoder) -> Date in |
| 77 | 86 | let container = try decoder.singleValueContainer() |
| 78 | 87 | let dateStr = try container.decode(String.self).uppercased() |
| 88 | + guard isValidDate(dateStr) else { | |
| 89 | + throw DecodingError.dataCorrupted(.init(codingPath: decoder.codingPath, debugDescription: "Invalid date")) | |
| 90 | + } | |
| 79 | 91 | |
| 80 | 92 | let formatter = DateFormatter() |
| 81 | 93 | formatter.calendar = Calendar(identifier: .iso8601) |
Test case
2 generated files · +6 −6test/inputs/schema/optional-enum.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/pattern.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/postman-collection.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/prefix-items.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/recursive-union-flattening.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/ref-id-files.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/ref-remote.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/renaming-bug.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/required-draft3.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/required-non-properties.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/required.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/rust-cycle-breaker-union.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/schema-constraints.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/simple-ref.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/strict-optional.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/top-level-array.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/top-level-enum.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/top-level-primitive-array.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/top-level-primitive.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/tuple.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/unevaluated-properties.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/unicode-codepoint-length.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/union-int-double.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/union-list.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/union.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/uuid.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Test case
2 generated files · +6 −6test/inputs/schema/vega-lite.schema
Mschema-java-lombokdefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
Mschema-javadefault / src / main / java / io / quicktype / Converter.java+3 −3
| @@ -37,9 +37,9 @@ public class Converter { | ||
| 37 | 37 | .appendOptional(DateTimeFormatter.ISO_DATE_TIME) |
| 38 | 38 | .appendOptional(DateTimeFormatter.ISO_OFFSET_DATE_TIME) |
| 39 | 39 | .appendOptional(DateTimeFormatter.ISO_INSTANT) |
| 40 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SX")) | |
| 41 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ssX")) | |
| 42 | - .appendOptional(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")) | |
| 40 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss.SX")) | |
| 41 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ssX")) | |
| 42 | + .appendOptional(DateTimeFormatter.ofPattern("uuuu-MM-dd HH:mm:ss")) | |
| 43 | 43 | .toFormatter() |
| 44 | 44 | .withZone(ZoneOffset.UTC); |
No generated files match these filters.