diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index 8d75872..b1d4ac6 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -11,29 +11,45 @@ on: types: [opened, synchronize, reopened] jobs: + build: runs-on: ubuntu-latest + strategy: + matrix: + distribution: [ 'adopt' ] + java: [ '8', '11', '13' ] + name: Build project with Java ${{ matrix.Java }} (${{ matrix.distribution }}) steps: - uses: actions/checkout@v2 - - name: Set up JDK 11 + + - name: Set up JDK uses: actions/setup-java@v2 with: - java-version: '11' - distribution: 'adopt' - - name: Grant execute permission for gradlew - run: chmod +x gradlew - + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.java }} + cache: 'gradle' - name: Build with Gradle run: ./gradlew --build-cache assemble -# - name: Test with Gradle -# run: ./gradlew check + test: + runs-on: ubuntu-latest + needs: build + strategy: + matrix: + distribution: [ 'adopt' ] + java: [ '11', '13' ] + name: Testing with Java ${{ matrix.Java }} (${{ matrix.distribution }}) + steps: + - uses: actions/checkout@v2 + - name: Set up JDK + uses: actions/setup-java@v2 + with: + distribution: ${{ matrix.distribution }} + java-version: ${{ matrix.java }} + cache: 'gradle' - name: Generate test report with Gradle env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }} run: ./gradlew test integrationTest jacocoTestReport sonarqube -Dsonar.verbose=true - -# - name: Upload a Build Artifact -# run: ./gradlew publish diff --git a/.gitignore b/.gitignore index 9b81ed4..8104c72 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ .gradle /build/ /.idea/ +logs # Ignore Gradle GUI config gradle-app.setting @@ -12,8 +13,6 @@ gradle-app.setting # # Work around https://youtrack.jetbrains.com/issue/IDEA-116898 # gradle/wrapper/gradle-wrapper.properties - - # From https://github.com/github/gitignore/blob/master/Java.gitignore *.class @@ -101,4 +100,4 @@ Icon .AppleDesktop Network Trash Folder Temporary Items -.apdisk \ No newline at end of file +.apdisk diff --git a/README.md b/README.md index d22dd44..9d75e71 100644 --- a/README.md +++ b/README.md @@ -4,3 +4,65 @@ # loteria-crawlers Web Crawler para buscar os resultados dos jogos das loterias da caixa + +## Requisitos do projeto + +- Java 8 ou mais recente + +> Código compilado com compatibilidade do Java 8, porém durante a execução da pipeline, onde executa testes unitários e de integração, utiliza versão 11. + +### Executando no console os testes unitários do projeto + +```shell +$ ./gradlew test +``` +> Caso utilize Windows, você precisa substituir `./gradlew` por `.\gradlew.bat`. + +### Executando no console os testes de integração do projeto + +```shell +$ ./gradlew integrationTest +``` + +> Caso utilize Windows, você precisa substituir `./gradlew` por `.\gradlew.bat`. + +### Excemplo de utilização da biblioteca + +```java +import com.ueby.oss.loteria.crawlers.game.CaixaGameResult; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; + +public class Main { + + public static void main(String[] args) { + CaixaGameType caixaGameType = CaixaGameType.MEGA_SENA; + CaixaWebCrawlerService crawler = new CaixaWebCrawlerService(caixaGameType); + + // Último concurso + crawler.byLastContest(); + CaixaGameResult caixaGameResult = crawler.getMatchResult(); + System.out.println("Concurso: " + caixaGameResult.getNumero()); + System.out.println("Dezenas sorteadas: " + caixaGameResult.getListaDezenas().toString()); + + // Por número do concurso + crawler.byContestNumber(2110); + caixaGameResult = crawler.getMatchResult(); + System.out.println("Concurso: " + caixaGameResult.getNumero()); + System.out.println("Dezenas sorteadas: " + caixaGameResult.getListaDezenas().toString()); + } +} +``` +### Exemplo console (resposta) + +```text +Request URL 'MEGA_SENA' - https://servicebus2.caixa.gov.br/portaldeloterias/api/megasena/ +Response status - 200 +Request URL 'MEGA_SENA' - https://servicebus2.caixa.gov.br/portaldeloterias/api/megasena/ +Response status - 200 +Concurso: 2465 +Lista Dezenas: [003, 008, 023, 029, 053, 054] +Request URL 'MEGA_SENA' - https://servicebus2.caixa.gov.br/portaldeloterias/api/megasena/2110 +Response status - 200 +Concurso: 2110 +Lista Dezenas: [005, 010, 012, 018, 025, 033] +``` diff --git a/src/main/java/com/ueby/loteria/crawlers/CaixaCrawlerStub.java b/src/main/java/com/ueby/oss/loteria/crawlers/CaixaCrawlerStub.java similarity index 89% rename from src/main/java/com/ueby/loteria/crawlers/CaixaCrawlerStub.java rename to src/main/java/com/ueby/oss/loteria/crawlers/CaixaCrawlerStub.java index 732e17e..2109289 100644 --- a/src/main/java/com/ueby/loteria/crawlers/CaixaCrawlerStub.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/CaixaCrawlerStub.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers; +package com.ueby.oss.loteria.crawlers; import lombok.*; diff --git a/src/main/java/com/ueby/loteria/crawlers/CaixaGameType.java b/src/main/java/com/ueby/oss/loteria/crawlers/CaixaGameType.java similarity index 92% rename from src/main/java/com/ueby/loteria/crawlers/CaixaGameType.java rename to src/main/java/com/ueby/oss/loteria/crawlers/CaixaGameType.java index f299238..e452239 100644 --- a/src/main/java/com/ueby/loteria/crawlers/CaixaGameType.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/CaixaGameType.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers; +package com.ueby.oss.loteria.crawlers; import lombok.AllArgsConstructor; import lombok.Getter; diff --git a/src/main/java/com/ueby/loteria/crawlers/exception/CaixaWebCrawlerException.java b/src/main/java/com/ueby/oss/loteria/crawlers/exception/CaixaWebCrawlerException.java similarity index 87% rename from src/main/java/com/ueby/loteria/crawlers/exception/CaixaWebCrawlerException.java rename to src/main/java/com/ueby/oss/loteria/crawlers/exception/CaixaWebCrawlerException.java index 36f9200..b982110 100644 --- a/src/main/java/com/ueby/loteria/crawlers/exception/CaixaWebCrawlerException.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/exception/CaixaWebCrawlerException.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.exception; +package com.ueby.oss.loteria.crawlers.exception; /** * @author Algarves, Khristian diff --git a/src/main/java/com/ueby/loteria/crawlers/exception/JsonParseErrorException.java b/src/main/java/com/ueby/oss/loteria/crawlers/exception/JsonParseErrorException.java similarity index 87% rename from src/main/java/com/ueby/loteria/crawlers/exception/JsonParseErrorException.java rename to src/main/java/com/ueby/oss/loteria/crawlers/exception/JsonParseErrorException.java index 93413d3..86e3df9 100644 --- a/src/main/java/com/ueby/loteria/crawlers/exception/JsonParseErrorException.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/exception/JsonParseErrorException.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.exception; +package com.ueby.oss.loteria.crawlers.exception; /** * @author Algarves, Khristian diff --git a/src/main/java/com/ueby/loteria/crawlers/game/CaixaGameResult.java b/src/main/java/com/ueby/oss/loteria/crawlers/game/CaixaGameResult.java similarity index 95% rename from src/main/java/com/ueby/loteria/crawlers/game/CaixaGameResult.java rename to src/main/java/com/ueby/oss/loteria/crawlers/game/CaixaGameResult.java index ad13c96..818ab04 100644 --- a/src/main/java/com/ueby/loteria/crawlers/game/CaixaGameResult.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/game/CaixaGameResult.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; -import com.ueby.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.CaixaGameType; import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; diff --git a/src/main/java/com/ueby/loteria/crawlers/game/MunicipioUFGanhadores.java b/src/main/java/com/ueby/oss/loteria/crawlers/game/MunicipioUFGanhadores.java similarity index 91% rename from src/main/java/com/ueby/loteria/crawlers/game/MunicipioUFGanhadores.java rename to src/main/java/com/ueby/oss/loteria/crawlers/game/MunicipioUFGanhadores.java index 9b9c3f8..1dd4b5e 100644 --- a/src/main/java/com/ueby/loteria/crawlers/game/MunicipioUFGanhadores.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/game/MunicipioUFGanhadores.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; import com.fasterxml.jackson.annotation.JsonProperty; import lombok.Getter; diff --git a/src/main/java/com/ueby/loteria/crawlers/game/RateioPremio.java b/src/main/java/com/ueby/oss/loteria/crawlers/game/RateioPremio.java similarity index 88% rename from src/main/java/com/ueby/loteria/crawlers/game/RateioPremio.java rename to src/main/java/com/ueby/oss/loteria/crawlers/game/RateioPremio.java index 49be26d..0721e2c 100644 --- a/src/main/java/com/ueby/loteria/crawlers/game/RateioPremio.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/game/RateioPremio.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/com/ueby/loteria/crawlers/game/ResultadoEquipeEsportiva.java b/src/main/java/com/ueby/oss/loteria/crawlers/game/ResultadoEquipeEsportiva.java similarity index 95% rename from src/main/java/com/ueby/loteria/crawlers/game/ResultadoEquipeEsportiva.java rename to src/main/java/com/ueby/oss/loteria/crawlers/game/ResultadoEquipeEsportiva.java index 9a3dec0..12da0a1 100644 --- a/src/main/java/com/ueby/loteria/crawlers/game/ResultadoEquipeEsportiva.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/game/ResultadoEquipeEsportiva.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonProperty; diff --git a/src/main/java/com/ueby/loteria/crawlers/service/AbstractCrawlerService.java b/src/main/java/com/ueby/oss/loteria/crawlers/service/AbstractCrawlerService.java similarity index 85% rename from src/main/java/com/ueby/loteria/crawlers/service/AbstractCrawlerService.java rename to src/main/java/com/ueby/oss/loteria/crawlers/service/AbstractCrawlerService.java index 0145ee3..ccc8cd2 100644 --- a/src/main/java/com/ueby/loteria/crawlers/service/AbstractCrawlerService.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/service/AbstractCrawlerService.java @@ -1,6 +1,6 @@ -package com.ueby.loteria.crawlers.service; +package com.ueby.oss.loteria.crawlers.service; -import com.ueby.loteria.crawlers.exception.CaixaWebCrawlerException; +import com.ueby.oss.loteria.crawlers.exception.CaixaWebCrawlerException; import org.apache.http.client.fluent.Request; import org.apache.http.client.fluent.Response; diff --git a/src/main/java/com/ueby/loteria/crawlers/service/CaixaWebCrawlerService.java b/src/main/java/com/ueby/oss/loteria/crawlers/service/CaixaWebCrawlerService.java similarity index 90% rename from src/main/java/com/ueby/loteria/crawlers/service/CaixaWebCrawlerService.java rename to src/main/java/com/ueby/oss/loteria/crawlers/service/CaixaWebCrawlerService.java index 1d06d61..64c7b2f 100644 --- a/src/main/java/com/ueby/loteria/crawlers/service/CaixaWebCrawlerService.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/service/CaixaWebCrawlerService.java @@ -1,11 +1,11 @@ -package com.ueby.loteria.crawlers.service; - -import com.ueby.loteria.crawlers.CaixaCrawlerStub; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.exception.CaixaWebCrawlerException; -import com.ueby.loteria.crawlers.game.CaixaGameResult; -import com.ueby.loteria.crawlers.util.JsonUtil; -import com.ueby.loteria.crawlers.util.RandomUtil; +package com.ueby.oss.loteria.crawlers.service; + +import com.ueby.oss.loteria.crawlers.CaixaCrawlerStub; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.exception.CaixaWebCrawlerException; +import com.ueby.oss.loteria.crawlers.game.CaixaGameResult; +import com.ueby.oss.loteria.crawlers.util.JsonUtil; +import com.ueby.oss.loteria.crawlers.util.RandomUtil; import java.io.IOException; import java.net.URISyntaxException; import java.util.concurrent.TimeUnit; diff --git a/src/main/java/com/ueby/loteria/crawlers/util/JsonUtil.java b/src/main/java/com/ueby/oss/loteria/crawlers/util/JsonUtil.java similarity index 94% rename from src/main/java/com/ueby/loteria/crawlers/util/JsonUtil.java rename to src/main/java/com/ueby/oss/loteria/crawlers/util/JsonUtil.java index 4e0c13a..f856b45 100644 --- a/src/main/java/com/ueby/loteria/crawlers/util/JsonUtil.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/util/JsonUtil.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.util; +package com.ueby.oss.loteria.crawlers.util; import com.fasterxml.jackson.core.JsonParseException; import com.fasterxml.jackson.databind.DeserializationFeature; @@ -7,7 +7,7 @@ import com.fasterxml.jackson.datatype.jdk8.Jdk8Module; import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; import com.fasterxml.jackson.module.paramnames.ParameterNamesModule; -import com.ueby.loteria.crawlers.exception.JsonParseErrorException; +import com.ueby.oss.loteria.crawlers.exception.JsonParseErrorException; import java.io.IOException; import java.util.Objects; import lombok.AccessLevel; diff --git a/src/main/java/com/ueby/loteria/crawlers/util/RandomUtil.java b/src/main/java/com/ueby/oss/loteria/crawlers/util/RandomUtil.java similarity index 94% rename from src/main/java/com/ueby/loteria/crawlers/util/RandomUtil.java rename to src/main/java/com/ueby/oss/loteria/crawlers/util/RandomUtil.java index a997f46..72dda88 100644 --- a/src/main/java/com/ueby/loteria/crawlers/util/RandomUtil.java +++ b/src/main/java/com/ueby/oss/loteria/crawlers/util/RandomUtil.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.util; +package com.ueby.oss.loteria.crawlers.util; import lombok.AccessLevel; import lombok.NoArgsConstructor; diff --git a/src/main/resources/log4j2.properties b/src/main/resources/log4j2.properties index 82b8444..806bf58 100644 --- a/src/main/resources/log4j2.properties +++ b/src/main/resources/log4j2.properties @@ -3,40 +3,10 @@ status = error dest = err name = PropertiesConfig -property.filename = loteria-crawlers.log - -filter.threshold.type = ThresholdFilter -filter.threshold.level = debug - appender.console.type = Console appender.console.name = STDOUT appender.console.layout.type = PatternLayout appender.console.layout.pattern = %m%n -appender.rolling.type = RollingFile -appender.rolling.name = RollingFile -appender.rolling.fileName = logs/${filename} -appender.rolling.filePattern = %d{MM-dd-yy-HH-mm-ss}-%i.log.gz -appender.rolling.layout.type = PatternLayout -appender.rolling.layout.pattern = %d %p %C{1.} [%t] %m%n -appender.rolling.policies.type = Policies -appender.rolling.policies.time.type = TimeBasedTriggeringPolicy -appender.rolling.policies.time.interval = 2 -appender.rolling.policies.time.modulate = true -appender.rolling.policies.size.type = SizeBasedTriggeringPolicy -appender.rolling.policies.size.size=100MB -appender.rolling.strategy.type = DefaultRolloverStrategy -appender.rolling.strategy.max = 5 - -appender.list.type = List -appender.list.name = List -appender.list.filter.threshold.type = ThresholdFilter -appender.list.filter.threshold.level = error - -logger.rolling.name = com.ueby.loteria.crawlers -logger.rolling.level = error -logger.rolling.additivity = false -logger.rolling.appenderRef.rolling.ref = RollingFile - -rootLogger.level = error -rootLogger.appenderRef.stdout.ref = STDOUT \ No newline at end of file +rootLogger.level = debug +rootLogger.appenderRef.stdout.ref = STDOUT diff --git a/src/test/java/com/ueby/loteria/crawlers/CaixaCrawlerStubTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/CaixaCrawlerStubTest.java similarity index 94% rename from src/test/java/com/ueby/loteria/crawlers/CaixaCrawlerStubTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/CaixaCrawlerStubTest.java index c4ead63..a2a142c 100644 --- a/src/test/java/com/ueby/loteria/crawlers/CaixaCrawlerStubTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/CaixaCrawlerStubTest.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers; +package com.ueby.oss.loteria.crawlers; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/ueby/loteria/crawlers/IntegrationTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/IntegrationTest.java similarity index 89% rename from src/test/java/com/ueby/loteria/crawlers/IntegrationTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/IntegrationTest.java index 94fe80f..ac1153a 100644 --- a/src/test/java/com/ueby/loteria/crawlers/IntegrationTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/IntegrationTest.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers; +package com.ueby.oss.loteria.crawlers; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/test/java/com/ueby/loteria/crawlers/exception/CaixaWebCrawlerServiceExceptionTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/exception/CaixaWebCrawlerServiceExceptionTest.java similarity index 92% rename from src/test/java/com/ueby/loteria/crawlers/exception/CaixaWebCrawlerServiceExceptionTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/exception/CaixaWebCrawlerServiceExceptionTest.java index 28c2df4..0aaaa03 100644 --- a/src/test/java/com/ueby/loteria/crawlers/exception/CaixaWebCrawlerServiceExceptionTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/exception/CaixaWebCrawlerServiceExceptionTest.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.exception; +package com.ueby.oss.loteria.crawlers.exception; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/src/test/java/com/ueby/loteria/crawlers/game/DiaDeSorteWebCrawlerTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/game/DiaDeSorteWebCrawlerTest.java similarity index 83% rename from src/test/java/com/ueby/loteria/crawlers/game/DiaDeSorteWebCrawlerTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/game/DiaDeSorteWebCrawlerTest.java index 1534511..8d50972 100644 --- a/src/test/java/com/ueby/loteria/crawlers/game/DiaDeSorteWebCrawlerTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/game/DiaDeSorteWebCrawlerTest.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.IntegrationTest; -import com.ueby.loteria.crawlers.service.CaixaWebCrawlerService; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.IntegrationTest; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; import org.junit.jupiter.api.*; /** diff --git a/src/test/java/com/ueby/loteria/crawlers/game/DuplasenaWebCrawlerTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/game/DuplasenaWebCrawlerTest.java similarity index 83% rename from src/test/java/com/ueby/loteria/crawlers/game/DuplasenaWebCrawlerTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/game/DuplasenaWebCrawlerTest.java index 05502e4..95ccc0d 100644 --- a/src/test/java/com/ueby/loteria/crawlers/game/DuplasenaWebCrawlerTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/game/DuplasenaWebCrawlerTest.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.IntegrationTest; -import com.ueby.loteria.crawlers.service.CaixaWebCrawlerService; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.IntegrationTest; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; import org.junit.jupiter.api.*; /** diff --git a/src/test/java/com/ueby/loteria/crawlers/game/FederalWebCrawlerTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/game/FederalWebCrawlerTest.java similarity index 83% rename from src/test/java/com/ueby/loteria/crawlers/game/FederalWebCrawlerTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/game/FederalWebCrawlerTest.java index 2dd0869..c1b891c 100644 --- a/src/test/java/com/ueby/loteria/crawlers/game/FederalWebCrawlerTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/game/FederalWebCrawlerTest.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.IntegrationTest; -import com.ueby.loteria.crawlers.service.CaixaWebCrawlerService; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.IntegrationTest; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; import org.junit.jupiter.api.*; /** diff --git a/src/test/java/com/ueby/loteria/crawlers/game/LotecaWebCrawlerTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/game/LotecaWebCrawlerTest.java similarity index 83% rename from src/test/java/com/ueby/loteria/crawlers/game/LotecaWebCrawlerTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/game/LotecaWebCrawlerTest.java index 99aefe4..4394bd3 100644 --- a/src/test/java/com/ueby/loteria/crawlers/game/LotecaWebCrawlerTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/game/LotecaWebCrawlerTest.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.IntegrationTest; -import com.ueby.loteria.crawlers.service.CaixaWebCrawlerService; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.IntegrationTest; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; import org.junit.jupiter.api.*; /** diff --git a/src/test/java/com/ueby/loteria/crawlers/game/LotofacilWebCrawlerTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/game/LotofacilWebCrawlerTest.java similarity index 83% rename from src/test/java/com/ueby/loteria/crawlers/game/LotofacilWebCrawlerTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/game/LotofacilWebCrawlerTest.java index 370df72..6ce4629 100644 --- a/src/test/java/com/ueby/loteria/crawlers/game/LotofacilWebCrawlerTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/game/LotofacilWebCrawlerTest.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.IntegrationTest; -import com.ueby.loteria.crawlers.service.CaixaWebCrawlerService; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.IntegrationTest; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; import org.junit.jupiter.api.*; /** diff --git a/src/test/java/com/ueby/loteria/crawlers/game/LotomaniaWebCrawlerTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/game/LotomaniaWebCrawlerTest.java similarity index 83% rename from src/test/java/com/ueby/loteria/crawlers/game/LotomaniaWebCrawlerTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/game/LotomaniaWebCrawlerTest.java index 773718a..8663063 100644 --- a/src/test/java/com/ueby/loteria/crawlers/game/LotomaniaWebCrawlerTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/game/LotomaniaWebCrawlerTest.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.IntegrationTest; -import com.ueby.loteria.crawlers.service.CaixaWebCrawlerService; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.IntegrationTest; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; import org.junit.jupiter.api.*; /** diff --git a/src/test/java/com/ueby/loteria/crawlers/game/MegasenaWebCrawlerTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/game/MegasenaWebCrawlerTest.java similarity index 83% rename from src/test/java/com/ueby/loteria/crawlers/game/MegasenaWebCrawlerTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/game/MegasenaWebCrawlerTest.java index 28af992..68d68ff 100644 --- a/src/test/java/com/ueby/loteria/crawlers/game/MegasenaWebCrawlerTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/game/MegasenaWebCrawlerTest.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.IntegrationTest; -import com.ueby.loteria.crawlers.service.CaixaWebCrawlerService; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.IntegrationTest; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; import org.junit.jupiter.api.*; /** diff --git a/src/test/java/com/ueby/loteria/crawlers/game/QuinaWebCrawlerTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/game/QuinaWebCrawlerTest.java similarity index 83% rename from src/test/java/com/ueby/loteria/crawlers/game/QuinaWebCrawlerTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/game/QuinaWebCrawlerTest.java index 3d4d704..2cfc11f 100644 --- a/src/test/java/com/ueby/loteria/crawlers/game/QuinaWebCrawlerTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/game/QuinaWebCrawlerTest.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.IntegrationTest; -import com.ueby.loteria.crawlers.service.CaixaWebCrawlerService; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.IntegrationTest; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; import org.junit.jupiter.api.*; /** diff --git a/src/test/java/com/ueby/loteria/crawlers/game/SuperSeteWebCrawlerTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/game/SuperSeteWebCrawlerTest.java similarity index 83% rename from src/test/java/com/ueby/loteria/crawlers/game/SuperSeteWebCrawlerTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/game/SuperSeteWebCrawlerTest.java index 1419386..96db985 100644 --- a/src/test/java/com/ueby/loteria/crawlers/game/SuperSeteWebCrawlerTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/game/SuperSeteWebCrawlerTest.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.IntegrationTest; -import com.ueby.loteria.crawlers.service.CaixaWebCrawlerService; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.IntegrationTest; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; import org.junit.jupiter.api.*; /** diff --git a/src/test/java/com/ueby/loteria/crawlers/game/TimemaniaWebCrawlerTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/game/TimemaniaWebCrawlerTest.java similarity index 83% rename from src/test/java/com/ueby/loteria/crawlers/game/TimemaniaWebCrawlerTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/game/TimemaniaWebCrawlerTest.java index 11fe8ff..2650bbd 100644 --- a/src/test/java/com/ueby/loteria/crawlers/game/TimemaniaWebCrawlerTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/game/TimemaniaWebCrawlerTest.java @@ -1,8 +1,8 @@ -package com.ueby.loteria.crawlers.game; +package com.ueby.oss.loteria.crawlers.game; -import com.ueby.loteria.crawlers.CaixaGameType; -import com.ueby.loteria.crawlers.IntegrationTest; -import com.ueby.loteria.crawlers.service.CaixaWebCrawlerService; +import com.ueby.oss.loteria.crawlers.CaixaGameType; +import com.ueby.oss.loteria.crawlers.IntegrationTest; +import com.ueby.oss.loteria.crawlers.service.CaixaWebCrawlerService; import org.junit.jupiter.api.*; /** diff --git a/src/test/java/com/ueby/loteria/crawlers/util/JsonObjectDto.java b/src/test/java/com/ueby/oss/loteria/crawlers/util/JsonObjectDto.java similarity index 79% rename from src/test/java/com/ueby/loteria/crawlers/util/JsonObjectDto.java rename to src/test/java/com/ueby/oss/loteria/crawlers/util/JsonObjectDto.java index 6a9ed56..8ad2096 100644 --- a/src/test/java/com/ueby/loteria/crawlers/util/JsonObjectDto.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/util/JsonObjectDto.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.util; +package com.ueby.oss.loteria.crawlers.util; import lombok.Getter; import lombok.NoArgsConstructor; diff --git a/src/test/java/com/ueby/loteria/crawlers/util/JsonUtilTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/util/JsonUtilTest.java similarity index 96% rename from src/test/java/com/ueby/loteria/crawlers/util/JsonUtilTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/util/JsonUtilTest.java index f6f45d3..0c8b8b2 100644 --- a/src/test/java/com/ueby/loteria/crawlers/util/JsonUtilTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/util/JsonUtilTest.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.util; +package com.ueby.oss.loteria.crawlers.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName; diff --git a/src/test/java/com/ueby/loteria/crawlers/util/RandomUtilTest.java b/src/test/java/com/ueby/oss/loteria/crawlers/util/RandomUtilTest.java similarity index 96% rename from src/test/java/com/ueby/loteria/crawlers/util/RandomUtilTest.java rename to src/test/java/com/ueby/oss/loteria/crawlers/util/RandomUtilTest.java index e4fdd20..2edd139 100644 --- a/src/test/java/com/ueby/loteria/crawlers/util/RandomUtilTest.java +++ b/src/test/java/com/ueby/oss/loteria/crawlers/util/RandomUtilTest.java @@ -1,4 +1,4 @@ -package com.ueby.loteria.crawlers.util; +package com.ueby.oss.loteria.crawlers.util; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.DisplayName;