From c70129ae9d464c904486b9b8abb9f189205a4d16 Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Thu, 25 May 2017 15:14:38 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=81?= =?UTF-8?q?=D1=82=D0=B8=D0=BB=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D1=8B=20?= =?UTF-8?q?=D1=81=D0=B2=D1=8F=D0=B7=D0=B0=D0=BD=D0=BD=D1=8B=D0=B5=20=D1=81?= =?UTF-8?q?=20=D0=B1=D0=B0=D0=B7=D0=BE=D0=B9=20=D0=B2=20=D0=BE=D1=82=D0=B4?= =?UTF-8?q?=D0=B5=D0=BB=D1=8C=D0=BD=D1=8B=D0=B9=20=D0=BF=D0=B0=D0=BA=D0=B5?= =?UTF-8?q?=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kinosearch3/{spider => base}/BaseRepository.java | 2 +- .../kinosearch3/{spider => base}/CinemaDocument.java | 2 +- .../kinosearch3/{spider => base}/MongoDBRepository.java | 2 +- .../java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java | 4 ++-- .../java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java | 4 ++-- src/main/java/kinosearch/kinosearch3/webpp/SpringConfig.java | 4 ++-- .../java/kinosearch/kinosearch3/webpp/WebAppController.java | 4 ++-- src/main/resources/kinosearch/kinosearch3/spider/spring.xml | 2 +- .../kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java | 2 +- .../kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java | 2 +- .../resources/kinosearch/kinosearch3/spider/test-spring.xml | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) rename src/main/java/kinosearch/kinosearch3/{spider => base}/BaseRepository.java (84%) rename src/main/java/kinosearch/kinosearch3/{spider => base}/CinemaDocument.java (94%) rename src/main/java/kinosearch/kinosearch3/{spider => base}/MongoDBRepository.java (96%) diff --git a/src/main/java/kinosearch/kinosearch3/spider/BaseRepository.java b/src/main/java/kinosearch/kinosearch3/base/BaseRepository.java similarity index 84% rename from src/main/java/kinosearch/kinosearch3/spider/BaseRepository.java rename to src/main/java/kinosearch/kinosearch3/base/BaseRepository.java index b2a6bdd..f76d4df 100644 --- a/src/main/java/kinosearch/kinosearch3/spider/BaseRepository.java +++ b/src/main/java/kinosearch/kinosearch3/base/BaseRepository.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-04-06 */ -package kinosearch.kinosearch3.spider; +package kinosearch.kinosearch3.base; import java.util.List; diff --git a/src/main/java/kinosearch/kinosearch3/spider/CinemaDocument.java b/src/main/java/kinosearch/kinosearch3/base/CinemaDocument.java similarity index 94% rename from src/main/java/kinosearch/kinosearch3/spider/CinemaDocument.java rename to src/main/java/kinosearch/kinosearch3/base/CinemaDocument.java index 58f2e2c..6da51a2 100644 --- a/src/main/java/kinosearch/kinosearch3/spider/CinemaDocument.java +++ b/src/main/java/kinosearch/kinosearch3/base/CinemaDocument.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-04-02 */ -package kinosearch.kinosearch3.spider; +package kinosearch.kinosearch3.base; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/main/java/kinosearch/kinosearch3/spider/MongoDBRepository.java b/src/main/java/kinosearch/kinosearch3/base/MongoDBRepository.java similarity index 96% rename from src/main/java/kinosearch/kinosearch3/spider/MongoDBRepository.java rename to src/main/java/kinosearch/kinosearch3/base/MongoDBRepository.java index 738bf26..f277e64 100644 --- a/src/main/java/kinosearch/kinosearch3/spider/MongoDBRepository.java +++ b/src/main/java/kinosearch/kinosearch3/base/MongoDBRepository.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-04-06 */ -package kinosearch.kinosearch3.spider; +package kinosearch.kinosearch3.base; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java b/src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java index d00fddb..6ce1ccb 100644 --- a/src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java +++ b/src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java @@ -5,8 +5,8 @@ package kinosearch.kinosearch3.cinema; import kinosearch.kinosearch3.browser.Browser; -import kinosearch.kinosearch3.spider.BaseRepository; -import kinosearch.kinosearch3.spider.CinemaDocument; +import kinosearch.kinosearch3.base.BaseRepository; +import kinosearch.kinosearch3.base.CinemaDocument; import kinosearch.kinosearch3.spider.FileDownloader; import kinosearch.kinosearch3.spider.ScannerCinema; import org.jsoup.Jsoup; diff --git a/src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java b/src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java index 67c3b19..700627d 100644 --- a/src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java +++ b/src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java @@ -5,8 +5,8 @@ package kinosearch.kinosearch3.cinema; import kinosearch.kinosearch3.browser.Browser; -import kinosearch.kinosearch3.spider.BaseRepository; -import kinosearch.kinosearch3.spider.CinemaDocument; +import kinosearch.kinosearch3.base.BaseRepository; +import kinosearch.kinosearch3.base.CinemaDocument; import kinosearch.kinosearch3.spider.FileDownloader; import kinosearch.kinosearch3.spider.ScannerCinema; import org.jsoup.Jsoup; diff --git a/src/main/java/kinosearch/kinosearch3/webpp/SpringConfig.java b/src/main/java/kinosearch/kinosearch3/webpp/SpringConfig.java index 6d9d031..757b97a 100644 --- a/src/main/java/kinosearch/kinosearch3/webpp/SpringConfig.java +++ b/src/main/java/kinosearch/kinosearch3/webpp/SpringConfig.java @@ -6,8 +6,8 @@ package kinosearch.kinosearch3.webpp; import com.mongodb.Mongo; import com.mongodb.MongoClient; -import kinosearch.kinosearch3.spider.BaseRepository; -import kinosearch.kinosearch3.spider.MongoDBRepository; +import kinosearch.kinosearch3.base.BaseRepository; +import kinosearch.kinosearch3.base.MongoDBRepository; import org.springframework.beans.factory.annotation.Value; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java b/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java index 86ce00b..281e8e7 100644 --- a/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java +++ b/src/main/java/kinosearch/kinosearch3/webpp/WebAppController.java @@ -4,8 +4,8 @@ */ package kinosearch.kinosearch3.webpp; -import kinosearch.kinosearch3.spider.BaseRepository; -import kinosearch.kinosearch3.spider.CinemaDocument; +import kinosearch.kinosearch3.base.BaseRepository; +import kinosearch.kinosearch3.base.CinemaDocument; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/main/resources/kinosearch/kinosearch3/spider/spring.xml b/src/main/resources/kinosearch/kinosearch3/spider/spring.xml index 3543420..c5e1569 100644 --- a/src/main/resources/kinosearch/kinosearch3/spider/spring.xml +++ b/src/main/resources/kinosearch/kinosearch3/spider/spring.xml @@ -23,7 +23,7 @@ - + diff --git a/src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java b/src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java index ce6ad88..cdc7e15 100644 --- a/src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java +++ b/src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java @@ -4,7 +4,7 @@ */ package kinosearch.kinosearch3.cinema; -import kinosearch.kinosearch3.spider.CinemaDocument; +import kinosearch.kinosearch3.base.CinemaDocument; import org.junit.*; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java b/src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java index 879efc1..78276e2 100644 --- a/src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java +++ b/src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java @@ -4,7 +4,7 @@ */ package kinosearch.kinosearch3.cinema; -import kinosearch.kinosearch3.spider.CinemaDocument; +import kinosearch.kinosearch3.base.CinemaDocument; import org.junit.*; import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; diff --git a/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml b/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml index 2c7b8dc..d50c828 100644 --- a/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml +++ b/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml @@ -14,7 +14,7 @@ - +