Skip to content

Commit 5096ed2

Browse files
committed
Don't create SpringTemplateEngine (use auto configuration).
Will be created by ThymeleafAutoConfiguration.ThymeleafDefaultConfiguration class.
1 parent 93e405a commit 5096ed2

File tree

1 file changed

+11
-13
lines changed

1 file changed

+11
-13
lines changed

src/main/java/ru/mystamps/web/config/MvcConfig.java

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,6 @@
4242
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
4343
import org.springframework.web.servlet.ViewResolver;
4444

45-
import com.github.heneke.thymeleaf.togglz.TogglzDialect;
46-
import org.thymeleaf.extras.springsecurity4.dialect.SpringSecurityDialect;
4745
import org.thymeleaf.spring4.SpringTemplateEngine;
4846
import org.thymeleaf.spring4.view.ThymeleafView;
4947
import org.thymeleaf.spring4.view.ThymeleafViewResolver;
@@ -63,6 +61,9 @@ public class MvcConfig extends WebMvcConfigurerAdapter {
6361
@Inject
6462
private Environment env;
6563

64+
@Inject
65+
private SpringTemplateEngine templateEngine;
66+
6667
@Override
6768
public void configureDefaultServletHandling(DefaultServletHandlerConfigurer configurer) {
6869
configurer.enable();
@@ -112,23 +113,20 @@ public Validator getValidator() {
112113
}
113114

114115
// override Spring Boot default configuration
115-
@Bean(name = "thymeleafViewResolver")
116-
@SuppressWarnings("PMD.SignatureDeclareThrowsException")
117-
public ViewResolver getThymeleafViewResolver() throws Exception {
116+
@Bean(name = "defaultTemplateResolver")
117+
public TemplateResolver getThymeleafTemplateResolver() {
118118
TemplateResolver templateResolver = new ServletContextTemplateResolver();
119119
templateResolver.setTemplateMode("HTML5");
120120
templateResolver.setPrefix("/WEB-INF/views/");
121121
templateResolver.setSuffix(".html");
122122
templateResolver.setCharacterEncoding("UTF-8");
123123
templateResolver.setCacheable(env.acceptsProfiles("prod"));
124-
125-
SpringTemplateEngine templateEngine = new SpringTemplateEngine();
126-
templateEngine.setTemplateResolver(templateResolver);
127-
templateEngine.setTemplateEngineMessageSource(getMessageSource());
128-
templateEngine.addDialect(new SpringSecurityDialect());
129-
templateEngine.addDialect(new TogglzDialect());
130-
templateEngine.afterPropertiesSet();
131-
124+
return templateResolver;
125+
}
126+
127+
// override Spring Boot default configuration
128+
@Bean(name = "thymeleafViewResolver")
129+
public ViewResolver getThymeleafViewResolver() {
132130
ThymeleafViewResolver viewResolver = new ThymeleafViewResolver();
133131
viewResolver.setTemplateEngine(templateEngine);
134132
viewResolver.setContentType("text/html; charset=UTF-8");

0 commit comments

Comments
 (0)