From 41b3844ec869e35b8d726931fe63f20e3c6c22cb Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Mon, 25 Dec 2017 00:57:42 +0300 Subject: [PATCH] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=D0=B8=20=D0=BB?= =?UTF-8?q?=D0=B8=D1=88=D0=BD=D1=8E=D1=8E=20spring-=D0=BA=D0=BE=D0=BD?= =?UTF-8?q?=D1=84=D0=B8=D0=B3=D1=83=D1=80=D0=B0=D1=86=D0=B8=D1=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/kinosearch/core/SpringConfig.java | 31 ------------------- .../core/browser/ApacheHttpBrowser.java | 4 +++ .../java/kinosearch/webapp/SpringConfig.java | 16 +++++++--- .../kinosearch/core/browser/TestBrowser.java | 6 ++-- .../kinosearch/core/warez/TestOnlinelife.java | 3 +- .../kinosearch/core/warez/TestSeasonvar.java | 2 +- 6 files changed, 20 insertions(+), 42 deletions(-) delete mode 100644 src/main/java/kinosearch/core/SpringConfig.java diff --git a/src/main/java/kinosearch/core/SpringConfig.java b/src/main/java/kinosearch/core/SpringConfig.java deleted file mode 100644 index b6ac3be..0000000 --- a/src/main/java/kinosearch/core/SpringConfig.java +++ /dev/null @@ -1,31 +0,0 @@ -/* - * DmitriyMX - * 2017-01-04 - */ -package kinosearch.core; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import kinosearch.core.browser.ApacheHttpBrowser; -import kinosearch.core.browser.Browser; -import kinosearch.webapp.KinoPlaySerializer; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Scope; - -@Configuration -@ComponentScan(basePackages = {"kinosearch.core.browser", "kinosearch.core.warez"}) -public class SpringConfig { - @Bean - @Scope("prototype") - public Browser browser() { - return new ApacheHttpBrowser(); - } - - @Bean - @Scope("singleton") - public Gson gson() { - return new GsonBuilder().registerTypeAdapter(KinoPlay.class, new KinoPlaySerializer()).create(); - } -} diff --git a/src/main/java/kinosearch/core/browser/ApacheHttpBrowser.java b/src/main/java/kinosearch/core/browser/ApacheHttpBrowser.java index ef812a6..a8f0b98 100644 --- a/src/main/java/kinosearch/core/browser/ApacheHttpBrowser.java +++ b/src/main/java/kinosearch/core/browser/ApacheHttpBrowser.java @@ -13,6 +13,8 @@ import org.apache.http.client.methods.HttpPost; import org.apache.http.entity.StringEntity; import org.apache.http.impl.client.HttpClients; import org.apache.http.message.BasicHeader; +import org.springframework.context.annotation.Scope; +import org.springframework.stereotype.Component; import java.io.BufferedReader; import java.io.IOException; @@ -21,6 +23,8 @@ import java.io.InputStreamReader; import java.util.HashSet; import java.util.Set; +@Component("browser") +@Scope("prototype") public class ApacheHttpBrowser implements Browser { private Set
headers = new HashSet<>(); private String encoding = "UTF-8"; diff --git a/src/main/java/kinosearch/webapp/SpringConfig.java b/src/main/java/kinosearch/webapp/SpringConfig.java index 348a303..1b16bb9 100644 --- a/src/main/java/kinosearch/webapp/SpringConfig.java +++ b/src/main/java/kinosearch/webapp/SpringConfig.java @@ -4,19 +4,25 @@ */ 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.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.Import; -import org.springframework.context.annotation.PropertySource; +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 -@Import(kinosearch.core.SpringConfig.class) +@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/test/java/kinosearch/core/browser/TestBrowser.java b/src/test/java/kinosearch/core/browser/TestBrowser.java index ca87a09..17a53de 100644 --- a/src/test/java/kinosearch/core/browser/TestBrowser.java +++ b/src/test/java/kinosearch/core/browser/TestBrowser.java @@ -2,9 +2,7 @@ package kinosearch.core.browser; import com.google.gson.Gson; import com.google.gson.JsonObject; -import kinosearch.core.SpringConfig; -import kinosearch.core.browser.Browser; -import static org.junit.Assert.*; +import kinosearch.webapp.SpringConfig; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; @@ -13,6 +11,8 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; import java.io.IOException; +import static org.junit.Assert.assertEquals; + @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(classes = {SpringConfig.class}) public class TestBrowser { diff --git a/src/test/java/kinosearch/core/warez/TestOnlinelife.java b/src/test/java/kinosearch/core/warez/TestOnlinelife.java index 3a696e3..29b455c 100644 --- a/src/test/java/kinosearch/core/warez/TestOnlinelife.java +++ b/src/test/java/kinosearch/core/warez/TestOnlinelife.java @@ -4,8 +4,7 @@ */ package kinosearch.core.warez; -import kinosearch.core.KinoPlay; -import kinosearch.core.SpringConfig; +import kinosearch.webapp.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 809f468..edf5a95 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.core.SpringConfig; +import kinosearch.webapp.SpringConfig; import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired;