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

Merge branch '1.5.x'

Browse Source
This commit is contained in:
Stephane Nicoll
2016-12-19 11:32:33 +01:00
parent b6eccc23e6 28e86272e8
commit b000e182a2
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -576,7 +576,7 @@ public class TestRestTemplate {
* @return the converted object
* @throws RestClientException on client-side HTTP error
* @see HttpEntity
* @since 2.0
* @since 1.4.3
*/
<T> T patchForObject(String url, Object request, Class<T> responseType,
Object... uriVariables) throws RestClientException {
@@ -599,7 +599,7 @@ public class TestRestTemplate {
* @return the converted object
* @throws RestClientException on client-side HTTP error
* @see HttpEntity
* @since 2.0
* @since 1.4.3
*/
<T> T patchForObject(String url, Object request, Class<T> responseType,
Map<String, ?> uriVariables) throws RestClientException {
@@ -619,7 +619,7 @@ public class TestRestTemplate {
* @return the converted object
* @throws RestClientException on client-side HTTP error
* @see HttpEntity
* @since 2.0
* @since 1.4.3
*/
<T> T patchForObject(URI url, Object request, Class<T> responseType)
throws RestClientException {