GH-3954: Fix WebFlux XML config for ambiguity #3973
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Fixes spring-projects#3954 When `web-client` attribute is provided for the WebFlux outbound components configuration via XML, the `encoding-mode` is silently ignored * Check for `encoding-mode` attribute presence in the `WebFluxOutboundChannelAdapterParser` when `web-client` is provided and throw respective exception to reject such a config **Cherry-pick to `5.5.x`**
garyrussell
suggested changes
Dec 15, 2022
| @@ -51,6 +51,11 @@ static BeanDefinitionBuilder buildWebFluxRequestExecutingMessageHandler(Element | |||
|
|
|||
| String webClientRef = element.getAttribute("web-client"); | |||
| if (StringUtils.hasText(webClientRef)) { | |||
| if (element.hasAttribute("encoding-mode")) { | |||
| parserContext.getReaderContext() | |||
| .error("The 'web-client' and 'encoding-mode' are mutually exclusive.", element); | |||
There was a problem hiding this comment.
Suggested change
| .error("The 'web-client' and 'encoding-mode' are mutually exclusive.", element); | |
| .error("The 'web-client' and 'encoding-mode' attributes are mutually exclusive.", element); |
garyrussell
approved these changes
Dec 15, 2022
garyrussell
pushed a commit
that referenced
this pull request
Dec 15, 2022
* GH-3954: Fix WebFlux XML config for ambiguity Fixes #3954 When `web-client` attribute is provided for the WebFlux outbound components configuration via XML, the `encoding-mode` is silently ignored * Check for `encoding-mode` attribute presence in the `WebFluxOutboundChannelAdapterParser` when `web-client` is provided and throw respective exception to reject such a config **Cherry-pick to `5.5.x`** * * Improve error messages in the `WebFluxOutboundChannelAdapterParser`
|
...and cherry-picked as 626b14e after resolving test conflicts and import order. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #3954
When
web-clientattribute is provided for the WebFlux outbound components configuration via XML, theencoding-modeis silently ignoredencoding-modeattribute presence in theWebFluxOutboundChannelAdapterParserwhenweb-clientis provided and throw respective exception to reject such a configCherry-pick to
5.5.x