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

Use the configured charset, if any, in MustacheViewResolver 

Closes gh-2670
This commit is contained in:
Andy Wilkinson 2015-03-26 17:55:17 +00:00
parent 2cf23e08a0
commit dd748eda19
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/MustacheAutoConfiguration.java
View File

@ -108,6 +108,7 @@ public class MustacheAutoConfiguration {
resolver.setCache(this.mustache.isCache()); resolver.setCache(this.mustache.isCache());
resolver.setViewNames(this.mustache.getViewNames()); resolver.setViewNames(this.mustache.getViewNames());
resolver.setContentType(this.mustache.getContentType()); resolver.setContentType(this.mustache.getContentType());
resolver.setCharset(this.mustache.getCharset());
resolver.setCompiler(mustacheCompiler); resolver.setCompiler(mustacheCompiler);
resolver.setOrder(Ordered.LOWEST_PRECEDENCE - 10); resolver.setOrder(Ordered.LOWEST_PRECEDENCE - 10);
return resolver; return resolver;

14
spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/mustache/web/MustacheViewResolver.java
View File

@ -34,12 +34,15 @@ import com.samskivert.mustache.Template;
* Spring MVC {@link ViewResolver} for Mustache. * Spring MVC {@link ViewResolver} for Mustache.
* *
* @author Dave Syer * @author Dave Syer
* @author Andy Wilkinson
* @since 1.2.2 * @since 1.2.2
*/ */
public class MustacheViewResolver extends UrlBasedViewResolver { public class MustacheViewResolver extends UrlBasedViewResolver {
private Compiler compiler = Mustache.compiler(); private Compiler compiler = Mustache.compiler();
private String charset;
public MustacheViewResolver() { public MustacheViewResolver() {
setViewClass(MustacheView.class); setViewClass(MustacheView.class);
} }
@ -51,6 +54,13 @@ public class MustacheViewResolver extends UrlBasedViewResolver {
this.compiler = compiler; this.compiler = compiler;
} }
/**
* @param charset the charset to set
*/
public void setCharset(String charset) {
this.charset = charset;
}
@Override @Override
protected View loadView(String viewName, Locale locale) throws Exception { protected View loadView(String viewName, Locale locale) throws Exception {
Resource resource = resolveResource(viewName, locale); Resource resource = resolveResource(viewName, locale);
@ -64,7 +74,9 @@ public class MustacheViewResolver extends UrlBasedViewResolver {
} }
private Template createTemplate(Resource resource) throws IOException { private Template createTemplate(Resource resource) throws IOException {
return this.compiler.compile(new InputStreamReader(resource.getInputStream())); return this.charset == null ? this.compiler.compile(new InputStreamReader(
resource.getInputStream())) : this.compiler
.compile(new InputStreamReader(resource.getInputStream(), this.charset));
} }
private Resource resolveResource(String viewName, Locale locale) { private Resource resolveResource(String viewName, Locale locale) {