From 3d8f1fb00fe3e5af75f3fbd79b77ed0a35db827d Mon Sep 17 00:00:00 2001 From: Hunhee Lee Date: Mon, 8 Jul 2024 23:25:32 +0900 Subject: [PATCH 1/2] Harmonize phrasing in URI Encoding section See gh-33166 --- framework-docs/modules/ROOT/partials/web/web-uris.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/framework-docs/modules/ROOT/partials/web/web-uris.adoc b/framework-docs/modules/ROOT/partials/web/web-uris.adoc index a8bde952e68..9b7df3674d8 100644 --- a/framework-docs/modules/ROOT/partials/web/web-uris.adoc +++ b/framework-docs/modules/ROOT/partials/web/web-uris.adoc @@ -389,7 +389,7 @@ template. encode URI component value _after_ URI variables are expanded. * `NONE`: No encoding is applied. -The `RestTemplate` is set to `EncodingMode.URI_COMPONENT` for historic +The `RestTemplate` is set to `EncodingMode.URI_COMPONENT` for historical reasons and for backwards compatibility. The `WebClient` relies on the default value in `DefaultUriBuilderFactory`, which was changed from `EncodingMode.URI_COMPONENT` in 5.0.x to `EncodingMode.TEMPLATE_AND_VALUES` in 5.1. From 84f20cd0a7a501f700e7441aec40485ff2034d35 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Mon, 8 Jul 2024 16:51:23 +0200 Subject: [PATCH 2/2] Polish contribution See gh-33166 --- .../support/AbstractNamedValueMethodArgumentResolver.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java index ca6cbd427b1..5bcb33761dc 100644 --- a/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java +++ b/spring-messaging/src/main/java/org/springframework/messaging/handler/annotation/support/AbstractNamedValueMethodArgumentResolver.java @@ -76,7 +76,7 @@ public abstract class AbstractNamedValueMethodArgumentResolver implements Handle protected AbstractNamedValueMethodArgumentResolver(ConversionService conversionService, @Nullable ConfigurableBeanFactory beanFactory) { - // Fallback on shared ConversionService for now for historic reasons. + // Fallback on shared ConversionService for now for historical reasons. // Possibly remove after discussion in gh-23882. //noinspection ConstantConditions