Voomra/KinoSearch
0
Fork 0
Code Activity

Перемещение классов

Browse Source
This commit is contained in:
DmitriyMX
2017-04-07 12:47:45 +03:00
parent 369ba8aa6c
commit e0069837b3
6 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/kinosearch/kinosearch3/cinema/onlinelife/ScannerImpl.java → src/main/java/kinosearch/kinosearch3/cinema/OnlinelifeScanner.java
View File

@@ -2,7 +2,7 @@
* DmitriyMX <dimon550@gmail.com> * DmitriyMX <dimon550@gmail.com>
* 2017-04-01 * 2017-04-01
*/ */
package kinosearch.kinosearch3.cinema.onlinelife; package kinosearch.kinosearch3.cinema;
import kinosearch.kinosearch3.browser.Browser; import kinosearch.kinosearch3.browser.Browser;
import kinosearch.kinosearch3.spider.BaseRepository; import kinosearch.kinosearch3.spider.BaseRepository;
@@ -16,13 +16,13 @@ import org.jsoup.select.Elements;
import java.io.File; import java.io.File;
public class ScannerImpl implements ScannerCinema { public class OnlinelifeScanner implements ScannerCinema {
private FileDownloader fileDownloader; private FileDownloader fileDownloader;
private Browser browser; private Browser browser;
private File saveToDir; private File saveToDir;
private BaseRepository repository; 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.fileDownloader = fileDownloader;
this.browser = browser; this.browser = browser;
this.saveToDir = saveToDir; this.saveToDir = saveToDir;

6
src/main/java/kinosearch/kinosearch3/cinema/seasonvar/ScannerImpl.java → src/main/java/kinosearch/kinosearch3/cinema/SeasonvarScanner.java
View File

@@ -2,7 +2,7 @@
* DmitriyMX <dimon550@gmail.com> * DmitriyMX <dimon550@gmail.com>
* 2017-04-02 * 2017-04-02
*/ */
package kinosearch.kinosearch3.cinema.seasonvar; package kinosearch.kinosearch3.cinema;
import kinosearch.kinosearch3.browser.Browser; import kinosearch.kinosearch3.browser.Browser;
import kinosearch.kinosearch3.spider.BaseRepository; import kinosearch.kinosearch3.spider.BaseRepository;
@@ -16,14 +16,14 @@ import org.jsoup.select.Elements;
import java.io.File; import java.io.File;
public class ScannerImpl implements ScannerCinema { public class SeasonvarScanner implements ScannerCinema {
private static final String DOMAIN = "http://seasonvar.ru/"; private static final String DOMAIN = "http://seasonvar.ru/";
private final FileDownloader fileDownloader; private final FileDownloader fileDownloader;
private final Browser browser; private final Browser browser;
private final File saveTo; private final File saveTo;
private final BaseRepository repository; 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.fileDownloader = fileDownloader;
this.browser = browser; this.browser = browser;
this.saveTo = saveTo; this.saveTo = saveTo;

4
src/main/resources/kinosearch/kinosearch3/spider/spring.xml
View File

@@ -36,7 +36,7 @@
<property name="encoding" value="utf-8"/> <property name="encoding" value="utf-8"/>
</bean> </bean>
<bean id="onlinelifeScanner" class="kinosearch.kinosearch3.cinema.onlinelife.ScannerImpl"> <bean id="onlinelifeScanner" class="kinosearch.kinosearch3.cinema.OnlinelifeScanner">
<constructor-arg name="fileDownloader" ref="fileDownloader"/> <constructor-arg name="fileDownloader" ref="fileDownloader"/>
<constructor-arg name="browser"> <constructor-arg name="browser">
<bean parent="browser"> <bean parent="browser">
@@ -47,7 +47,7 @@
<constructor-arg name="repository" ref="repository"/> <constructor-arg name="repository" ref="repository"/>
</bean> </bean>
<bean id="seasonvarScanner" class="kinosearch.kinosearch3.cinema.seasonvar.ScannerImpl"> <bean id="seasonvarScanner" class="kinosearch.kinosearch3.cinema.SeasonvarScanner">
<constructor-arg name="fileDownloader" ref="fileDownloader"/> <constructor-arg name="fileDownloader" ref="fileDownloader"/>
<constructor-arg name="browser" ref="browser"/> <constructor-arg name="browser" ref="browser"/>
<constructor-arg name="saveTo" value="file:R:/seasonvar"/> <constructor-arg name="saveTo" value="file:R:/seasonvar"/>

5
src/test/java/kinosearch/kinosearch3/cinema/onlinelife/OnlinelifeScannerTest.java → src/test/java/kinosearch/kinosearch3/cinema/OnlinelifeScannerTest.java
View File

@@ -2,9 +2,10 @@
* DmitriyMX <dimon550@gmail.com> * DmitriyMX <dimon550@gmail.com>
* 2017-04-07 * 2017-04-07
*/ */
package kinosearch.kinosearch3.cinema.onlinelife; package kinosearch.kinosearch3.cinema;
import kinosearch.kinosearch3.cinema.AbstractScannerTest; import kinosearch.kinosearch3.cinema.AbstractScannerTest;
import kinosearch.kinosearch3.cinema.OnlinelifeScanner;
import kinosearch.kinosearch3.spider.CinemaDocument; import kinosearch.kinosearch3.spider.CinemaDocument;
import org.junit.*; import org.junit.*;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -19,7 +20,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
public class OnlinelifeScannerTest extends AbstractScannerTest { public class OnlinelifeScannerTest extends AbstractScannerTest {
@Autowired @Autowired
@Qualifier("onlinelifeScanner") @Qualifier("onlinelifeScanner")
private ScannerImpl scanner; private OnlinelifeScanner scanner;
@Autowired @Autowired
@Qualifier("mongoTemplate") @Qualifier("mongoTemplate")

6
src/test/java/kinosearch/kinosearch3/cinema/seasonvar/SeasonvarScannerTest.java → src/test/java/kinosearch/kinosearch3/cinema/SeasonvarScannerTest.java
View File

@@ -2,10 +2,10 @@
* DmitriyMX <dimon550@gmail.com> * DmitriyMX <dimon550@gmail.com>
* 2017-04-06 * 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.AbstractScannerTest;
import kinosearch.kinosearch3.cinema.SeasonvarScanner;
import kinosearch.kinosearch3.spider.CinemaDocument; import kinosearch.kinosearch3.spider.CinemaDocument;
import org.junit.*; import org.junit.*;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -20,7 +20,7 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
public class SeasonvarScannerTest extends AbstractScannerTest { public class SeasonvarScannerTest extends AbstractScannerTest {
@Autowired @Autowired
@Qualifier("seasonvarScanner") @Qualifier("seasonvarScanner")
private ScannerImpl scanner; private SeasonvarScanner scanner;
@Autowired @Autowired
@Qualifier("mongoTemplate") @Qualifier("mongoTemplate")

4
src/test/resources/kinosearch/kinosearch3/spider/test-spring.xml
View File

@@ -24,14 +24,14 @@
<property name="encoding" value="utf-8"/> <property name="encoding" value="utf-8"/>
</bean> </bean>
<bean id="onlinelifeScanner" class="kinosearch.kinosearch3.cinema.onlinelife.ScannerImpl"> <bean id="onlinelifeScanner" class="kinosearch.kinosearch3.cinema.OnlinelifeScanner">
<constructor-arg name="fileDownloader" ref="fileDownloader"/> <constructor-arg name="fileDownloader" ref="fileDownloader"/>
<constructor-arg name="browser" ref="browser"/> <constructor-arg name="browser" ref="browser"/>
<constructor-arg name="saveToDir" value="file:R:/onlinelife"/> <constructor-arg name="saveToDir" value="file:R:/onlinelife"/>
<constructor-arg name="repository" ref="repository"/> <constructor-arg name="repository" ref="repository"/>
</bean> </bean>
<bean id="seasonvarScanner" class="kinosearch.kinosearch3.cinema.seasonvar.ScannerImpl"> <bean id="seasonvarScanner" class="kinosearch.kinosearch3.cinema.SeasonvarScanner">
<constructor-arg name="fileDownloader" ref="fileDownloader"/> <constructor-arg name="fileDownloader" ref="fileDownloader"/>
<constructor-arg name="browser" ref="browser"/> <constructor-arg name="browser" ref="browser"/>
<constructor-arg name="saveTo" value="file:R:/seasonvar"/> <constructor-arg name="saveTo" value="file:R:/seasonvar"/>