root
/
spring-boot
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Merge branch '1.5.x' into 2.0.x

Browse Source
pull/14583/merge
Andy Wilkinson 6 years ago
parent fd10226c54 1471db220f
commit da1fde6a5f
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File

12
spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java
Unescape Escape View File

@ -167,7 +167,8 @@ public class RestTemplateBuilder {
/** /**
* Set the {@link HttpMessageConverter HttpMessageConverters} that should be used with * Set the {@link HttpMessageConverter HttpMessageConverters} that should be used with
* the {@link RestTemplate}. Setting this value will replace any previously configured * the {@link RestTemplate}. Setting this value will replace any previously configured
* converters. * converters and any converters configured on the builder will replace RestTemplate's
* default converters.
* @param messageConverters the converters to set * @param messageConverters the converters to set
* @return a new builder instance * @return a new builder instance
* @see #additionalMessageConverters(HttpMessageConverter...) * @see #additionalMessageConverters(HttpMessageConverter...)
@ -181,7 +182,8 @@ public class RestTemplateBuilder {
/** /**
* Set the {@link HttpMessageConverter HttpMessageConverters} that should be used with * Set the {@link HttpMessageConverter HttpMessageConverters} that should be used with
* the {@link RestTemplate}. Setting this value will replace any previously configured * the {@link RestTemplate}. Setting this value will replace any previously configured
* converters. * converters and any converters configured on the builder will replace RestTemplate's
* default converters.
* @param messageConverters the converters to set * @param messageConverters the converters to set
* @return a new builder instance * @return a new builder instance
* @see #additionalMessageConverters(HttpMessageConverter...) * @see #additionalMessageConverters(HttpMessageConverter...)
@ -199,7 +201,8 @@ public class RestTemplateBuilder {
/** /**
* Add additional {@link HttpMessageConverter HttpMessageConverters} that should be * Add additional {@link HttpMessageConverter HttpMessageConverters} that should be
* used with the {@link RestTemplate}. * used with the {@link RestTemplate}. Any converters configured on the builder will
* replace RestTemplate's default converters.
* @param messageConverters the converters to add * @param messageConverters the converters to add
* @return a new builder instance * @return a new builder instance
* @see #messageConverters(HttpMessageConverter...) * @see #messageConverters(HttpMessageConverter...)
@ -212,7 +215,8 @@ public class RestTemplateBuilder {
/** /**
* Add additional {@link HttpMessageConverter HttpMessageConverters} that should be * Add additional {@link HttpMessageConverter HttpMessageConverters} that should be
* used with the {@link RestTemplate}. * used with the {@link RestTemplate}. Any converters configured on the builder will
* replace RestTemplate's default converters.
* @param messageConverters the converters to add * @param messageConverters the converters to add
* @return a new builder instance * @return a new builder instance
* @see #messageConverters(HttpMessageConverter...) * @see #messageConverters(HttpMessageConverter...)

Write Preview
Loading…
Cancel
Save