From 562c0871e9f588cdf0e457b85b1df726a551a7d8 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Thu, 24 Oct 2019 20:51:16 +0100 Subject: [PATCH] Charset argument in RestClientResponseException See gh-23803 --- .../web/client/RestClientResponseException.java | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 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 36006cc4834..f93f2334fa5 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 @@ -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);