Polish “Add constructor to TestRestTemplate that takes a RestTemplateBuilder”
Closes gh-6702
This commit is contained in:
parent
53d7fd5aab
commit
f117b93d49
|
|
@ -84,17 +84,14 @@ public class TestRestTemplate {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new {@link TestRestTemplate} instance.
|
* Create a new {@link TestRestTemplate} instance.
|
||||||
* @param restTemplateBuilder builder used to configure underlying {@link RestTemplate}
|
* @param restTemplateBuilder builder used to configure underlying
|
||||||
|
* {@link RestTemplate}
|
||||||
|
* @since 1.4.1
|
||||||
*/
|
*/
|
||||||
public TestRestTemplate(RestTemplateBuilder restTemplateBuilder) {
|
public TestRestTemplate(RestTemplateBuilder restTemplateBuilder) {
|
||||||
this(buildRestTemplate(restTemplateBuilder));
|
this(buildRestTemplate(restTemplateBuilder));
|
||||||
}
|
}
|
||||||
|
|
||||||
private static RestTemplate buildRestTemplate(RestTemplateBuilder restTemplateBuilder) {
|
|
||||||
Assert.notNull(restTemplateBuilder, "RestTemplateBuilder must not be null");
|
|
||||||
return restTemplateBuilder.build();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a new {@link TestRestTemplate} instance.
|
* Create a new {@link TestRestTemplate} instance.
|
||||||
* @param httpClientOptions client options to use if the Apache HTTP Client is used
|
* @param httpClientOptions client options to use if the Apache HTTP Client is used
|
||||||
|
|
@ -130,6 +127,12 @@ public class TestRestTemplate {
|
||||||
this.restTemplate = restTemplate;
|
this.restTemplate = restTemplate;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private static RestTemplate buildRestTemplate(
|
||||||
|
RestTemplateBuilder restTemplateBuilder) {
|
||||||
|
Assert.notNull(restTemplateBuilder, "RestTemplateBuilder must not be null");
|
||||||
|
return restTemplateBuilder.build();
|
||||||
|
}
|
||||||
|
|
||||||
private void addAuthentication(RestTemplate restTemplate, String username,
|
private void addAuthentication(RestTemplate restTemplate, String username,
|
||||||
String password) {
|
String password) {
|
||||||
if (username == null) {
|
if (username == null) {
|
||||||
|
|
|
||||||
|
|
@ -50,8 +50,7 @@ public class TestRestTemplateTests {
|
||||||
RestTemplateBuilder builder = mock(RestTemplateBuilder.class);
|
RestTemplateBuilder builder = mock(RestTemplateBuilder.class);
|
||||||
RestTemplate delegate = new RestTemplate();
|
RestTemplate delegate = new RestTemplate();
|
||||||
given(builder.build()).willReturn(delegate);
|
given(builder.build()).willReturn(delegate);
|
||||||
assertThat(new TestRestTemplate(builder).getRestTemplate())
|
assertThat(new TestRestTemplate(builder).getRestTemplate()).isEqualTo(delegate);
|
||||||
.isEqualTo(delegate);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue