Skip to content

Commit 7b6997a

Browse files
committed
Merge branch '3.2.x' into 3.3.x
Closes gh-42190
2 parents 2c9f693 + aef56bc commit 7b6997a

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ public void setDateTime(String dateTime) {
145145
public static class Problemdetails {
146146

147147
/**
148-
* Whether RFC 7807 Problem Details support should be enabled.
148+
* Whether RFC 9457 Problem Details support should be enabled.
149149
*/
150150
private boolean enabled = false;
151151

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ public enum MatchingStrategy {
450450
public static class Problemdetails {
451451

452452
/**
453-
* Whether RFC 7807 Problem Details support should be enabled.
453+
* Whether RFC 9457 Problem Details support should be enabled.
454454
*/
455455
private boolean enabled = false;
456456

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ For machine clients, it produces a JSON response with details of the error, the
178178
For browser clients, there is a "`whitelabel`" error handler that renders the same data in HTML format.
179179
You can also provide your own HTML templates to display errors (see the xref:web/reactive.adoc#web.reactive.webflux.error-handling.error-pages[next section]).
180180

181-
Before customizing error handling in Spring Boot directly, you can leverage the {url-spring-framework-docs}/web/webflux/ann-rest-exceptions.html[RFC 7807 Problem Details] support in Spring WebFlux.
181+
Before customizing error handling in Spring Boot directly, you can leverage the {url-spring-framework-docs}/web/webflux/ann-rest-exceptions.html[RFC 9457 Problem Details] support in Spring WebFlux.
182182
Spring WebFlux can produce custom error messages with the `application/problem+json` media type, like:
183183

184184
[source,json]

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,7 @@ TIP: The `BasicErrorController` can be used as a base class for a custom `ErrorC
353353
This is particularly useful if you want to add a handler for a new content type (the default is to handle `text/html` specifically and provide a fallback for everything else).
354354
To do so, extend `BasicErrorController`, add a public method with a `@RequestMapping` that has a `produces` attribute, and create a bean of your new type.
355355

356-
As of Spring Framework 6.0, {url-spring-framework-docs}/web/webmvc/mvc-ann-rest-exceptions.html[RFC 7807 Problem Details] is supported.
356+
As of Spring Framework 6.0, {url-spring-framework-docs}/web/webmvc/mvc-ann-rest-exceptions.html[RFC 9457 Problem Details] is supported.
357357
Spring MVC can produce custom error messages with the `application/problem+json` media type, like:
358358

359359
[source,json]

0 commit comments

Comments
 (0)