From 2733511ea2fbd3f905a7a89ab809c1f6e46276fd Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 23 Oct 2019 16:49:32 +0100 Subject: [PATCH] Charset argument in RestClientResponseException See gh-23764 --- .../web/client/RestClientResponseException.java | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java b/spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java index 60db2528f10..2a927f37690 100644 --- a/spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java +++ b/spring-web/src/main/java/org/springframework/web/client/RestClientResponseException.java @@ -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);