root
/
spring-boot
mirror of https://github.com/spring-projects/spring-boot.git
1
0
Fork 0
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge branch '1.4.x' into 1.5.x

This commit is contained in:
Stephane Nicoll 2017-05-12 17:27:28 +02:00
parent 643dea18ee 4056542bd4
commit a22b3d9515
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
spring-boot-test/src/main/java/org/springframework/boot/test/web/client/TestRestTemplate.java
View File

@ -73,7 +73,7 @@ import org.springframework.web.util.UriTemplateHandler;
* If you are using the * If you are using the
* {@link org.springframework.boot.test.context.SpringBootTest @SpringBootTest} * {@link org.springframework.boot.test.context.SpringBootTest @SpringBootTest}
* annotation, a {@link TestRestTemplate} is automatically available and can be * annotation, a {@link TestRestTemplate} is automatically available and can be
* {@code @Autowired} into you test. If you need customizations (for example to adding * {@code @Autowired} into your test. If you need customizations (for example to adding
* additional message converters) use a {@link RestTemplateBuilder} {@code @Bean}. * additional message converters) use a {@link RestTemplateBuilder} {@code @Bean}.
* *
* @author Dave Syer * @author Dave Syer