Emelyanov535/Price_Pulse
2
1
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Feature/parsing-service: package refactor

Browse Source
This commit is contained in:
danil.markov 2024-10-14 12:46:43 +04:00
parent ef2240e8ab
commit a0271125a1
15 changed files with 31 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parsing-service/src/main/java/ru/pricepulse/parsingservice/pool/WebDriverPool.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/pool/WebDriverPool.java
View File

@ -1,4 +1,4 @@
package ru.pricepulse.parsingservice.pool; package ru.pricepulse.parsingservice.ozon_parser.pool;
import java.util.Queue; import java.util.Queue;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;

6
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/DataParser.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/DataParser.java
View File

@ -1,4 +1,4 @@
package ru.pricepulse.parsingservice.service; package ru.pricepulse.parsingservice.ozon_parser.service;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@ -6,8 +6,8 @@ import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.pricepulse.parsingservice.service.dto.ParsedData; import ru.pricepulse.parsingservice.ozon_parser.service.dto.ParsedData;
import ru.pricepulse.parsingservice.service.messaging.ParsedDataProducer; import ru.pricepulse.parsingservice.ozon_parser.service.messaging.ParsedDataProducer;
@Slf4j @Slf4j
@Service @Service

2
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/MarketplaceParsingService.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/MarketplaceParsingService.java
View File

@ -1,4 +1,4 @@
package ru.pricepulse.parsingservice.service; package ru.pricepulse.parsingservice.ozon_parser.service;
public interface MarketplaceParsingService { public interface MarketplaceParsingService {

2
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/PartitionService.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/PartitionService.java
View File

@ -1,4 +1,4 @@
package ru.pricepulse.parsingservice.service; package ru.pricepulse.parsingservice.ozon_parser.service;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;

2
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/dto/ParsedData.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/dto/ParsedData.java
View File

@ -1,4 +1,4 @@
package ru.pricepulse.parsingservice.service.dto; package ru.pricepulse.parsingservice.ozon_parser.service.dto;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;

7
parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/MarketplacePage.java Normal file
View File

@ -0,0 +1,7 @@
package ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon;
public interface MarketplacePage {
boolean isLoaded();
}

6
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/page/AccessDeniedPage.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/page/AccessDeniedPage.java
View File

@ -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 lombok.extern.slf4j.Slf4j;
import org.openqa.selenium.By; import org.openqa.selenium.By;
import org.openqa.selenium.WebDriver; 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.openqa.selenium.support.ui.WebDriverWait;
import ru.pricepulse.parsingservice.service.marketplace.ozon.MarketplacePage; import ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.MarketplacePage;
@Slf4j @Slf4j
public class AccessDeniedPage implements MarketplacePage { public class AccessDeniedPage implements MarketplacePage {

10
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/page/CategoryPage.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/page/CategoryPage.java
View File

@ -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.visibilityOfAllElements;
import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated; import static org.openqa.selenium.support.ui.ExpectedConditions.visibilityOfElementLocated;
import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.openqa.selenium.By; import org.openqa.selenium.By;
import org.openqa.selenium.StaleElementReferenceException;
import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement; import org.openqa.selenium.WebElement;
import org.openqa.selenium.support.ui.ExpectedConditions;
import org.openqa.selenium.support.ui.WebDriverWait; import org.openqa.selenium.support.ui.WebDriverWait;
import org.springframework.retry.annotation.Recover; import ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.MarketplacePage;
import org.springframework.retry.annotation.Retryable;
import ru.pricepulse.parsingservice.service.marketplace.ozon.MarketplacePage;
@Slf4j @Slf4j
public class CategoryPage implements MarketplacePage { public class CategoryPage implements MarketplacePage {

13
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/parsing/CategoryPageParsingService.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/parsing/CategoryPageParsingService.java
View File

@ -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.Duration;
import java.time.temporal.ChronoUnit; import java.time.temporal.ChronoUnit;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import lombok.extern.slf4j.Slf4j; 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.openqa.selenium.support.ui.WebDriverWait;
import org.slf4j.MDC; import org.slf4j.MDC;
import org.springframework.beans.factory.ObjectFactory;
import org.springframework.retry.annotation.Recover; import org.springframework.retry.annotation.Recover;
import org.springframework.retry.annotation.Retryable; import org.springframework.retry.annotation.Retryable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.pricepulse.parsingservice.pool.WebDriverPool; import ru.pricepulse.parsingservice.ozon_parser.pool.WebDriverPool;
import ru.pricepulse.parsingservice.service.marketplace.ozon.page.AccessDeniedPage; import ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.page.AccessDeniedPage;
import ru.pricepulse.parsingservice.service.marketplace.ozon.page.CategoryPage; import ru.pricepulse.parsingservice.ozon_parser.service.marketplace.ozon.page.CategoryPage;
@Slf4j @Slf4j
@Service @Service

17
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/parsing/ParsingService.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/marketplace/ozon/parsing/ParsingService.java
View File

@ -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.ArrayList;
import java.util.Set;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors; import java.util.concurrent.Executors;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
import lombok.extern.slf4j.Slf4j; 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 org.springframework.stereotype.Service;
import ru.pricepulse.parsingservice.service.MarketplaceParsingService; import ru.pricepulse.parsingservice.ozon_parser.service.MarketplaceParsingService;
import ru.pricepulse.parsingservice.service.marketplace.ozon.page.AccessDeniedPage;
import ru.pricepulse.parsingservice.service.marketplace.ozon.page.CategoryPage;
@Slf4j @Slf4j
@Service @Service

4
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/messaging/ParsedDataProducer.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/messaging/ParsedDataProducer.java
View File

@ -1,9 +1,9 @@
package ru.pricepulse.parsingservice.service.messaging; package ru.pricepulse.parsingservice.ozon_parser.service.messaging;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.kafka.core.KafkaTemplate; import org.springframework.kafka.core.KafkaTemplate;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.pricepulse.parsingservice.service.dto.ParsedData; import ru.pricepulse.parsingservice.ozon_parser.service.dto.ParsedData;
@Service @Service
@RequiredArgsConstructor @RequiredArgsConstructor

2
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/request/PageFetcher.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/request/PageFetcher.java
View File

@ -1,4 +1,4 @@
package ru.pricepulse.parsingservice.service.request; package ru.pricepulse.parsingservice.ozon_parser.service.request;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;

4
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/scheduler/OzonProductUpdater.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/scheduler/OzonProductUpdater.java
View File

@ -1,10 +1,10 @@
package ru.pricepulse.parsingservice.service.scheduler; package ru.pricepulse.parsingservice.ozon_parser.service.scheduler;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.pricepulse.parsingservice.config.properties.OzonConfigProperties; 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 @Service
@RequiredArgsConstructor @RequiredArgsConstructor

4
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/scheduler/PartitionScheduler.java → parsing-service/src/main/java/ru/pricepulse/parsingservice/ozon_parser/service/scheduler/PartitionScheduler.java
View File

@ -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.LocalDate;
import java.time.format.DateTimeFormatter; import java.time.format.DateTimeFormatter;
@ -8,7 +8,7 @@ import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import ru.pricepulse.parsingservice.service.PartitionService; import ru.pricepulse.parsingservice.ozon_parser.service.PartitionService;
@Slf4j @Slf4j
@Service @Service

7
parsing-service/src/main/java/ru/pricepulse/parsingservice/service/marketplace/ozon/MarketplacePage.java
View File

@ -1,7 +0,0 @@
package ru.pricepulse.parsingservice.service.marketplace.ozon;
public interface MarketplacePage {
boolean isLoaded();
}