From 0c1ef3ab4f352445df3c1ebf87fe9eac2f78df41 Mon Sep 17 00:00:00 2001 From: Vitaly Takmazov Date: Thu, 12 Jan 2017 14:59:11 +0300 Subject: tests refactoring --- .../www/configuration/WebAppConfiguration.java | 50 ---------------------- .../www/configuration/WwwAppConfiguration.java | 50 ++++++++++++++++++++++ .../juick/www/configuration/WwwInitializer.java | 2 +- 3 files changed, 51 insertions(+), 51 deletions(-) delete mode 100644 juick-www/src/main/java/com/juick/www/configuration/WebAppConfiguration.java create mode 100644 juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java (limited to 'juick-www/src/main') diff --git a/juick-www/src/main/java/com/juick/www/configuration/WebAppConfiguration.java b/juick-www/src/main/java/com/juick/www/configuration/WebAppConfiguration.java deleted file mode 100644 index cd681190..00000000 --- a/juick-www/src/main/java/com/juick/www/configuration/WebAppConfiguration.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.juick.www.configuration; - -import com.juick.service.TagService; -import com.juick.service.UserService; -import com.juick.www.HelpService; -import com.juick.www.controllers.PageTemplates; -import com.juick.www.WebApp; -import org.springframework.cache.annotation.EnableCaching; -import org.springframework.cache.guava.GuavaCacheManager; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.PropertySource; -import org.springframework.core.env.Environment; - -import javax.annotation.Resource; -import javax.inject.Inject; - -/** - * Created by aalexeev on 11/22/16. - */ -@Configuration -@PropertySource("classpath:juick.conf") -@EnableCaching -public class WebAppConfiguration { - @Resource - private Environment env; - @Inject - private UserService userService; - @Inject - private TagService tagService; - - @Bean - public WebApp webApp() { - return new WebApp(env, templates(), userService, tagService); - } - @Bean - public PageTemplates templates() { - return new PageTemplates(); - } - @Bean - public GuavaCacheManager cacheManager() { - return new GuavaCacheManager("help"); - } - - @Bean - public HelpService helpService() { - return new HelpService("help"); - } - -} diff --git a/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java b/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java new file mode 100644 index 00000000..7ffefb1d --- /dev/null +++ b/juick-www/src/main/java/com/juick/www/configuration/WwwAppConfiguration.java @@ -0,0 +1,50 @@ +package com.juick.www.configuration; + +import com.juick.service.TagService; +import com.juick.service.UserService; +import com.juick.www.HelpService; +import com.juick.www.controllers.PageTemplates; +import com.juick.www.WebApp; +import org.springframework.cache.annotation.EnableCaching; +import org.springframework.cache.guava.GuavaCacheManager; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.core.env.Environment; + +import javax.annotation.Resource; +import javax.inject.Inject; + +/** + * Created by aalexeev on 11/22/16. + */ +@Configuration +@PropertySource("classpath:juick.conf") +@EnableCaching +public class WwwAppConfiguration { + @Resource + private Environment env; + @Inject + private UserService userService; + @Inject + private TagService tagService; + + @Bean + public WebApp webApp() { + return new WebApp(env, templates(), userService, tagService); + } + @Bean + public PageTemplates templates() { + return new PageTemplates(); + } + @Bean + public GuavaCacheManager cacheManager() { + return new GuavaCacheManager("help"); + } + + @Bean + public HelpService helpService() { + return new HelpService("help"); + } + +} diff --git a/juick-www/src/main/java/com/juick/www/configuration/WwwInitializer.java b/juick-www/src/main/java/com/juick/www/configuration/WwwInitializer.java index cd5429c2..0e185447 100644 --- a/juick-www/src/main/java/com/juick/www/configuration/WwwInitializer.java +++ b/juick-www/src/main/java/com/juick/www/configuration/WwwInitializer.java @@ -18,7 +18,7 @@ public class WwwInitializer extends AbstractAnnotationConfigDispatcherServletIni @Override protected Class[] getRootConfigClasses() { return new Class[]{ - WebAppConfiguration.class, + WwwAppConfiguration.class, DataConfiguration.class, SearchConfiguration.class }; -- cgit v1.2.3