Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polish "Support iso-offset for date-time and time formatting with MVC"

Browse Source 
See gh-21630
This commit is contained in:
Andy Wilkinson
2020-06-30 17:25:16 +01:00
parent c3b1172aea
commit 9230ea4ab7
3 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/format/DateTimeFormatters.java
View File

@@ -107,7 +107,7 @@ public class DateTimeFormatters {
}
private static boolean isIsoOffset(String pattern) {
return "isooffset".equalsIgnoreCase(pattern);
return "isooffset".equalsIgnoreCase(pattern) || "iso-offset".equalsIgnoreCase(pattern);
}
}

8
spring-boot-project/spring-boot-autoconfigure/src/main/resources/META-INF/additional-spring-configuration-metadata.json
View File

@@ -1966,8 +1966,8 @@
"description": "ISO-8601 extended local date-time format."
},
{
"value": "isooffset",
"description": "ISO Offset local date-time format."
"value": "iso-offset",
"description": "ISO offset date-time format."
}
],
"providers": [
@@ -1988,8 +1988,8 @@
"description": "ISO-8601 extended local time format"
},
{
"value": "isooffset",
"description": "ISO Offset local time format."
"value": "iso-offset",
"description": "ISO offset time format."
}
],
"providers": [

33
spring-boot-project/spring-boot-autoconfigure/src/test/java/org/springframework/boot/autoconfigure/web/format/WebConversionServiceTests.java
View File

@@ -80,15 +80,23 @@ class WebConversionServiceTests {
void isoTimeFormat() {
WebConversionService conversionService = new WebConversionService(new DateTimeFormatters().timeFormat("iso"));
LocalTime time = LocalTime.of(12, 45, 23);
System.out.println(conversionService.convert(time, String.class));
assertThat(conversionService.convert(time, String.class))
.isEqualTo(DateTimeFormatter.ISO_LOCAL_TIME.format(time));
}
@Test
void isoOffsetTimeFormat() {
WebConversionService conversionService = new WebConversionService(new DateTimeFormatters().timeFormat("isooffset"));
OffsetTime offsetTime =OffsetTime.of(LocalTime.of(12, 45, 23), ZoneOffset.ofHoursMinutes(1, 30));
isoOffsetTimeFormat(new DateTimeFormatters().timeFormat("isooffset"));
}
@Test
void hyphenatedIsoOffsetTimeFormat() {
isoOffsetTimeFormat(new DateTimeFormatters().timeFormat("iso-offset"));
}
private void isoOffsetTimeFormat(DateTimeFormatters formatters) {
WebConversionService conversionService = new WebConversionService(formatters);
OffsetTime offsetTime = OffsetTime.of(LocalTime.of(12, 45, 23), ZoneOffset.ofHoursMinutes(1, 30));
assertThat(conversionService.convert(offsetTime, String.class))
.isEqualTo(DateTimeFormatter.ISO_OFFSET_TIME.format(offsetTime));
}
@@ -120,13 +128,22 @@ class WebConversionServiceTests {
@Test
void isoOffsetDateTimeFormat() {
WebConversionService conversionService = new WebConversionService(
new DateTimeFormatters().dateTimeFormat("isooffset"));
OffsetDateTime offsetdate =OffsetDateTime.of(LocalDate.of(2020, 4, 26), LocalTime.of(12, 45, 23), ZoneOffset.ofHoursMinutes(1, 30));
isoOffsetDateTimeFormat(new DateTimeFormatters().dateTimeFormat("isooffset"));
}
@Test
void hyphenatedIsoOffsetDateTimeFormat() {
isoOffsetDateTimeFormat(new DateTimeFormatters().dateTimeFormat("iso-offset"));
}
private void isoOffsetDateTimeFormat(DateTimeFormatters formatters) {
WebConversionService conversionService = new WebConversionService(formatters);
OffsetDateTime offsetdate = OffsetDateTime.of(LocalDate.of(2020, 4, 26), LocalTime.of(12, 45, 23),
ZoneOffset.ofHoursMinutes(1, 30));
assertThat(conversionService.convert(offsetdate, String.class))
.isEqualTo(DateTimeFormatter.ISO_OFFSET_DATE_TIME.format(offsetdate));
}
@Test
void customDateTimeFormat() {
WebConversionService conversionService = new WebConversionService(