This is an automated email from the ASF dual-hosted git repository. ningjiang pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/servicecomb-pack.git
The following commit(s) were added to refs/heads/master by this push: new 40d6e07 SCB-1690 omega-transport-resttemplate does not use RestTemplateBuilder 40d6e07 is described below commit 40d6e0742ce4daa9a69ef1bf14e51dcc711d0f64 Author: Daniel Qian <chanjars...@gmail.com> AuthorDate: Fri Dec 27 11:34:41 2019 +0800 SCB-1690 omega-transport-resttemplate does not use RestTemplateBuilder --- .../omega-transport-resttemplate/pom.xml | 4 ++++ .../transport/resttemplate/RestTemplateConfig.java | 19 ++++++++----------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/omega/omega-transport/omega-transport-resttemplate/pom.xml b/omega/omega-transport/omega-transport-resttemplate/pom.xml index 70f04e4..9bdc6da 100644 --- a/omega/omega-transport/omega-transport-resttemplate/pom.xml +++ b/omega/omega-transport/omega-transport-resttemplate/pom.xml @@ -40,6 +40,10 @@ <artifactId>spring-web</artifactId> </dependency> <dependency> + <groupId>org.springframework.boot</groupId> + <artifactId>spring-boot</artifactId> + </dependency> + <dependency> <groupId>org.springframework</groupId> <artifactId>spring-webmvc</artifactId> </dependency> diff --git a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java index 73a4437..4d83ab3 100644 --- a/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java +++ b/omega/omega-transport/omega-transport-resttemplate/src/main/java/org/apache/servicecomb/pack/omega/transport/resttemplate/RestTemplateConfig.java @@ -18,25 +18,22 @@ package org.apache.servicecomb.pack.omega.transport.resttemplate; -import java.util.List; - +import org.apache.servicecomb.pack.omega.context.OmegaContext; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.web.client.RestTemplateBuilder; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; -import org.springframework.http.client.ClientHttpRequestInterceptor; import org.springframework.web.client.RestTemplate; -import org.apache.servicecomb.pack.omega.context.OmegaContext; - @Configuration public class RestTemplateConfig { @Bean(name = "omegaRestTemplate") - public RestTemplate omegaRestTemplate(@Autowired(required=false) OmegaContext context) { - RestTemplate template = new RestTemplate(); - List<ClientHttpRequestInterceptor> interceptors = template.getInterceptors(); - interceptors.add(new TransactionClientHttpRequestInterceptor(context)); - template.setInterceptors(interceptors); - return template; + public RestTemplate omegaRestTemplate(@Autowired(required = false) OmegaContext context, + RestTemplateBuilder restTemplateBuilder) { + return restTemplateBuilder + .additionalInterceptors(new TransactionClientHttpRequestInterceptor(context)) + .build(); } + }