root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Use ResolverStyle.SMART when a custom format is specified 

Fixes gh-13970
This commit is contained in:
Madhura Bhave 2018-08-17 16:01:10 -07:00
parent 51fd27fad4
commit f7135ff18f
2 changed files with 10 additions and 1 deletions
Show Stats 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/WebConversionService.java
View File

@ -89,7 +89,7 @@ public class WebConversionService extends DefaultFormattingConversionService {
DateTimeFormatterRegistrar dateTime = new DateTimeFormatterRegistrar(); DateTimeFormatterRegistrar dateTime = new DateTimeFormatterRegistrar();
if (this.dateFormat != null) { if (this.dateFormat != null) {
dateTime.setDateFormatter(DateTimeFormatter.ofPattern(this.dateFormat) dateTime.setDateFormatter(DateTimeFormatter.ofPattern(this.dateFormat)
.withResolverStyle(ResolverStyle.STRICT)); .withResolverStyle(ResolverStyle.SMART));
} }
dateTime.registerFormatters(this); dateTime.registerFormatters(this);
} }

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

@ -28,6 +28,7 @@ import static org.assertj.core.api.Assertions.assertThat;
* Tests for {@link WebConversionService}. * Tests for {@link WebConversionService}.
* *
* @author Brian Clozel * @author Brian Clozel
* @author Madhura Bhave
*/ */
public class WebConversionServiceTests { public class WebConversionServiceTests {
@ -44,4 +45,12 @@ public class WebConversionServiceTests {
.isEqualTo("01*01*2018"); .isEqualTo("01*01*2018");
} }
@Test
public void convertFromStringToDate() {
WebConversionService conversionService = new WebConversionService("yyyy-MM-dd");
java.time.LocalDate date = conversionService.convert("2018-01-01",
java.time.LocalDate.class);
assertThat(date).isEqualTo(java.time.LocalDate.of(2018, 1, 1));
}
} }