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

Charset argument in RestClientResponseException 

See gh-23764
This commit is contained in:
Rossen Stoyanchev 2019-10-23 16:49:32 +01:00
parent 4932196b87
commit 2733511ea2
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java
View File

@ -99,11 +99,22 @@ public class RestClientResponseException extends RestClientException {
}
/**
* Return the response body as a string.
* Return the response body converted to String. The charset used is that
* of the response "Content-Type" or otherwise {@code "UTF-8"}.
*/
public String getResponseBodyAsString() {
return getResponseBodyAsString(DEFAULT_CHARSET);
}
/**
* Return the response body converted to String. The charset used is that
* of the response "Content-Type" or otherwise the one given.
* @param fallbackCharset the charset to use on if the response doesn't specify.
* @since 5.1.11
*/
public String getResponseBodyAsString(Charset fallbackCharset) {
if (this.responseCharset == null) {
return new String(this.responseBody, DEFAULT_CHARSET);
return new String(this.responseBody, fallbackCharset);
}
try {
return new String(this.responseBody, this.responseCharset);