Spring/spring-boot
Spring/spring-boot
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-boot.git synced 2024-08-29 03:06:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.2.x'

Browse Source 
Closes gh-21364
This commit is contained in:
Stephane Nicoll 2020-05-08 14:51:49 +02:00
commit 846db6105f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,5 +1,5 @@
/* /*
* Copyright 2012-2019 the original author or authors. * Copyright 2012-2020 the original author or authors.
* *
* Licensed under the Apache License, Version 2.0 (the "License"); * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License. * you may not use this file except in compliance with the License.
@ -65,9 +65,9 @@ import org.springframework.web.util.UriTemplateHandler;
* {@link #getRestTemplate()}. * {@link #getRestTemplate()}.
* <p> * <p>
* 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
* annotation, a {@link TestRestTemplate} is automatically available and can be * with an embedded server, a {@link TestRestTemplate} is automatically available and can
* {@code @Autowired} into your test. If you need customizations (for example to adding * be {@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