Apply spring.thymeleaf.cache to auto-configured ThymeleafViewResolver
Previously, spring.thymeleaf.cache was only applied to auto-configured TemplateResolver. This commit also applies the propery to the auto-configured ThymeleafViewResolver. Closes gh-5395
This commit is contained in:
@@ -216,6 +216,7 @@ public class ThymeleafAutoConfiguration {
|
||||
// This resolver acts as a fallback resolver (e.g. like a
|
||||
// InternalResourceViewResolver) so it needs to have low precedence
|
||||
resolver.setOrder(Ordered.LOWEST_PRECEDENCE - 5);
|
||||
resolver.setCache(this.properties.isCache());
|
||||
return resolver;
|
||||
}
|
||||
|
||||
|
||||
@@ -238,6 +238,19 @@ public class ThymeleafAutoConfigurationTests {
|
||||
is(instanceOf(GroupingStrategy.class)));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void cachingCanBeDisabled() {
|
||||
this.context.register(ThymeleafAutoConfiguration.class,
|
||||
PropertyPlaceholderAutoConfiguration.class);
|
||||
EnvironmentTestUtils.addEnvironment(this.context, "spring.thymeleaf.cache:false");
|
||||
this.context.refresh();
|
||||
assertThat(this.context.getBean(ThymeleafViewResolver.class).isCache(),
|
||||
is(false));
|
||||
TemplateResolver templateResolver = this.context.getBean(TemplateResolver.class);
|
||||
templateResolver.initialize();
|
||||
assertThat(templateResolver.isCacheable(), is(false));
|
||||
}
|
||||
|
||||
@Configuration
|
||||
@ImportAutoConfiguration({ ThymeleafAutoConfiguration.class,
|
||||
PropertyPlaceholderAutoConfiguration.class })
|
||||
|
||||
Reference in New Issue
Block a user