From 1ec9a115a8747cbccfdf176cad563dc592fd720d Mon Sep 17 00:00:00 2001 From: Johnny Lim Date: Wed, 25 Sep 2024 23:18:08 +0900 Subject: [PATCH] Replace RFC 7807 with RFC 9457 in documentation See gh-33594 --- .../modules/ROOT/pages/web/webflux/ann-rest-exceptions.adoc | 2 +- .../modules/ROOT/pages/web/webmvc/mvc-ann-rest-exceptions.adoc | 2 +- .../http/converter/json/ProblemDetailJacksonXmlMixin.java | 2 +- .../springframework/web/reactive/config/WebFluxConfigurer.java | 2 +- .../web/servlet/config/annotation/WebMvcConfigurer.java | 2 +- .../method/annotation/ExceptionHandlerExceptionResolver.java | 2 +- .../mvc/method/annotation/RequestMappingHandlerAdapter.java | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/framework-docs/modules/ROOT/pages/web/webflux/ann-rest-exceptions.adoc b/framework-docs/modules/ROOT/pages/web/webflux/ann-rest-exceptions.adoc index d1c10148fdb1..c3481a3e5d11 100644 --- a/framework-docs/modules/ROOT/pages/web/webflux/ann-rest-exceptions.adoc +++ b/framework-docs/modules/ROOT/pages/web/webflux/ann-rest-exceptions.adoc @@ -46,7 +46,7 @@ use a protected method to map any exception to a `ProblemDetail`. You can register `ErrorResponse` interceptors through the xref:web/webflux/config.adoc[WebFlux Config] with a `WebFluxConfigurer`. Use that to intercept -any RFC 7807 response and take some action. +any RFC 9457 response and take some action. diff --git a/framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-rest-exceptions.adoc b/framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-rest-exceptions.adoc index 7ba90e555ef9..03c2b0b5f681 100644 --- a/framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-rest-exceptions.adoc +++ b/framework-docs/modules/ROOT/pages/web/webmvc/mvc-ann-rest-exceptions.adoc @@ -46,7 +46,7 @@ use a protected method to map any exception to a `ProblemDetail`. You can register `ErrorResponse` interceptors through the xref:web/webmvc/mvc-config.adoc[MVC Config] with a `WebMvcConfigurer`. Use that to intercept -any RFC 7807 response and take some action. +any RFC 9457 response and take some action. diff --git a/spring-web/src/main/java/org/springframework/http/converter/json/ProblemDetailJacksonXmlMixin.java b/spring-web/src/main/java/org/springframework/http/converter/json/ProblemDetailJacksonXmlMixin.java index ccaccc4ebf15..11fcce7c803a 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/json/ProblemDetailJacksonXmlMixin.java +++ b/spring-web/src/main/java/org/springframework/http/converter/json/ProblemDetailJacksonXmlMixin.java @@ -47,7 +47,7 @@ @JacksonXmlRootElement(localName = "problem", namespace = ProblemDetailJacksonXmlMixin.RFC_7807_NAMESPACE) public interface ProblemDetailJacksonXmlMixin { - /** RFC 7807 namespace. */ + /** RFC 7807 (obsoleted by RFC 9457) namespace. */ String RFC_7807_NAMESPACE = "urn:ietf:rfc:7807"; diff --git a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurer.java b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurer.java index 2c6565734eda..01f244cfffa1 100644 --- a/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurer.java +++ b/spring-webflux/src/main/java/org/springframework/web/reactive/config/WebFluxConfigurer.java @@ -138,7 +138,7 @@ default void configureArgumentResolvers(ArgumentResolverConfigurer configurer) { /** * Add to the list of {@link ErrorResponse.Interceptor}'s to invoke when - * rendering an RFC 7807 {@link org.springframework.http.ProblemDetail} + * rendering an RFC 9457 {@link org.springframework.http.ProblemDetail} * error response. * @param interceptors the handlers to use * @since 6.2 diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java index 292ad38ba613..d55fcba9e0d5 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/config/annotation/WebMvcConfigurer.java @@ -224,7 +224,7 @@ default void extendHandlerExceptionResolvers(List reso /** * Add to the list of {@link ErrorResponse.Interceptor}'s to apply when - * rendering an RFC 7807 {@link org.springframework.http.ProblemDetail} + * rendering an RFC 9457 {@link org.springframework.http.ProblemDetail} * error response. * @param interceptors the interceptors to use * @since 6.2 diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java index 73b8befaba0e..64d79f70094b 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ExceptionHandlerExceptionResolver.java @@ -251,7 +251,7 @@ public void setResponseBodyAdvice(@Nullable List> response /** * Configure a list of {@link ErrorResponse.Interceptor}'s to apply when - * rendering an RFC 7807 {@link org.springframework.http.ProblemDetail} + * rendering an RFC 9457 {@link org.springframework.http.ProblemDetail} * error response. * @param interceptors the handlers to use * @since 6.2 diff --git a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java index 1d535f9a190d..34b38dc2f0a4 100644 --- a/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java +++ b/spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/RequestMappingHandlerAdapter.java @@ -408,7 +408,7 @@ public WebBindingInitializer getWebBindingInitializer() { /** * Configure a list of {@link ErrorResponse.Interceptor}'s to apply when - * rendering an RFC 7807 {@link org.springframework.http.ProblemDetail} + * rendering an RFC 9457 {@link org.springframework.http.ProblemDetail} * error response. * @param interceptors the interceptors to use * @since 6.2