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

Merge branch '3.2.x' into 3.3.x 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/reactive/WebFluxProperties.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -99,17 +99,20 @@ public class WebFluxProperties {
public static class Format {
/**
* Date format to use, for example 'dd/MM/yyyy'.
* Date format to use, for example 'dd/MM/yyyy'. Used for formatting of
* java.util.Date and java.time.LocalDate.
*/
private String date;
/**
* Time format to use, for example 'HH:mm:ss'.
* Time format to use, for example 'HH:mm:ss'. Used for formatting of java.time's
* LocalTime and OffsetTime.
*/
private String time;
/**
* Date-time format to use, for example 'yyyy-MM-dd HH:mm:ss'.
* Date-time format to use, for example 'yyyy-MM-dd HH:mm:ss'. Used for formatting
* of java.time's LocalDateTime, OffsetDateTime, and ZonedDateTime.
*/
private String dateTime;

11
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/WebMvcProperties.java
View File

@ -1,5 +1,5 @@
/*
* Copyright 2012-2023 the original author or authors.
* Copyright 2012-2024 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -385,17 +385,20 @@ public class WebMvcProperties {
public static class Format {
/**
* Date format to use, for example 'dd/MM/yyyy'.
* Date format to use, for example 'dd/MM/yyyy'. Used for formatting of
* java.util.Date and java.time.LocalDate.
*/
private String date;
/**
* Time format to use, for example 'HH:mm:ss'.
* Time format to use, for example 'HH:mm:ss'. Used for formatting of java.time's
* LocalTime and OffsetTime.
*/
private String time;
/**
* Date-time format to use, for example 'yyyy-MM-dd HH:mm:ss'.
* Date-time format to use, for example 'yyyy-MM-dd HH:mm:ss'. Used for formatting
* of java.time's LocalDateTime, OffsetDateTime, and ZonedDateTime.
*/
private String dateTime;

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`
|===