Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

RestTemplateCustomizers should be applied at the end

Browse Source 
See gh-13358
This commit is contained in:
Dmytro Nosan
2018-06-04 18:16:08 +03:00
committed by Stephane Nicoll
parent ade1397ea2
commit ce3420748f
2 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
View File

@@ -531,12 +531,13 @@ public class RestTemplateBuilder {
if (this.basicAuthorization != null) {
restTemplate.getInterceptors().add(this.basicAuthorization);
}
restTemplate.getInterceptors().addAll(this.interceptors);
if (!CollectionUtils.isEmpty(this.restTemplateCustomizers)) {
for (RestTemplateCustomizer customizer : this.restTemplateCustomizers) {
customizer.customize(restTemplate);
}
}
restTemplate.getInterceptors().addAll(this.interceptors);
return restTemplate;
}

33
spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestTemplateBuilderTests.java
View File

@@ -32,6 +32,7 @@ import org.springframework.http.client.BufferingClientHttpRequestFactory;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.http.client.ClientHttpRequestInterceptor;
import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
import org.springframework.http.client.InterceptingClientHttpRequestFactory;
import org.springframework.http.client.OkHttp3ClientHttpRequestFactory;
import org.springframework.http.client.SimpleClientHttpRequestFactory;
import org.springframework.http.client.support.BasicAuthorizationInterceptor;
@@ -497,6 +498,38 @@ public class RestTemplateBuilderTests {
.isInstanceOf(BufferingClientHttpRequestFactory.class);
}
@Test
public void customizerShouldBeAppliedInTheEnd() {
ClientHttpRequestInterceptor interceptor = this.interceptor;
HttpMessageConverter<Object> messageConverter = this.messageConverter;
ResponseErrorHandler errorHandler = mock(ResponseErrorHandler.class);
this.builder.interceptors(interceptor).messageConverters(messageConverter)
.rootUri("http://localhost:8080").errorHandler(errorHandler)
.basicAuthorization("spring", "boot")
.requestFactory(HttpComponentsClientHttpRequestFactory.class)
.customizers((restTemplate) -> {
ClientHttpRequestFactory requestFactory = restTemplate
.getRequestFactory();
assertThat(restTemplate.getInterceptors()).hasSize(2)
.contains(interceptor).anyMatch(
(ic) -> ic instanceof BasicAuthorizationInterceptor);
assertThat(restTemplate.getMessageConverters())
.contains(messageConverter);
assertThat(restTemplate.getUriTemplateHandler())
.isInstanceOf(RootUriTemplateHandler.class);
assertThat(restTemplate.getErrorHandler()).isEqualTo(errorHandler);
assertThat(requestFactory)
.isInstanceOf(InterceptingClientHttpRequestFactory.class);
assertThat(ReflectionTestUtils.getField(requestFactory,
"requestFactory")).isInstanceOf(
HttpComponentsClientHttpRequestFactory.class);
}).build();
}
public static class RestTemplateSubclass extends RestTemplate {
}