diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/pool/WebDriverPool.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/pool/WebDriverPool.java similarity index 97% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/pool/WebDriverPool.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/pool/WebDriverPool.java index 9f1cf3f..b5d4705 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/pool/WebDriverPool.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/pool/WebDriverPool.java @@ -1,4 +1,4 @@ -package ru.pricepulse.parsingservice.pool; +package ru.pricepulse.parsingservice.ozon_parser.pool; import java.util.Queue; import java.util.concurrent.ConcurrentLinkedQueue; diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/DataParser.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/DataParser.java similarity index 83% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/DataParser.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/DataParser.java index 27ca290..4eb5606 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/DataParser.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/DataParser.java @@ -1,4 +1,4 @@ -package ru.pricepulse.parsingservice.service; +package ru.pricepulse.parsingservice.ozon_parser.service; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; @@ -6,8 +6,8 @@ import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.springframework.stereotype.Service; -import ru.pricepulse.parsingservice.service.dto.ParsedData; -import ru.pricepulse.parsingservice.service.messaging.ParsedDataProducer; +import ru.pricepulse.parsingservice.ozon_parser.service.dto.ParsedData; +import ru.pricepulse.parsingservice.ozon_parser.service.messaging.ParsedDataProducer; @Slf4j @Service diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/MarketplaceParsingService.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/MarketplaceParsingService.java similarity index 62% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/MarketplaceParsingService.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/MarketplaceParsingService.java index c811f2b..e767aa0 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/MarketplaceParsingService.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/MarketplaceParsingService.java @@ -1,4 +1,4 @@ -package ru.pricepulse.parsingservice.service; +package ru.pricepulse.parsingservice.ozon_parser.service; public interface MarketplaceParsingService { diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/PartitionService.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/PartitionService.java similarity index 93% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/PartitionService.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/PartitionService.java index edb4e72..2371095 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/PartitionService.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/PartitionService.java @@ -1,4 +1,4 @@ -package ru.pricepulse.parsingservice.service; +package ru.pricepulse.parsingservice.ozon_parser.service; import lombok.RequiredArgsConstructor; import org.springframework.jdbc.core.JdbcTemplate; diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/dto/ParsedData.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/dto/ParsedData.java similarity index 84% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/dto/ParsedData.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/dto/ParsedData.java index 6adeb5e..5c9192f 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/dto/ParsedData.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/dto/ParsedData.java @@ -1,4 +1,4 @@ -package ru.pricepulse.parsingservice.service.dto; +package ru.pricepulse.parsingservice.ozon_parser.service.dto; import lombok.Getter; import lombok.Setter; diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/MarketplacePage.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/MarketplacePage.java new file mode 100644 index 0000000..20462c5 --- /dev/null +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/MarketplacePage.java @@ -0,0 +1,7 @@ +package ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon; + +public interface MarketplacePage { + + boolean isLoaded(); + +} diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/page/AccessDeniedPage.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/page/AccessDeniedPage.java similarity index 90% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/page/AccessDeniedPage.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/page/AccessDeniedPage.java index d2cd51c..e5d2d61 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/page/AccessDeniedPage.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/page/AccessDeniedPage.java @@ -1,12 +1,10 @@ -package ru.pricepulse.parsingservice.service.marketplace.ozon.page; +package ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.page; import lombok.extern.slf4j.Slf4j; import org.openqa.selenium.By; import org.openqa.selenium.WebDriver; -import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import ru.pricepulse.parsingservice.service.marketplace.ozon.MarketplacePage; +import ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.MarketplacePage; @Slf4j public class AccessDeniedPage implements MarketplacePage { diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/page/CategoryPage.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/page/CategoryPage.java similarity index 86% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/page/CategoryPage.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/page/CategoryPage.java index 29b97f8..712957b 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/page/CategoryPage.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/page/CategoryPage.java @@ -1,24 +1,18 @@ -package ru.pricepulse.parsingservice.service.marketplace.ozon.page; +package ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.page; import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfAllElements; import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated; -import java.util.ArrayList; -import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; import lombok.extern.slf4j.Slf4j; import org.openqa.selenium.By; -import org.openqa.selenium.StaleElementReferenceException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; -import org.openqa.selenium.support.ui.ExpectedConditions; import org.openqa.selenium.support.ui.WebDriverWait; -import org.springframework.retry.annotation.Recover; -import org.springframework.retry.annotation.Retryable; -import ru.pricepulse.parsingservice.service.marketplace.ozon.MarketplacePage; +import ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.MarketplacePage; @Slf4j public class CategoryPage implements MarketplacePage { diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/parsing/CategoryPageParsingService.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/parsing/CategoryPageParsingService.java similarity index 91% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/parsing/CategoryPageParsingService.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/parsing/CategoryPageParsingService.java index 1229367..7257435 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/parsing/CategoryPageParsingService.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/parsing/CategoryPageParsingService.java @@ -1,27 +1,22 @@ -package ru.pricepulse.parsingservice.service.marketplace.ozon.parsing; +package ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.parsing; import java.time.Duration; import java.time.temporal.ChronoUnit; import java.util.ArrayList; -import java.util.List; import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import lombok.extern.slf4j.Slf4j; -import org.openqa.selenium.JavascriptExecutor; -import org.openqa.selenium.StaleElementReferenceException; -import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.ui.WebDriverWait; import org.slf4j.MDC; -import org.springframework.beans.factory.ObjectFactory; import org.springframework.retry.annotation.Recover; import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; -import ru.pricepulse.parsingservice.pool.WebDriverPool; -import ru.pricepulse.parsingservice.service.marketplace.ozon.page.AccessDeniedPage; -import ru.pricepulse.parsingservice.service.marketplace.ozon.page.CategoryPage; +import ru.pricepulse.parsingservice.ozon_parser.pool.WebDriverPool; +import ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.page.AccessDeniedPage; +import ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.page.CategoryPage; @Slf4j @Service diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/parsing/ParsingService.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/parsing/ParsingService.java similarity index 65% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/parsing/ParsingService.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/parsing/ParsingService.java index f5999d2..d2a56c4 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/parsing/ParsingService.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/parsing/ParsingService.java @@ -1,26 +1,13 @@ -package ru.pricepulse.parsingservice.service.marketplace.ozon.parsing; +package ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.parsing; -import java.time.Duration; -import java.time.temporal.ChronoUnit; import java.util.ArrayList; -import java.util.Set; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; import lombok.extern.slf4j.Slf4j; -import org.openqa.selenium.JavascriptExecutor; -import org.openqa.selenium.StaleElementReferenceException; -import org.openqa.selenium.WebDriver; -import org.openqa.selenium.support.ui.WebDriverWait; -import org.slf4j.MDC; -import org.springframework.beans.factory.ObjectFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.retry.annotation.Retryable; import org.springframework.stereotype.Service; -import ru.pricepulse.parsingservice.service.MarketplaceParsingService; -import ru.pricepulse.parsingservice.service.marketplace.ozon.page.AccessDeniedPage; -import ru.pricepulse.parsingservice.service.marketplace.ozon.page.CategoryPage; +import ru.pricepulse.parsingservice.ozon_parser.service.MarketplaceParsingService; @Slf4j @Service diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/messaging/ParsedDataProducer.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/messaging/ParsedDataProducer.java similarity index 73% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/messaging/ParsedDataProducer.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/messaging/ParsedDataProducer.java index 07f5e5d..ec9fea9 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/messaging/ParsedDataProducer.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/messaging/ParsedDataProducer.java @@ -1,9 +1,9 @@ -package ru.pricepulse.parsingservice.service.messaging; +package ru.pricepulse.parsingservice.ozon_parser.service.messaging; import lombok.RequiredArgsConstructor; import org.springframework.kafka.core.KafkaTemplate; import org.springframework.stereotype.Service; -import ru.pricepulse.parsingservice.service.dto.ParsedData; +import ru.pricepulse.parsingservice.ozon_parser.service.dto.ParsedData; @Service @RequiredArgsConstructor diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/request/PageFetcher.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/request/PageFetcher.java similarity index 87% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/request/PageFetcher.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/request/PageFetcher.java index 3e4a896..1378ec6 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/request/PageFetcher.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/request/PageFetcher.java @@ -1,4 +1,4 @@ -package ru.pricepulse.parsingservice.service.request; +package ru.pricepulse.parsingservice.ozon_parser.service.request; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/scheduler/OzonProductUpdater.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/scheduler/OzonProductUpdater.java similarity index 78% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/scheduler/OzonProductUpdater.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/scheduler/OzonProductUpdater.java index 218ab96..6efbfe6 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/scheduler/OzonProductUpdater.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/scheduler/OzonProductUpdater.java @@ -1,10 +1,10 @@ -package ru.pricepulse.parsingservice.service.scheduler; +package ru.pricepulse.parsingservice.ozon_parser.service.scheduler; import lombok.RequiredArgsConstructor; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; import ru.pricepulse.parsingservice.config.properties.OzonConfigProperties; -import ru.pricepulse.parsingservice.service.marketplace.ozon.parsing.ParsingService; +import ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.parsing.ParsingService; @Service @RequiredArgsConstructor diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/scheduler/PartitionScheduler.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/scheduler/PartitionScheduler.java similarity index 93% rename from parsing-service/src/main/java/ru/pricepulse/parsingservice/service/scheduler/PartitionScheduler.java rename to parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/scheduler/PartitionScheduler.java index 99a2107..878441f 100644 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/scheduler/PartitionScheduler.java +++ b/parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/scheduler/PartitionScheduler.java @@ -1,4 +1,4 @@ -package ru.pricepulse.parsingservice.service.scheduler; +package ru.pricepulse.parsingservice.ozon_parser.service.scheduler; import java.time.LocalDate; import java.time.format.DateTimeFormatter; @@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Service; -import ru.pricepulse.parsingservice.service.PartitionService; +import ru.pricepulse.parsingservice.ozon_parser.service.PartitionService; @Slf4j @Service diff --git a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/MarketplacePage.java b/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/MarketplacePage.java deleted file mode 100644 index 02c81c6..0000000 --- a/parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/MarketplacePage.java +++ /dev/null @@ -1,7 +0,0 @@ -package ru.pricepulse.parsingservice.service.marketplace.ozon; - -public interface MarketplacePage { - - boolean isLoaded(); - -}