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

Charset argument in RestClientResponseException

Browse Source 
See gh-23803
This commit is contained in:
Rossen Stoyanchev
2019-10-24 20:51:16 +01:00
parent 7f8966774e
commit 562c0871e9
1 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -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);