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

reintroduced static DEFAULT_CHARSET field

Browse Source 
Issue: SPR-9487
This commit is contained in:
Juergen Hoeller
2012-07-06 18:30:16 +02:00
committed by unknown
parent 2ec7834124
commit 9aa43fcef6
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java
View File

@@ -32,27 +32,30 @@ import org.springframework.util.FileCopyUtils;
/** /**
* Implementation of {@link HttpMessageConverter} that can read and write strings. * Implementation of {@link HttpMessageConverter} that can read and write strings.
* *
* <p>By default, this converter supports all media types (<code>&#42;&#47;&#42;</code>), and writes with a {@code * <p>By default, this converter supports all media types (<code>&#42;&#47;&#42;</code>),
* Content-Type} of {@code text/plain}. This can be overridden by setting the {@link * and writes with a {@code Content-Type} of {@code text/plain}. This can be overridden
* #setSupportedMediaTypes(java.util.List) supportedMediaTypes} property. * by setting the {@link #setSupportedMediaTypes supportedMediaTypes} property.
* *
* @author Arjen Poutsma * @author Arjen Poutsma
* @since 3.0 * @since 3.0
*/ */
public class StringHttpMessageConverter extends AbstractHttpMessageConverter<String> { public class StringHttpMessageConverter extends AbstractHttpMessageConverter<String> {
public static final Charset DEFAULT_CHARSET = Charset.forName("ISO-8859-1");
private final Charset defaultCharset; private final Charset defaultCharset;
private final List<Charset> availableCharsets; private final List<Charset> availableCharsets;
private boolean writeAcceptCharset = true; private boolean writeAcceptCharset = true;
/** /**
* A default constructor that uses {@code "ISO-8859-1"} as the default charset. * A default constructor that uses {@code "ISO-8859-1"} as the default charset.
* @see #StringHttpMessageConverter(Charset) * @see #StringHttpMessageConverter(Charset)
*/ */
public StringHttpMessageConverter() { public StringHttpMessageConverter() {
this(Charset.forName("ISO-8859-1")); this(DEFAULT_CHARSET);
} }
/** /**
@@ -73,6 +76,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
this.writeAcceptCharset = writeAcceptCharset; this.writeAcceptCharset = writeAcceptCharset;
} }
@Override @Override
public boolean supports(Class<?> clazz) { public boolean supports(Class<?> clazz) {
return String.class.equals(clazz); return String.class.equals(clazz);
@@ -92,13 +96,13 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
} }
catch (UnsupportedEncodingException ex) { catch (UnsupportedEncodingException ex) {
// should not occur // should not occur
throw new InternalError(ex.getMessage()); throw new IllegalStateException(ex);
} }
} }
@Override @Override
protected void writeInternal(String s, HttpOutputMessage outputMessage) throws IOException { protected void writeInternal(String s, HttpOutputMessage outputMessage) throws IOException {
if (writeAcceptCharset) { if (this.writeAcceptCharset) {
outputMessage.getHeaders().setAcceptCharset(getAcceptedCharsets()); outputMessage.getHeaders().setAcceptCharset(getAcceptedCharsets());
} }
Charset charset = getContentTypeCharset(outputMessage.getHeaders().getContentType()); Charset charset = getContentTypeCharset(outputMessage.getHeaders().getContentType());
@@ -107,9 +111,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter<Str
/** /**
* Return the list of supported {@link Charset}. * Return the list of supported {@link Charset}.
*
* <p>By default, returns {@link Charset#availableCharsets()}. Can be overridden in subclasses. * <p>By default, returns {@link Charset#availableCharsets()}. Can be overridden in subclasses.
*
* @return the list of accepted charsets * @return the list of accepted charsets
*/ */
protected List<Charset> getAcceptedCharsets() { protected List<Charset> getAcceptedCharsets() {