Accept viewNames and excludedViewNames for ThymeleafViewResolver

(via spring.thymeleaf.*).

Fixes gh-548
pull/543/merge
Dave Syer 11 years ago
parent e472e7ccca
commit 4637c2a8f7

@ -178,6 +178,10 @@ public class ThymeleafAutoConfiguration {
resolver.setTemplateEngine(this.templateEngine); resolver.setTemplateEngine(this.templateEngine);
resolver.setCharacterEncoding(this.environment.getProperty("encoding", resolver.setCharacterEncoding(this.environment.getProperty("encoding",
"UTF-8")); "UTF-8"));
resolver.setExcludedViewNames(this.environment.getProperty(
"excludedViewNames", String[].class));
resolver.setViewNames(this.environment.getProperty("viewNames",
String[].class));
// Needs to come before any fallback resolver (e.g. a // Needs to come before any fallback resolver (e.g. a
// InternalResourceViewResolver) // InternalResourceViewResolver)
resolver.setOrder(Ordered.LOWEST_PRECEDENCE - 20); resolver.setOrder(Ordered.LOWEST_PRECEDENCE - 20);

@ -38,6 +38,7 @@ import org.thymeleaf.spring4.view.ThymeleafViewResolver;
import org.thymeleaf.templateresolver.ITemplateResolver; import org.thymeleaf.templateresolver.ITemplateResolver;
import org.thymeleaf.templateresolver.TemplateResolver; import org.thymeleaf.templateresolver.TemplateResolver;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertTrue;
@ -85,6 +86,17 @@ public class ThymeleafAutoConfigurationTests {
assertEquals("UTF-16", views.getCharacterEncoding()); assertEquals("UTF-16", views.getCharacterEncoding());
} }
@Test
public void overrideViewNames() throws Exception {
EnvironmentTestUtils.addEnvironment(this.context,
"spring.thymeleaf.viewNames:foo,bar");
this.context.register(ThymeleafAutoConfiguration.class,
PropertyPlaceholderAutoConfiguration.class);
this.context.refresh();
ThymeleafViewResolver views = this.context.getBean(ThymeleafViewResolver.class);
assertArrayEquals(new String[] { "foo", "bar" }, views.getViewNames());
}
@Test(expected = BeanCreationException.class) @Test(expected = BeanCreationException.class)
public void templateLocationDoesNotExist() throws Exception { public void templateLocationDoesNotExist() throws Exception {
EnvironmentTestUtils.addEnvironment(this.context, EnvironmentTestUtils.addEnvironment(this.context,

Loading…
Cancel
Save