From f117b93d492d457fc148a17860cf28f36d5dc840 Mon Sep 17 00:00:00 2001 From: Andy Wilkinson Date: Mon, 22 Aug 2016 20:46:56 +0100 Subject: [PATCH] =?UTF-8?q?Polish=20=E2=80=9CAdd=20constructor=20to=20Test?= =?UTF-8?q?RestTemplate=20that=20takes=20a=20RestTemplateBuilder=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Closes gh-6702 --- .../boot/test/web/client/TestRestTemplate.java | 15 +++++++++------ .../test/web/client/TestRestTemplateTests.java | 3 +-- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java index 44c14ea422..c45183972f 100644 --- a/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java +++ b/spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java @@ -84,17 +84,14 @@ public class TestRestTemplate { /** * 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) { 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. * @param httpClientOptions client options to use if the Apache HTTP Client is used @@ -130,6 +127,12 @@ public class TestRestTemplate { 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, String password) { if (username == null) { diff --git a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java index 00a80c2493..3be395db5c 100644 --- a/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java +++ b/spring-boot-test/src/test/java/org/springframework/boot/test/web/client/TestRestTemplateTests.java @@ -50,8 +50,7 @@ public class TestRestTemplateTests { RestTemplateBuilder builder = mock(RestTemplateBuilder.class); RestTemplate delegate = new RestTemplate(); given(builder.build()).willReturn(delegate); - assertThat(new TestRestTemplate(builder).getRestTemplate()) - .isEqualTo(delegate); + assertThat(new TestRestTemplate(builder).getRestTemplate()).isEqualTo(delegate); } @Test