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

Moved encodeHttpHeaderFieldParam method to HttpHeaders itself (including tests)

Browse Source 
This commit also sets the test source encoding to UTF-8.

Issue: SPR-14547
This commit is contained in:
Juergen Hoeller
2016-08-26 11:14:02 +02:00
parent bbd5993945
commit a8f7f75f64
8 changed files with 96 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
spring-webmvc/src/main/java/org/springframework/web/servlet/view/groovy/GroovyMarkupView.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2015 the original author or authors.
* Copyright 2002-2016 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.
@@ -45,7 +45,7 @@ import org.springframework.web.util.NestedServletException;
* @see GroovyMarkupViewResolver
* @see GroovyMarkupConfigurer
* @see <a href="http://groovy-lang.org/templating.html#_the_markuptemplateengine">
* Groovy Markup Template engine documentation</a>
* Groovy Markup Template engine documentation</a>
*/
public class GroovyMarkupView extends AbstractTemplateView {
@@ -63,17 +63,6 @@ public class GroovyMarkupView extends AbstractTemplateView {
this.engine = engine;
}
@Override
public boolean checkResource(Locale locale) throws Exception {
try {
this.engine.resolveTemplate(getUrl());
}
catch (IOException exception) {
return false;
}
return true;
}
/**
* Invoked at startup.
* If no {@link #setTemplateEngine(MarkupTemplateEngine) templateEngine} has
@@ -107,6 +96,17 @@ public class GroovyMarkupView extends AbstractTemplateView {
}
@Override
public boolean checkResource(Locale locale) throws Exception {
try {
this.engine.resolveTemplate(getUrl());
}
catch (IOException ex) {
return false;
}
return true;
}
@Override
protected void renderMergedTemplateModel(Map<String, Object> model,
HttpServletRequest request, HttpServletResponse response) throws Exception {
@@ -125,8 +125,9 @@ public class GroovyMarkupView extends AbstractTemplateView {
}
catch (ClassNotFoundException ex) {
Throwable cause = (ex.getCause() != null ? ex.getCause() : ex);
throw new NestedServletException("Could not find class while rendering Groovy Markup view with name '" +
getUrl() + "': " + ex.getMessage() + "'", cause);
throw new NestedServletException(
"Could not find class while rendering Groovy Markup view with name '" +
getUrl() + "': " + ex.getMessage() + "'", cause);
}
}