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

Merge branch '3.2.x' into 3.3.x

Browse Source 
Closes gh-41518
This commit is contained in:
Andy Wilkinson
2024-07-16 08:47:49 +01:00
parent 30d34c0c34 17d6f90468
commit 754e71d265
4 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/web/reactive.adoc
View File

@@ -64,16 +64,19 @@ Conversion can also be customized using the `spring.webflux.format.*` configurat
When not configured, the following defaults are used:
|===
|Property |`DateTimeFormatter`
|Property |`DateTimeFormatter` |Formats
|configprop:spring.webflux.format.date[]
|`ofLocalizedDate(FormatStyle.SHORT)`
|`java.util.Date` and `java.time.LocalDate`
|configprop:spring.webflux.format.time[]
|`ofLocalizedTime(FormatStyle.SHORT)`
|java.time's `LocalTime` and `OffsetTime`
|configprop:spring.webflux.format.date-time[]
|`ofLocalizedDateTime(FormatStyle.SHORT)`
|java.time's `LocalDateTime`, `OffsetDateTime`, and `ZonedDateTime`
|===

5
spring-boot-project/spring-boot-docs/src/docs/antora/modules/reference/pages/web/servlet.adoc
View File

@@ -69,16 +69,19 @@ Conversion can also be customized using the `spring.mvc.format.*` configuration
When not configured, the following defaults are used:
|===
|Property |`DateTimeFormatter`
|Property |`DateTimeFormatter` |Formats
|configprop:spring.mvc.format.date[]
|`ofLocalizedDate(FormatStyle.SHORT)`
|`java.util.Date` and `java.time.LocalDate`
|configprop:spring.mvc.format.time[]
|`ofLocalizedTime(FormatStyle.SHORT)`
|java.time's `LocalTime` and `OffsetTime`
|configprop:spring.mvc.format.date-time[]
|`ofLocalizedDateTime(FormatStyle.SHORT)`
|java.time's `LocalDateTime`, `OffsetDateTime`, and `ZonedDateTime`
|===