Skip to content

GH-10830: Add RestClient support for HTTP outbound endpoints #10835

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
mailaruns wants to merge 6 commits into from
Closed

GH-10830: Add RestClient support for HTTP outbound endpoints #10835

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3372089
GH-10830: Add RestClient support for HTTP outbound endpoints
mailaruns Feb 24, 2026
dfa5dd3
GH-10830: Deprecate RestTemplate outbound configuration and align wit…
mailaruns Feb 25, 2026
c8716cc
Polish Javadoc clause order for deprecated RestTemplate mutators
mailaruns Feb 25, 2026
223c120
GH-10830: Align HTTP outbound local client configuration with RestCli…
mailaruns Feb 25, 2026
3b4d416
GH-10830: Refine HTTP RestClient delegation and local client lifecycle
mailaruns Feb 26, 2026
84f2632
GH-10830: Refine HTTP RestClient delegation
mailaruns Feb 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions ...tp/src/main/java/org/springframework/integration/http/config/HttpAdapterParsingUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
* @author Gary Russell
* @author Artem Bilan
* @author Shiliang Li
* @author Arun Sethumadhavan
*
* @since 2.0.2
*/
Expand All @@ -62,6 +63,23 @@ static void verifyNoRestTemplateAttributes(Element element, ParserContext parser
}
}

static void verifyNoRestClientAttributes(Element element, ParserContext parserContext) {
for (String attributeName : SYNC_REST_TEMPLATE_REFERENCE_ATTRIBUTES) {
if (element.hasAttribute(attributeName)) {
parserContext.getReaderContext().error("When providing a 'rest-client' reference, the '"
+ attributeName + "' attribute is not allowed, " +
"it must be set on the provided client instead",
parserContext.extractSource(element));
}
}

if (element.hasAttribute("encoding-mode")) {
parserContext.getReaderContext().error("When providing a 'rest-client' reference, " +
"the 'encoding-mode' must be set on the 'RestClient.Builder.uriBuilderFactory' property.",
parserContext.extractSource(element));
}
}

static void configureUriVariableExpressions(BeanDefinitionBuilder builder, ParserContext parserContext,
Element element) {

Expand Down
14 changes: 14 additions & 0 deletions ...in/java/org/springframework/integration/http/config/HttpOutboundChannelAdapterParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@
* @author Gary Russell
* @author Artem Bilan
* @author Shiliang Li
* @author Arun Sethumadhavan
*
* @since 2.0
*/
Expand Down Expand Up @@ -78,13 +79,26 @@ protected BeanDefinitionBuilder getBuilder(Element element, ParserContext parser
BeanDefinitionBuilder.genericBeanDefinition(HttpRequestExecutingMessageHandler.class);

String restTemplateRef = element.getAttribute("rest-template");
String restClientRef = element.getAttribute("rest-client");

if (StringUtils.hasText(restTemplateRef) && StringUtils.hasText(restClientRef)) {
parserContext.getReaderContext()
.error("Only one of 'rest-template' and 'rest-client' references is allowed.",
parserContext.extractSource(element));
}

if (StringUtils.hasText(restTemplateRef)) {
HttpAdapterParsingUtils.verifyNoRestTemplateAttributes(element, parserContext);
builder.getBeanDefinition()
.getConstructorArgumentValues()
.addIndexedArgumentValue(1, new RuntimeBeanReference(restTemplateRef));
}
else if (StringUtils.hasText(restClientRef)) {
HttpAdapterParsingUtils.verifyNoRestClientAttributes(element, parserContext);
builder.getBeanDefinition()
.getConstructorArgumentValues()
.addIndexedArgumentValue(1, new RuntimeBeanReference(restClientRef));
}
else {
for (String referenceAttributeName : HttpAdapterParsingUtils.SYNC_REST_TEMPLATE_REFERENCE_ATTRIBUTES) {
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, referenceAttributeName);
Expand Down
14 changes: 14 additions & 0 deletions .../src/main/java/org/springframework/integration/http/config/HttpOutboundGatewayParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
* @author Gary Russell
* @author Artem Bilan
* @author Shiliang Li
* @author Arun Sethumadhavan
*/
public class HttpOutboundGatewayParser extends AbstractConsumerEndpointParser {

Expand Down Expand Up @@ -91,13 +92,26 @@ protected BeanDefinitionBuilder getBuilder(Element element, ParserContext parser
BeanDefinitionBuilder.genericBeanDefinition(HttpRequestExecutingMessageHandler.class);

String restTemplateRef = element.getAttribute("rest-template");
String restClientRef = element.getAttribute("rest-client");

if (StringUtils.hasText(restTemplateRef) && StringUtils.hasText(restClientRef)) {
parserContext.getReaderContext()
.error("Only one of 'rest-template' and 'rest-client' references is allowed.",
parserContext.extractSource(element));
}

if (StringUtils.hasText(restTemplateRef)) {
HttpAdapterParsingUtils.verifyNoRestTemplateAttributes(element, parserContext);
builder.getBeanDefinition()
.getConstructorArgumentValues()
.addIndexedArgumentValue(1, new RuntimeBeanReference(restTemplateRef));
}
else if (StringUtils.hasText(restClientRef)) {
HttpAdapterParsingUtils.verifyNoRestClientAttributes(element, parserContext);
builder.getBeanDefinition()
.getConstructorArgumentValues()
.addIndexedArgumentValue(1, new RuntimeBeanReference(restClientRef));
}
else {
for (String referenceAttributeName : HttpAdapterParsingUtils.SYNC_REST_TEMPLATE_REFERENCE_ATTRIBUTES) {
IntegrationNamespaceUtils.setReferenceIfAttributeDefined(builder, element, referenceAttributeName);
Expand Down
Loading