diff --git a/src/main/java/ru/dmitriymx/skeleton/springmvc/SpringConfigMVC.java b/src/main/java/ru/dmitriymx/skeleton/springmvc/SpringConfigMVC.java index b79c900..c92972d 100644 --- a/src/main/java/ru/dmitriymx/skeleton/springmvc/SpringConfigMVC.java +++ b/src/main/java/ru/dmitriymx/skeleton/springmvc/SpringConfigMVC.java @@ -20,10 +20,9 @@ import org.thymeleaf.templateresolver.ITemplateResolver; @Configuration @EnableWebMvc public class SpringConfigMVC implements WebMvcConfigurer { + @Bean @Autowired - private ApplicationContext applicationContext; - - private ITemplateResolver templateResolver(){ + public ITemplateResolver templateResolver(ApplicationContext applicationContext){ SpringResourceTemplateResolver resolver = new SpringResourceTemplateResolver(); resolver.setApplicationContext(applicationContext); resolver.setPrefix("classpath:/templates/"); @@ -33,9 +32,11 @@ public class SpringConfigMVC implements WebMvcConfigurer { return resolver; } - private TemplateEngine templateEngine(){ + @Bean + @Autowired + public TemplateEngine templateEngine(ITemplateResolver templateResolver){ SpringTemplateEngine engine = new SpringTemplateEngine(); - engine.setTemplateResolver(templateResolver()); + engine.setTemplateResolver(templateResolver); return engine; } @@ -45,9 +46,10 @@ public class SpringConfigMVC implements WebMvcConfigurer { * @return {@link ViewResolver} */ @Bean - public ViewResolver viewResolver() { + @Autowired + public ViewResolver viewResolver(TemplateEngine templateEngine) { ThymeleafViewResolver viewResolver = new ThymeleafViewResolver(); - viewResolver.setTemplateEngine(templateEngine()); + viewResolver.setTemplateEngine(templateEngine); viewResolver.setContentType("text/html;charset=UTF-8"); viewResolver.setCache(true); return viewResolver;