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

Expose defaultCharset in StringDecoder 

Closes gh-25762
This commit is contained in:
Rossen Stoyanchev 2020-09-14 14:28:02 +01:00
parent dde79a9b65
commit dccc78146a
1 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
spring-core/src/main/java/org/springframework/core/codec/StringDecoder.java
View File

@ -72,6 +72,8 @@ public final class StringDecoder extends AbstractDataBufferDecoder<String> {
private final boolean stripDelimiter;
private Charset defaultCharset = DEFAULT_CHARSET;
private final ConcurrentMap<Charset, byte[][]> delimitersCache = new ConcurrentHashMap<>();
@ -83,6 +85,24 @@ public final class StringDecoder extends AbstractDataBufferDecoder<String> {
}
/**
* Set the default character set to fall back on if the MimeType does not specify any.
* <p>By default this is {@code UTF-8}.
* @param defaultCharset the charset to fall back on
* @since 5.2.9
*/
public void setDefaultCharset(Charset defaultCharset) {
this.defaultCharset = defaultCharset;
}
/**
* Return the configured {@link #setDefaultCharset(Charset) defaultCharset}.
* @since 5.2.9
*/
public Charset getDefaultCharset() {
return this.defaultCharset;
}
@Override
public boolean canDecode(ResolvableType elementType, @Nullable MimeType mimeType) {
return (elementType.resolve() == String.class && super.canDecode(elementType, mimeType));
@ -136,12 +156,12 @@ public final class StringDecoder extends AbstractDataBufferDecoder<String> {
return value;
}
private static Charset getCharset(@Nullable MimeType mimeType) {
private Charset getCharset(@Nullable MimeType mimeType) {
if (mimeType != null && mimeType.getCharset() != null) {
return mimeType.getCharset();
}
else {
return DEFAULT_CHARSET;
return getDefaultCharset();
}
}