diff --git a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java index 686ec93767..4e78c3c78d 100644 --- a/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java +++ b/spring-web/src/main/java/org/springframework/http/converter/StringHttpMessageConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 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. @@ -41,6 +41,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter availableCharsets; @@ -66,6 +67,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter(Charset.availableCharsets().values()); } + /** * Indicates whether the {@code Accept-Charset} should be written to any outgoing request. *

Default is {@code true}. @@ -74,6 +76,7 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter clazz) { return String.class.equals(clazz); @@ -86,10 +89,10 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverterBy default, returns {@link Charset#availableCharsets()}. Can be overridden in subclasses. + * Return the list of supported {@link Charset}s. + *

By default, returns {@link Charset#availableCharsets()}. + * Can be overridden in subclasses. * @return the list of accepted charsets */ protected List getAcceptedCharsets() { @@ -123,4 +128,5 @@ public class StringHttpMessageConverter extends AbstractHttpMessageConverter