From 7a06ef48045893457f428b6616d4bebb73fa8a88 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 25 Dec 2017 03:53:14 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89?= =?UTF-8?q?=D0=B0=D0=B5=D0=BC=20SpringConfig,=20=D0=B1=D0=B8=D0=BD=D1=8B?= =?UTF-8?q?=20viewResolver=20=D0=B8=20freemarkerConfig?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kinosearch/core/SpringConfig.java | 28 +++++++++++ src/main/java/kinosearch/webapp/Main.java | 1 + .../java/kinosearch/webapp/SpringConfig.java | 46 ------------------- .../kinosearch/webapp/SpringMvcConfig.java | 20 ++++++++ .../kinosearch/core/browser/TestBrowser.java | 2 +- .../kinosearch/core/warez/TestOnlinelife.java | 2 +- .../kinosearch/core/warez/TestSeasonvar.java | 2 +- 7 files changed, 52 insertions(+), 49 deletions(-) create mode 100644 src/main/java/kinosearch/core/SpringConfig.java delete mode 100644 src/main/java/kinosearch/webapp/SpringConfig.java diff --git a/src/main/java/kinosearch/core/SpringConfig.java b/src/main/java/kinosearch/core/SpringConfig.java new file mode 100644 index 0000000..40b09eb --- /dev/null +++ b/src/main/java/kinosearch/core/SpringConfig.java @@ -0,0 +1,28 @@ +/* + * DmitriyMX + * 2017-12-11 + */ +package kinosearch.core; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import kinosearch.webapp.KinoPlaySerializer; +import kinosearch.webapp.WebApp; +import org.springframework.beans.factory.annotation.Value; +import org.springframework.context.annotation.*; + +@Configuration +@ComponentScan(basePackages = {"kinosearch.core.browser", "kinosearch.core.warez"}) +@PropertySource("classpath:/application.properties") +public class SpringConfig { + @Bean + @Scope("singleton") + public Gson gson() { + return new GsonBuilder().registerTypeAdapter(KinoPlay.class, new KinoPlaySerializer()).create(); + } + + @Bean + public WebApp webapp(@Value("${webapp.host}") String host, @Value("${webapp.port}") int port) { + return new WebApp(host, port); + } +} diff --git a/src/main/java/kinosearch/webapp/Main.java b/src/main/java/kinosearch/webapp/Main.java index 51956cf..a14a89d 100644 --- a/src/main/java/kinosearch/webapp/Main.java +++ b/src/main/java/kinosearch/webapp/Main.java @@ -4,6 +4,7 @@ */ package kinosearch.webapp; +import kinosearch.core.SpringConfig; import org.springframework.context.ApplicationContext; import org.springframework.context.annotation.AnnotationConfigApplicationContext; diff --git a/src/main/java/kinosearch/webapp/SpringConfig.java b/src/main/java/kinosearch/webapp/SpringConfig.java deleted file mode 100644 index 1b16bb9..0000000 --- a/src/main/java/kinosearch/webapp/SpringConfig.java +++ /dev/null @@ -1,46 +0,0 @@ -/* - * DmitriyMX - * 2017-12-11 - */ -package kinosearch.webapp; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import kinosearch.core.KinoPlay; -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.*; -import org.springframework.web.servlet.ViewResolver; -import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer; -import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver; - -@Configuration -@ComponentScan(basePackages = {"kinosearch.core.browser", "kinosearch.core.warez"}) -@PropertySource("classpath:/application.properties") -public class SpringConfig { - @Bean - @Scope("singleton") - public Gson gson() { - return new GsonBuilder().registerTypeAdapter(KinoPlay.class, new KinoPlaySerializer()).create(); - } - - @Bean - public WebApp webapp(@Value("${webapp.host}") String host, @Value("${webapp.port}") int port) { - return new WebApp(host, port); - } - - @Bean - public ViewResolver viewResolver() { - FreeMarkerViewResolver viewResolver = new FreeMarkerViewResolver(); - viewResolver.setContentType("text/html;charset=UTF-8"); - viewResolver.setCache(true); - viewResolver.setSuffix(".ftl"); - return viewResolver; - } - - @Bean - public FreeMarkerConfigurer freemarkerConfig() { - FreeMarkerConfigurer freeMarkerConfigurer = new FreeMarkerConfigurer(); - freeMarkerConfigurer.setTemplateLoaderPath("classpath:/kinosearch/webapp/"); - return freeMarkerConfigurer; - } -} diff --git a/src/main/java/kinosearch/webapp/SpringMvcConfig.java b/src/main/java/kinosearch/webapp/SpringMvcConfig.java index ee4c9dd..a46a6a3 100644 --- a/src/main/java/kinosearch/webapp/SpringMvcConfig.java +++ b/src/main/java/kinosearch/webapp/SpringMvcConfig.java @@ -4,14 +4,34 @@ */ package kinosearch.webapp; +import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; +import org.springframework.web.servlet.ViewResolver; import org.springframework.web.servlet.config.annotation.EnableWebMvc; import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; +import org.springframework.web.servlet.view.freemarker.FreeMarkerConfigurer; +import org.springframework.web.servlet.view.freemarker.FreeMarkerViewResolver; @Configuration @EnableWebMvc public class SpringMvcConfig extends WebMvcConfigurerAdapter { + @Bean + public ViewResolver viewResolver() { + FreeMarkerViewResolver viewResolver = new FreeMarkerViewResolver(); + viewResolver.setContentType("text/html;charset=UTF-8"); + viewResolver.setCache(true); + viewResolver.setSuffix(".ftl"); + return viewResolver; + } + + @Bean + public FreeMarkerConfigurer freemarkerConfig() { + FreeMarkerConfigurer freeMarkerConfigurer = new FreeMarkerConfigurer(); + freeMarkerConfigurer.setTemplateLoaderPath("classpath:/kinosearch/webapp/"); + return freeMarkerConfigurer; + } + @Override public void addResourceHandlers(ResourceHandlerRegistry registry) { final String staticPath = "classpath:/kinosearch/webapp/static/"; diff --git a/src/test/java/kinosearch/core/browser/TestBrowser.java b/src/test/java/kinosearch/core/browser/TestBrowser.java index 17a53de..14c4800 100644 --- a/src/test/java/kinosearch/core/browser/TestBrowser.java +++ b/src/test/java/kinosearch/core/browser/TestBrowser.java @@ -2,7 +2,7 @@ package kinosearch.core.browser; import com.google.gson.Gson; import com.google.gson.JsonObject; -import kinosearch.webapp.SpringConfig; +import kinosearch.core.SpringConfig; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/kinosearch/core/warez/TestOnlinelife.java b/src/test/java/kinosearch/core/warez/TestOnlinelife.java index 29b455c..5603c4d 100644 --- a/src/test/java/kinosearch/core/warez/TestOnlinelife.java +++ b/src/test/java/kinosearch/core/warez/TestOnlinelife.java @@ -4,7 +4,7 @@ */ package kinosearch.core.warez; -import kinosearch.webapp.SpringConfig; +import kinosearch.core.SpringConfig; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/kinosearch/core/warez/TestSeasonvar.java b/src/test/java/kinosearch/core/warez/TestSeasonvar.java index edf5a95..809f468 100644 --- a/src/test/java/kinosearch/core/warez/TestSeasonvar.java +++ b/src/test/java/kinosearch/core/warez/TestSeasonvar.java @@ -4,7 +4,7 @@ */ package kinosearch.core.warez; -import kinosearch.webapp.SpringConfig; +import kinosearch.core.SpringConfig; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired;