From cd997be598e03bb64f023bda749271bff8d65f27 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Sun, 23 Sep 2018 14:46:38 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B0=D0=B2=D0=B0=D0=B5=D0=BC=20=D0=BA=D0=BE=D0=BD=D1=84=D0=B8?=
 =?UTF-8?q?=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D1=8E=20Spring=20=D0=B2=20?=
 =?UTF-8?q?=D1=81=D1=82=D0=B8=D0=BB=D0=B5=20bean-based?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skeleton/springmvc/SpringConfigMVC.java      | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

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;