From 78b95eb2cb47d67472428692e7bc828476fbb9b0 Mon Sep 17 00:00:00 2001
From: DmitriyMX <dimon550@gmail.com>
Date: Mon, 7 Jan 2019 18:27:59 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9E=D0=BF=D1=80=D0=B5=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D1=8F=D0=B5=D0=BC=20=D1=81=D0=B5=D1=80=D0=B2=D0=B8=D1=81=20?=
 =?UTF-8?q?=D0=B4=D0=BB=D1=8F=20=D0=BF=D0=BE=D0=BB=D1=83=D1=87=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D1=8F=20=D0=B4=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BE=20?=
 =?UTF-8?q?=D0=B2=D0=B8=D0=B4=D0=B5=D0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/ks/server/SpringConfigMVC.java  |  7 ++++++-
 .../ks/server/controllers/WebController.java  | 11 +++--------
 .../java/ks/server/service/CinemaService.java | 19 +++++++++++++++++++
 3 files changed, 28 insertions(+), 9 deletions(-)
 create mode 100644 ks.server/src/main/java/ks/server/service/CinemaService.java

diff --git a/ks.server/src/main/java/ks/server/SpringConfigMVC.java b/ks.server/src/main/java/ks/server/SpringConfigMVC.java
index 030103b..5d54fe4 100644
--- a/ks.server/src/main/java/ks/server/SpringConfigMVC.java
+++ b/ks.server/src/main/java/ks/server/SpringConfigMVC.java
@@ -11,7 +11,12 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import java.util.List;
 
 @Configuration
-@ComponentScan({ "ks.server.controllers", "ks.server.browser", "ks.server.cinema" })
+@ComponentScan({
+        "ks.server.controllers",
+        "ks.server.browser",
+        "ks.server.cinema",
+        "ks.server.service"
+})
 @EnableWebMvc
 public class SpringConfigMVC implements WebMvcConfigurer {
     @Override
diff --git a/ks.server/src/main/java/ks/server/controllers/WebController.java b/ks.server/src/main/java/ks/server/controllers/WebController.java
index 66ffa35..f1e94de 100644
--- a/ks.server/src/main/java/ks/server/controllers/WebController.java
+++ b/ks.server/src/main/java/ks/server/controllers/WebController.java
@@ -1,7 +1,7 @@
 package ks.server.controllers;
 
-import ks.server.browser.Browser;
 import ks.server.cinema.Animevost;
+import ks.server.service.CinemaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.MediaType;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -19,7 +19,7 @@ import java.util.Map;
         produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
 public class WebController {
     @Autowired
-    private Browser browser;
+    private CinemaService cinemaService;
 
     private String subpath(String requestUri, String marker) {
         return requestUri.substring(requestUri.indexOf(marker) + marker.length());
@@ -32,11 +32,6 @@ public class WebController {
 
     @RequestMapping(path = "/c/animevost/info/**")
     public Animevost animevostInfo(HttpServletRequest request) {
-        final String path = subpath(request.getRequestURI(), "/info/");
-
-        Animevost animevost = new Animevost();
-        animevost.fillInfo(path, browser);
-
-        return animevost;
+        return cinemaService.getCinema(subpath(request.getRequestURI(), "/info/"));
     }
 }
diff --git a/ks.server/src/main/java/ks/server/service/CinemaService.java b/ks.server/src/main/java/ks/server/service/CinemaService.java
new file mode 100644
index 0000000..fac5ad1
--- /dev/null
+++ b/ks.server/src/main/java/ks/server/service/CinemaService.java
@@ -0,0 +1,19 @@
+package ks.server.service;
+
+import ks.server.browser.Browser;
+import ks.server.cinema.Animevost;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Service;
+
+@Service
+public class CinemaService {
+    @Autowired
+    private ApplicationContext applicationContext;
+
+    public Animevost getCinema(String uri) {
+        Animevost animevost = new Animevost();
+        animevost.fillInfo(uri, applicationContext.getBean(Browser.class));
+        return animevost;
+    }
+}