From e0069837b363fd4a035bfd4b367e1620cf31edcd Mon Sep 17 00:00:00 2001 From: DmitriyMX Date: Fri, 7 Apr 2017 12:47:45 +0300 Subject: [PATCH] =?UTF-8?q?=D0=9F=D0=B5=D1=80=D0=B5=D0=BC=D0=B5=D1=89?= =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81=D0=BE?= =?UTF-8?q?=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../{onlinelife/ScannerImpl.java => OnlinelifeScanner.java} | 6 +++--- .../{seasonvar/ScannerImpl.java => SeasonvarScanner.java} | 6 +++--- src/main/resources/kinosearch/kinosearch3/spider/spring.xml | 4 ++-- .../cinema/{onlinelife => }/OnlinelifeScannerTest.java | 5 +++-- .../cinema/{seasonvar => }/SeasonvarScannerTest.java | 6 +++--- .../resources/kinosearch/kinosearch3/spider/test-spring.xml | 4 ++-- 6 files changed, 16 insertions(+), 15 deletions(-) rename src/main/java/kinosearch/kinosearch3/cinema/{onlinelife/ScannerImpl.java => OnlinelifeScanner.java} (92%) rename src/main/java/kinosearch/kinosearch3/cinema/{seasonvar/ScannerImpl.java => SeasonvarScanner.java} (90%) rename src/test/java/kinosearch/kinosearch3/cinema/{onlinelife => }/OnlinelifeScannerTest.java (90%) rename src/test/java/kinosearch/kinosearch3/cinema/{seasonvar => }/SeasonvarScannerTest.java (90%) diff --git a/src/main/java/kinosearch/kinosearch3/cinema/onlinelife/ScannerImpl.java b/src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java similarity index 92% rename from src/main/java/kinosearch/kinosearch3/cinema/onlinelife/ScannerImpl.java rename to src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java index 91d3ab2..c47e669 100644 --- a/src/main/java/kinosearch/kinosearch3/cinema/onlinelife/ScannerImpl.java +++ b/src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-04-01 */ -package kinosearch.kinosearch3.cinema.onlinelife; +package kinosearch.kinosearch3.cinema; import kinosearch.kinosearch3.browser.Browser; import kinosearch.kinosearch3.spider.BaseRepository; @@ -16,13 +16,13 @@ import org.jsoup.select.Elements; import java.io.File; -public class ScannerImpl implements ScannerCinema { +public class OnlinelifeScanner implements ScannerCinema { private FileDownloader fileDownloader; private Browser browser; private File saveToDir; private BaseRepository repository; - public ScannerImpl(FileDownloader fileDownloader, Browser browser, File saveToDir, BaseRepository repository) { + public OnlinelifeScanner(FileDownloader fileDownloader, Browser browser, File saveToDir, BaseRepository repository) { this.fileDownloader = fileDownloader; this.browser = browser; this.saveToDir = saveToDir; diff --git a/src/main/java/kinosearch/kinosearch3/cinema/seasonvar/ScannerImpl.java b/src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java similarity index 90% rename from src/main/java/kinosearch/kinosearch3/cinema/seasonvar/ScannerImpl.java rename to src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java index 5461ea1..48760ba 100644 --- a/src/main/java/kinosearch/kinosearch3/cinema/seasonvar/ScannerImpl.java +++ b/src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java @@ -2,7 +2,7 @@ * DmitriyMX * 2017-04-02 */ -package kinosearch.kinosearch3.cinema.seasonvar; +package kinosearch.kinosearch3.cinema; import kinosearch.kinosearch3.browser.Browser; import kinosearch.kinosearch3.spider.BaseRepository; @@ -16,14 +16,14 @@ import org.jsoup.select.Elements; import java.io.File; -public class ScannerImpl implements ScannerCinema { +public class SeasonvarScanner implements ScannerCinema { private static final String DOMAIN = "http://seasonvar.ru/"; private final FileDownloader fileDownloader; private final Browser browser; private final File saveTo; private final BaseRepository repository; - public ScannerImpl(FileDownloader fileDownloader, Browser browser, File saveTo, BaseRepository repository) { + public SeasonvarScanner(FileDownloader fileDownloader, Browser browser, File saveTo, BaseRepository repository) { this.fileDownloader = fileDownloader; this.browser = browser; this.saveTo = saveTo; diff --git a/src/main/resources/kinosearch/kinosearch3/spider/spring.xml b/src/main/resources/kinosearch/kinosearch3/spider/spring.xml index c680c68..8f66353 100644 --- a/src/main/resources/kinosearch/kinosearch3/spider/spring.xml +++ b/src/main/resources/kinosearch/kinosearch3/spider/spring.xml @@ -36,7 +36,7 @@ - + @@ -47,7 +47,7 @@ - + diff --git a/src/test/java/kinosearch/kinosearch3/cinema/onlinelife/OnlinelifeScannerTest.java b/src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java similarity index 90% rename from src/test/java/kinosearch/kinosearch3/cinema/onlinelife/OnlinelifeScannerTest.java rename to src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java index 4b60256..9451a7e 100644 --- a/src/test/java/kinosearch/kinosearch3/cinema/onlinelife/OnlinelifeScannerTest.java +++ b/src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java @@ -2,9 +2,10 @@ * DmitriyMX * 2017-04-07 */ -package kinosearch.kinosearch3.cinema.onlinelife; +package kinosearch.kinosearch3.cinema; import kinosearch.kinosearch3.cinema.AbstractScannerTest; +import kinosearch.kinosearch3.cinema.OnlinelifeScanner; import kinosearch.kinosearch3.spider.CinemaDocument; import org.junit.*; import org.junit.runner.RunWith; @@ -19,7 +20,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class OnlinelifeScannerTest extends AbstractScannerTest { @Autowired @Qualifier("onlinelifeScanner") - private ScannerImpl scanner; + private OnlinelifeScanner scanner; @Autowired @Qualifier("mongoTemplate") diff --git a/src/test/java/kinosearch/kinosearch3/cinema/seasonvar/SeasonvarScannerTest.java b/src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java similarity index 90% rename from src/test/java/kinosearch/kinosearch3/cinema/seasonvar/SeasonvarScannerTest.java rename to src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java index 9b209a7..0f85420 100644 --- a/src/test/java/kinosearch/kinosearch3/cinema/seasonvar/SeasonvarScannerTest.java +++ b/src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java @@ -2,10 +2,10 @@ * DmitriyMX * 2017-04-06 */ -package kinosearch.kinosearch3.cinema.seasonvar; +package kinosearch.kinosearch3.cinema; -import com.mongodb.CommandResult; import kinosearch.kinosearch3.cinema.AbstractScannerTest; +import kinosearch.kinosearch3.cinema.SeasonvarScanner; import kinosearch.kinosearch3.spider.CinemaDocument; import org.junit.*; import org.junit.runner.RunWith; @@ -20,7 +20,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; public class SeasonvarScannerTest extends AbstractScannerTest { @Autowired @Qualifier("seasonvarScanner") - private ScannerImpl scanner; + private SeasonvarScanner scanner; @Autowired @Qualifier("mongoTemplate") diff --git a/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml b/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml index b94f3c7..f5e6e08 100644 --- a/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml +++ b/src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml @@ -24,14 +24,14 @@ - + - +