From 9f1437f056f6543b0af503de205444e02e97b690 Mon Sep 17 00:00:00 2001 From: Rodrigo Verdiani Date: Tue, 17 Mar 2026 19:10:22 -0300 Subject: [PATCH] refactor: reorganize packages --- .../MangamochiApplication.java | 2 +- .../client/AniListClient.java | 2 +- .../{mangamochi => }/client/FlareClient.java | 2 +- .../{mangamochi => }/client/JikanClient.java | 2 +- .../client/MangaDexClient.java | 4 ++-- .../{mangamochi => }/client/NtfyClient.java | 2 +- .../common/dto/DefaultResponseDTO.java | 2 +- .../common/dto/ErrorResponseDTO.java | 2 +- .../common/exception/ConflictException.java | 2 +- .../exception/GlobalExceptionHandler.java | 4 ++-- .../common/exception/NotFoundException.java | 2 +- .../exception/UnprocessableException.java | 2 +- .../{mangamochi => }/config/RabbitConfig.java | 2 +- .../config/RateLimiterConfig.java | 2 +- .../config/S3ClientConfig.java | 2 +- .../config/SecurityConfig.java | 8 +++---- .../{mangamochi => }/config/WebConfig.java | 2 +- .../controller/AuthenticationController.java | 11 +++++---- .../controller/GenreController.java | 8 +++---- .../controller/ManagementController.java | 18 +++++++------- .../controller/MangaChapterController.java | 10 ++++---- .../controller/MangaController.java | 11 +++++---- .../controller/MangaImportController.java | 11 +++++---- .../MangaImportReviewController.java | 8 +++---- .../controller/ProviderController.java | 8 +++---- .../UserFavoriteMangaController.java | 6 ++--- .../model/enumeration/ArchiveFileType.java | 6 ----- .../model/enumeration/UserRole.java | 5 ---- .../model/dto/AuthenticationRequestDTO.java | 2 +- .../model/dto/AuthenticationResponseDTO.java | 4 ++-- ...ontentProviderMangaChapterResponseDTO.java | 2 +- .../ContentProviderMangaInfoResponseDTO.java | 4 ++-- .../{mangamochi => }/model/dto/GenreDTO.java | 4 ++-- .../model/dto/ImportMangaResponseDTO.java | 2 +- .../model/dto/ImportRequestDTO.java | 2 +- .../model/dto/ImportReviewDTO.java | 4 ++-- .../model/dto/LanguageDTO.java | 4 ++-- .../model/dto/MangaChapterArchiveDTO.java | 2 +- .../model/dto/MangaChapterDTO.java | 4 ++-- .../dto/MangaChapterDownloadCommand.java | 2 +- .../model/dto/MangaChapterImagesDTO.java | 6 ++--- .../model/dto/MangaChapterResponseDTO.java | 2 +- .../{mangamochi => }/model/dto/MangaDTO.java | 12 +++++----- .../model/dto/MangaDexMangaDTO.java | 2 +- .../model/dto/MangaListDTO.java | 4 ++-- .../model/dto/MangaListFilterDTO.java | 2 +- .../model/dto/MangaListUpdateCommand.java | 2 +- .../model/dto/MangaMessageDTO.java | 2 +- .../model/dto/ProviderListDTO.java | 4 ++-- .../model/dto/RefreshTokenRequestDTO.java | 2 +- .../model/dto/RegistrationRequestDTO.java | 2 +- .../model/dto/TitleMatchRequestDTO.java | 2 +- .../model/dto/TitleMatchResponseDTO.java | 2 +- .../model/dto/UpdateMangaDataCommand.java | 2 +- .../UpdateMangaFollowChapterListCommand.java | 2 +- .../{mangamochi => }/model/entity/Author.java | 2 +- .../model/entity/FlareSession.java | 2 +- .../{mangamochi => }/model/entity/Genre.java | 2 +- .../{mangamochi => }/model/entity/Image.java | 2 +- .../model/entity/Language.java | 2 +- .../{mangamochi => }/model/entity/Manga.java | 2 +- .../model/entity/MangaAlternativeTitle.java | 2 +- .../model/entity/MangaAuthor.java | 2 +- .../model/entity/MangaChapter.java | 2 +- .../model/entity/MangaChapterImage.java | 2 +- .../model/entity/MangaGenre.java | 2 +- .../model/entity/MangaImportReview.java | 2 +- .../model/entity/MangaProvider.java | 2 +- .../model/entity/Provider.java | 4 ++-- .../{mangamochi => }/model/entity/User.java | 4 ++-- .../model/entity/UserFavoriteManga.java | 2 +- .../model/entity/UserMangaFollow.java | 2 +- .../model/enumeration/ArchiveFileType.java | 6 +++++ .../model/enumeration/MangaStatus.java | 2 +- .../model/enumeration/ProviderStatus.java | 2 +- .../magamochi/model/enumeration/UserRole.java | 5 ++++ .../model/repository/AuthorRepository.java | 4 ++-- .../model/repository/GenreRepository.java | 4 ++-- .../model/repository/ImageRepository.java | 4 ++-- .../model/repository/LanguageRepository.java | 4 ++-- .../MangaAlternativeTitlesRepository.java | 4 ++-- .../repository/MangaAuthorRepository.java | 8 +++---- .../MangaChapterImageRepository.java | 6 ++--- .../repository/MangaChapterRepository.java | 6 ++--- .../repository/MangaGenreRepository.java | 6 +++-- .../MangaImportReviewRepository.java | 4 ++-- .../repository/MangaProviderRepository.java | 8 +++---- .../model/repository/MangaRepository.java | 4 ++-- .../model/repository/ProviderRepository.java | 4 ++-- .../UserFavoriteMangaRepository.java | 8 +++---- .../repository/UserMangaFollowRepository.java | 8 +++---- .../model/repository/UserRepository.java | 4 ++-- .../specification/MangaSpecification.java | 10 ++++---- .../queue/MangaChapterDownloadConsumer.java | 6 ++--- .../queue/MangaChapterDownloadProducer.java | 4 ++-- .../queue/UpdateMangaDataConsumer.java | 6 ++--- .../queue/UpdateMangaDataProducer.java | 4 ++-- .../UpdateMangaFollowChapterListConsumer.java | 6 ++--- .../UpdateMangaFollowChapterListProducer.java | 4 ++-- .../queue/UpdateMangaListConsumer.java | 6 ++--- .../queue/UpdateMangaListProducer.java | 4 ++-- .../registry/FlareSessionRegistry.java | 4 ++-- .../security/JwtRequestFilter.java | 6 ++--- .../service/CustomUserDetailsService.java | 4 ++-- .../service/FlareService.java | 4 ++-- .../service/FlareSessionManager.java | 8 +++---- .../service/GenreService.java | 6 ++--- .../service/ImageService.java | 6 ++--- .../service/LanguageService.java | 8 +++---- .../service/MangaChapterService.java | 20 ++++++++-------- .../service/MangaCreationService.java | 22 ++++++++--------- .../service/MangaImportReviewService.java | 24 +++++++++---------- .../service/MangaImportService.java | 16 ++++++------- .../service/MangaListService.java | 8 +++---- .../service/MangaService.java | 24 +++++++++---------- .../ProviderManualMangaImportService.java | 18 +++++++------- .../service/ProviderService.java | 10 ++++---- .../{mangamochi => }/service/S3Service.java | 2 +- .../service/TitleMatcherService.java | 6 ++--- .../service/UserFavoriteMangaService.java | 12 +++++----- .../{mangamochi => }/service/UserService.java | 22 ++++++++--------- .../service/providers/ContentProvider.java | 6 ++--- .../providers/ContentProviderFactory.java | 2 +- .../service/providers/ContentProviders.java | 2 +- .../ManualImportContentProvider.java | 2 +- .../ManualImportContentProviderFactory.java | 2 +- .../providers/PagedContentProvider.java | 4 ++-- .../PagedContentProviderFactory.java | 2 +- .../service/providers/impl/BatoProvider.java | 16 ++++++------- .../providers/impl/MangaDexProvider.java | 16 ++++++------- .../impl/MangaLivreBlogProvider.java | 16 ++++++------- .../providers/impl/MangaLivreProvider.java | 18 +++++++------- .../providers/impl/PinkRosaScanProvider.java | 18 +++++++------- .../task/FlareSessionCleanupTask.java | 6 ++--- .../task/FlareStartupCleanupTask.java | 4 ++-- .../task/ImageCleanupTask.java | 8 +++---- .../task/MangaFollowUpdateTask.java | 12 +++++----- .../task/UpdateMangaDataTask.java | 8 +++---- .../task/UpdateMangaListTask.java | 14 +++++------ .../{mangamochi => }/util/DoubleUtil.java | 2 +- .../{mangamochi => }/util/JwtUtil.java | 2 +- .../MangamochiApplicationTests.java | 2 +- 142 files changed, 411 insertions(+), 400 deletions(-) rename src/main/java/com/magamochi/{mangamochi => }/MangamochiApplication.java (94%) rename src/main/java/com/magamochi/{mangamochi => }/client/AniListClient.java (97%) rename src/main/java/com/magamochi/{mangamochi => }/client/FlareClient.java (98%) rename src/main/java/com/magamochi/{mangamochi => }/client/JikanClient.java (97%) rename src/main/java/com/magamochi/{mangamochi => }/client/MangaDexClient.java (93%) rename src/main/java/com/magamochi/{mangamochi => }/client/NtfyClient.java (92%) rename src/main/java/com/magamochi/{mangamochi => }/common/dto/DefaultResponseDTO.java (94%) rename src/main/java/com/magamochi/{mangamochi => }/common/dto/ErrorResponseDTO.java (82%) rename src/main/java/com/magamochi/{mangamochi => }/common/exception/ConflictException.java (71%) rename src/main/java/com/magamochi/{mangamochi => }/common/exception/GlobalExceptionHandler.java (95%) rename src/main/java/com/magamochi/{mangamochi => }/common/exception/NotFoundException.java (71%) rename src/main/java/com/magamochi/{mangamochi => }/common/exception/UnprocessableException.java (82%) rename src/main/java/com/magamochi/{mangamochi => }/config/RabbitConfig.java (97%) rename src/main/java/com/magamochi/{mangamochi => }/config/RateLimiterConfig.java (92%) rename src/main/java/com/magamochi/{mangamochi => }/config/S3ClientConfig.java (96%) rename src/main/java/com/magamochi/{mangamochi => }/config/SecurityConfig.java (94%) rename src/main/java/com/magamochi/{mangamochi => }/config/WebConfig.java (92%) rename src/main/java/com/magamochi/{mangamochi => }/controller/AuthenticationController.java (81%) rename src/main/java/com/magamochi/{mangamochi => }/controller/GenreController.java (73%) rename src/main/java/com/magamochi/{mangamochi => }/controller/ManagementController.java (86%) rename src/main/java/com/magamochi/{mangamochi => }/controller/MangaChapterController.java (91%) rename src/main/java/com/magamochi/{mangamochi => }/controller/MangaController.java (92%) rename src/main/java/com/magamochi/{mangamochi => }/controller/MangaImportController.java (87%) rename src/main/java/com/magamochi/{mangamochi => }/controller/MangaImportReviewController.java (87%) rename src/main/java/com/magamochi/{mangamochi => }/controller/ProviderController.java (77%) rename src/main/java/com/magamochi/{mangamochi => }/controller/UserFavoriteMangaController.java (86%) delete mode 100644 src/main/java/com/magamochi/mangamochi/model/enumeration/ArchiveFileType.java delete mode 100644 src/main/java/com/magamochi/mangamochi/model/enumeration/UserRole.java rename src/main/java/com/magamochi/{mangamochi => }/model/dto/AuthenticationRequestDTO.java (76%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/AuthenticationResponseDTO.java (71%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/ContentProviderMangaChapterResponseDTO.java (83%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/ContentProviderMangaInfoResponseDTO.java (61%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/GenreDTO.java (73%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/ImportMangaResponseDTO.java (70%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/ImportRequestDTO.java (76%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/ImportReviewDTO.java (84%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/LanguageDTO.java (81%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaChapterArchiveDTO.java (81%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaChapterDTO.java (84%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaChapterDownloadCommand.java (58%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaChapterImagesDTO.java (83%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaChapterResponseDTO.java (86%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaDTO.java (87%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaDexMangaDTO.java (86%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaListDTO.java (92%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaListFilterDTO.java (80%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaListUpdateCommand.java (65%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/MangaMessageDTO.java (78%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/ProviderListDTO.java (84%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/RefreshTokenRequestDTO.java (73%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/RegistrationRequestDTO.java (65%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/TitleMatchRequestDTO.java (83%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/TitleMatchResponseDTO.java (79%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/UpdateMangaDataCommand.java (55%) rename src/main/java/com/magamochi/{mangamochi => }/model/dto/UpdateMangaFollowChapterListCommand.java (63%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/Author.java (92%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/FlareSession.java (83%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/Genre.java (89%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/Image.java (91%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/Language.java (86%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/Manga.java (96%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/MangaAlternativeTitle.java (88%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/MangaAuthor.java (89%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/MangaChapter.java (95%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/MangaChapterImage.java (93%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/MangaGenre.java (89%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/MangaImportReview.java (91%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/MangaProvider.java (94%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/Provider.java (87%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/User.java (85%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/UserFavoriteManga.java (91%) rename src/main/java/com/magamochi/{mangamochi => }/model/entity/UserMangaFollow.java (89%) create mode 100644 src/main/java/com/magamochi/model/enumeration/ArchiveFileType.java rename src/main/java/com/magamochi/{mangamochi => }/model/enumeration/MangaStatus.java (62%) rename src/main/java/com/magamochi/{mangamochi => }/model/enumeration/ProviderStatus.java (50%) create mode 100644 src/main/java/com/magamochi/model/enumeration/UserRole.java rename src/main/java/com/magamochi/{mangamochi => }/model/repository/AuthorRepository.java (70%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/GenreRepository.java (70%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/ImageRepository.java (60%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/LanguageRepository.java (67%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/MangaAlternativeTitlesRepository.java (59%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/MangaAuthorRepository.java (53%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/MangaChapterImageRepository.java (59%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/MangaChapterRepository.java (71%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/MangaGenreRepository.java (59%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/MangaImportReviewRepository.java (67%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/MangaProviderRepository.java (63%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/MangaRepository.java (82%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/ProviderRepository.java (67%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/UserFavoriteMangaRepository.java (64%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/UserMangaFollowRepository.java (68%) rename src/main/java/com/magamochi/{mangamochi => }/model/repository/UserRepository.java (70%) rename src/main/java/com/magamochi/{mangamochi => }/model/specification/MangaSpecification.java (92%) rename src/main/java/com/magamochi/{mangamochi => }/queue/MangaChapterDownloadConsumer.java (81%) rename src/main/java/com/magamochi/{mangamochi => }/queue/MangaChapterDownloadProducer.java (86%) rename src/main/java/com/magamochi/{mangamochi => }/queue/UpdateMangaDataConsumer.java (78%) rename src/main/java/com/magamochi/{mangamochi => }/queue/UpdateMangaDataProducer.java (86%) rename src/main/java/com/magamochi/{mangamochi => }/queue/UpdateMangaFollowChapterListConsumer.java (79%) rename src/main/java/com/magamochi/{mangamochi => }/queue/UpdateMangaFollowChapterListProducer.java (86%) rename src/main/java/com/magamochi/{mangamochi => }/queue/UpdateMangaListConsumer.java (79%) rename src/main/java/com/magamochi/{mangamochi => }/queue/UpdateMangaListProducer.java (86%) rename src/main/java/com/magamochi/{mangamochi => }/registry/FlareSessionRegistry.java (83%) rename src/main/java/com/magamochi/{mangamochi => }/security/JwtRequestFilter.java (94%) rename src/main/java/com/magamochi/{mangamochi => }/service/CustomUserDetailsService.java (91%) rename src/main/java/com/magamochi/{mangamochi => }/service/FlareService.java (88%) rename src/main/java/com/magamochi/{mangamochi => }/service/FlareSessionManager.java (88%) rename src/main/java/com/magamochi/{mangamochi => }/service/GenreService.java (69%) rename src/main/java/com/magamochi/{mangamochi => }/service/ImageService.java (81%) rename src/main/java/com/magamochi/{mangamochi => }/service/LanguageService.java (64%) rename src/main/java/com/magamochi/{mangamochi => }/service/MangaChapterService.java (91%) rename src/main/java/com/magamochi/{mangamochi => }/service/MangaCreationService.java (88%) rename src/main/java/com/magamochi/{mangamochi => }/service/MangaImportReviewService.java (76%) rename src/main/java/com/magamochi/{mangamochi => }/service/MangaImportService.java (96%) rename src/main/java/com/magamochi/{mangamochi => }/service/MangaListService.java (87%) rename src/main/java/com/magamochi/{mangamochi => }/service/MangaService.java (90%) rename src/main/java/com/magamochi/{mangamochi => }/service/ProviderManualMangaImportService.java (81%) rename src/main/java/com/magamochi/{mangamochi => }/service/ProviderService.java (79%) rename src/main/java/com/magamochi/{mangamochi => }/service/S3Service.java (98%) rename src/main/java/com/magamochi/{mangamochi => }/service/TitleMatcherService.java (92%) rename src/main/java/com/magamochi/{mangamochi => }/service/UserFavoriteMangaService.java (78%) rename src/main/java/com/magamochi/{mangamochi => }/service/UserService.java (84%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/ContentProvider.java (55%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/ContentProviderFactory.java (91%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/ContentProviders.java (86%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/ManualImportContentProvider.java (62%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/ManualImportContentProviderFactory.java (92%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/PagedContentProvider.java (56%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/PagedContentProviderFactory.java (91%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/impl/BatoProvider.java (83%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/impl/MangaDexProvider.java (89%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/impl/MangaLivreBlogProvider.java (91%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/impl/MangaLivreProvider.java (88%) rename src/main/java/com/magamochi/{mangamochi => }/service/providers/impl/PinkRosaScanProvider.java (89%) rename src/main/java/com/magamochi/{mangamochi => }/task/FlareSessionCleanupTask.java (85%) rename src/main/java/com/magamochi/{mangamochi => }/task/FlareStartupCleanupTask.java (89%) rename src/main/java/com/magamochi/{mangamochi => }/task/ImageCleanupTask.java (87%) rename src/main/java/com/magamochi/{mangamochi => }/task/MangaFollowUpdateTask.java (80%) rename src/main/java/com/magamochi/{mangamochi => }/task/UpdateMangaDataTask.java (77%) rename src/main/java/com/magamochi/{mangamochi => }/task/UpdateMangaListTask.java (81%) rename src/main/java/com/magamochi/{mangamochi => }/util/DoubleUtil.java (91%) rename src/main/java/com/magamochi/{mangamochi => }/util/JwtUtil.java (98%) rename src/test/java/com/magamochi/{mangamochi => }/MangamochiApplicationTests.java (86%) diff --git a/src/main/java/com/magamochi/mangamochi/MangamochiApplication.java b/src/main/java/com/magamochi/MangamochiApplication.java similarity index 94% rename from src/main/java/com/magamochi/mangamochi/MangamochiApplication.java rename to src/main/java/com/magamochi/MangamochiApplication.java index 8f40b76..f774fd7 100644 --- a/src/main/java/com/magamochi/mangamochi/MangamochiApplication.java +++ b/src/main/java/com/magamochi/MangamochiApplication.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi; +package com.magamochi; import org.springframework.amqp.rabbit.annotation.EnableRabbit; import org.springframework.boot.SpringApplication; diff --git a/src/main/java/com/magamochi/mangamochi/client/AniListClient.java b/src/main/java/com/magamochi/client/AniListClient.java similarity index 97% rename from src/main/java/com/magamochi/mangamochi/client/AniListClient.java rename to src/main/java/com/magamochi/client/AniListClient.java index b5c5b86..5baea6e 100644 --- a/src/main/java/com/magamochi/mangamochi/client/AniListClient.java +++ b/src/main/java/com/magamochi/client/AniListClient.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.client; +package com.magamochi.client; import io.github.resilience4j.retry.annotation.Retry; import java.util.List; diff --git a/src/main/java/com/magamochi/mangamochi/client/FlareClient.java b/src/main/java/com/magamochi/client/FlareClient.java similarity index 98% rename from src/main/java/com/magamochi/mangamochi/client/FlareClient.java rename to src/main/java/com/magamochi/client/FlareClient.java index df4dc3a..6716757 100644 --- a/src/main/java/com/magamochi/mangamochi/client/FlareClient.java +++ b/src/main/java/com/magamochi/client/FlareClient.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.client; +package com.magamochi.client; import io.github.resilience4j.retry.annotation.Retry; import java.util.List; diff --git a/src/main/java/com/magamochi/mangamochi/client/JikanClient.java b/src/main/java/com/magamochi/client/JikanClient.java similarity index 97% rename from src/main/java/com/magamochi/mangamochi/client/JikanClient.java rename to src/main/java/com/magamochi/client/JikanClient.java index 5cba7f0..2cc1495 100644 --- a/src/main/java/com/magamochi/mangamochi/client/JikanClient.java +++ b/src/main/java/com/magamochi/client/JikanClient.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.client; +package com.magamochi.client; import io.github.resilience4j.retry.annotation.Retry; import java.time.OffsetDateTime; diff --git a/src/main/java/com/magamochi/mangamochi/client/MangaDexClient.java b/src/main/java/com/magamochi/client/MangaDexClient.java similarity index 93% rename from src/main/java/com/magamochi/mangamochi/client/MangaDexClient.java rename to src/main/java/com/magamochi/client/MangaDexClient.java index ffcd7ec..8bf0056 100644 --- a/src/main/java/com/magamochi/mangamochi/client/MangaDexClient.java +++ b/src/main/java/com/magamochi/client/MangaDexClient.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.client; +package com.magamochi.client; -import com.magamochi.mangamochi.model.dto.MangaDexMangaDTO; +import com.magamochi.model.dto.MangaDexMangaDTO; import io.github.resilience4j.retry.annotation.Retry; import java.util.List; import java.util.UUID; diff --git a/src/main/java/com/magamochi/mangamochi/client/NtfyClient.java b/src/main/java/com/magamochi/client/NtfyClient.java similarity index 92% rename from src/main/java/com/magamochi/mangamochi/client/NtfyClient.java rename to src/main/java/com/magamochi/client/NtfyClient.java index 64d7b1d..76bf158 100644 --- a/src/main/java/com/magamochi/mangamochi/client/NtfyClient.java +++ b/src/main/java/com/magamochi/client/NtfyClient.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.client; +package com.magamochi.client; import io.github.resilience4j.retry.annotation.Retry; import org.springframework.cloud.openfeign.FeignClient; diff --git a/src/main/java/com/magamochi/mangamochi/common/dto/DefaultResponseDTO.java b/src/main/java/com/magamochi/common/dto/DefaultResponseDTO.java similarity index 94% rename from src/main/java/com/magamochi/mangamochi/common/dto/DefaultResponseDTO.java rename to src/main/java/com/magamochi/common/dto/DefaultResponseDTO.java index 874626d..923a457 100644 --- a/src/main/java/com/magamochi/mangamochi/common/dto/DefaultResponseDTO.java +++ b/src/main/java/com/magamochi/common/dto/DefaultResponseDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.common.dto; +package com.magamochi.common.dto; import jakarta.annotation.Nullable; import java.time.Instant; diff --git a/src/main/java/com/magamochi/mangamochi/common/dto/ErrorResponseDTO.java b/src/main/java/com/magamochi/common/dto/ErrorResponseDTO.java similarity index 82% rename from src/main/java/com/magamochi/mangamochi/common/dto/ErrorResponseDTO.java rename to src/main/java/com/magamochi/common/dto/ErrorResponseDTO.java index 7d6e06e..c7d5580 100644 --- a/src/main/java/com/magamochi/mangamochi/common/dto/ErrorResponseDTO.java +++ b/src/main/java/com/magamochi/common/dto/ErrorResponseDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.common.dto; +package com.magamochi.common.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/magamochi/mangamochi/common/exception/ConflictException.java b/src/main/java/com/magamochi/common/exception/ConflictException.java similarity index 71% rename from src/main/java/com/magamochi/mangamochi/common/exception/ConflictException.java rename to src/main/java/com/magamochi/common/exception/ConflictException.java index f3c9918..0c543ec 100644 --- a/src/main/java/com/magamochi/mangamochi/common/exception/ConflictException.java +++ b/src/main/java/com/magamochi/common/exception/ConflictException.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.common.exception; +package com.magamochi.common.exception; public class ConflictException extends RuntimeException { public ConflictException(String message) { diff --git a/src/main/java/com/magamochi/mangamochi/common/exception/GlobalExceptionHandler.java b/src/main/java/com/magamochi/common/exception/GlobalExceptionHandler.java similarity index 95% rename from src/main/java/com/magamochi/mangamochi/common/exception/GlobalExceptionHandler.java rename to src/main/java/com/magamochi/common/exception/GlobalExceptionHandler.java index 57383ad..a53d7ee 100644 --- a/src/main/java/com/magamochi/mangamochi/common/exception/GlobalExceptionHandler.java +++ b/src/main/java/com/magamochi/common/exception/GlobalExceptionHandler.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.common.exception; +package com.magamochi.common.exception; -import com.magamochi.mangamochi.common.dto.ErrorResponseDTO; +import com.magamochi.common.dto.ErrorResponseDTO; import java.time.Instant; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/com/magamochi/mangamochi/common/exception/NotFoundException.java b/src/main/java/com/magamochi/common/exception/NotFoundException.java similarity index 71% rename from src/main/java/com/magamochi/mangamochi/common/exception/NotFoundException.java rename to src/main/java/com/magamochi/common/exception/NotFoundException.java index 3d39767..9fc1025 100644 --- a/src/main/java/com/magamochi/mangamochi/common/exception/NotFoundException.java +++ b/src/main/java/com/magamochi/common/exception/NotFoundException.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.common.exception; +package com.magamochi.common.exception; public class NotFoundException extends RuntimeException { public NotFoundException(String message) { diff --git a/src/main/java/com/magamochi/mangamochi/common/exception/UnprocessableException.java b/src/main/java/com/magamochi/common/exception/UnprocessableException.java similarity index 82% rename from src/main/java/com/magamochi/mangamochi/common/exception/UnprocessableException.java rename to src/main/java/com/magamochi/common/exception/UnprocessableException.java index 3cfa3bb..b2bdb69 100644 --- a/src/main/java/com/magamochi/mangamochi/common/exception/UnprocessableException.java +++ b/src/main/java/com/magamochi/common/exception/UnprocessableException.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.common.exception; +package com.magamochi.common.exception; public class UnprocessableException extends RuntimeException { public UnprocessableException(String message) { diff --git a/src/main/java/com/magamochi/mangamochi/config/RabbitConfig.java b/src/main/java/com/magamochi/config/RabbitConfig.java similarity index 97% rename from src/main/java/com/magamochi/mangamochi/config/RabbitConfig.java rename to src/main/java/com/magamochi/config/RabbitConfig.java index 09e13f0..9f920f7 100644 --- a/src/main/java/com/magamochi/mangamochi/config/RabbitConfig.java +++ b/src/main/java/com/magamochi/config/RabbitConfig.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.config; +package com.magamochi.config; import org.springframework.amqp.core.Queue; import org.springframework.amqp.rabbit.connection.ConnectionFactory; diff --git a/src/main/java/com/magamochi/mangamochi/config/RateLimiterConfig.java b/src/main/java/com/magamochi/config/RateLimiterConfig.java similarity index 92% rename from src/main/java/com/magamochi/mangamochi/config/RateLimiterConfig.java rename to src/main/java/com/magamochi/config/RateLimiterConfig.java index 1120da5..2e8288b 100644 --- a/src/main/java/com/magamochi/mangamochi/config/RateLimiterConfig.java +++ b/src/main/java/com/magamochi/config/RateLimiterConfig.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.config; +package com.magamochi.config; import com.google.common.util.concurrent.RateLimiter; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/magamochi/mangamochi/config/S3ClientConfig.java b/src/main/java/com/magamochi/config/S3ClientConfig.java similarity index 96% rename from src/main/java/com/magamochi/mangamochi/config/S3ClientConfig.java rename to src/main/java/com/magamochi/config/S3ClientConfig.java index bcc3f26..a86ccd5 100644 --- a/src/main/java/com/magamochi/mangamochi/config/S3ClientConfig.java +++ b/src/main/java/com/magamochi/config/S3ClientConfig.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.config; +package com.magamochi.config; import java.net.URI; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/magamochi/mangamochi/config/SecurityConfig.java b/src/main/java/com/magamochi/config/SecurityConfig.java similarity index 94% rename from src/main/java/com/magamochi/mangamochi/config/SecurityConfig.java rename to src/main/java/com/magamochi/config/SecurityConfig.java index f4b92de..d873c90 100644 --- a/src/main/java/com/magamochi/mangamochi/config/SecurityConfig.java +++ b/src/main/java/com/magamochi/config/SecurityConfig.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.config; +package com.magamochi.config; -import com.magamochi.mangamochi.security.JwtRequestFilter; -import com.magamochi.mangamochi.service.CustomUserDetailsService; -import com.magamochi.mangamochi.util.JwtUtil; +import com.magamochi.security.JwtRequestFilter; +import com.magamochi.service.CustomUserDetailsService; +import com.magamochi.util.JwtUtil; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.context.annotation.Bean; diff --git a/src/main/java/com/magamochi/mangamochi/config/WebConfig.java b/src/main/java/com/magamochi/config/WebConfig.java similarity index 92% rename from src/main/java/com/magamochi/mangamochi/config/WebConfig.java rename to src/main/java/com/magamochi/config/WebConfig.java index 7f0df7a..4221d89 100644 --- a/src/main/java/com/magamochi/mangamochi/config/WebConfig.java +++ b/src/main/java/com/magamochi/config/WebConfig.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.config; +package com.magamochi.config; import lombok.NonNull; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/com/magamochi/mangamochi/controller/AuthenticationController.java b/src/main/java/com/magamochi/controller/AuthenticationController.java similarity index 81% rename from src/main/java/com/magamochi/mangamochi/controller/AuthenticationController.java rename to src/main/java/com/magamochi/controller/AuthenticationController.java index 3b85ec1..502601b 100644 --- a/src/main/java/com/magamochi/mangamochi/controller/AuthenticationController.java +++ b/src/main/java/com/magamochi/controller/AuthenticationController.java @@ -1,8 +1,11 @@ -package com.magamochi.mangamochi.controller; +package com.magamochi.controller; -import com.magamochi.mangamochi.common.dto.DefaultResponseDTO; -import com.magamochi.mangamochi.model.dto.*; -import com.magamochi.mangamochi.service.UserService; +import com.magamochi.common.dto.DefaultResponseDTO; +import com.magamochi.model.dto.AuthenticationRequestDTO; +import com.magamochi.model.dto.AuthenticationResponseDTO; +import com.magamochi.model.dto.RefreshTokenRequestDTO; +import com.magamochi.model.dto.RegistrationRequestDTO; +import com.magamochi.service.UserService; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/magamochi/mangamochi/controller/GenreController.java b/src/main/java/com/magamochi/controller/GenreController.java similarity index 73% rename from src/main/java/com/magamochi/mangamochi/controller/GenreController.java rename to src/main/java/com/magamochi/controller/GenreController.java index 4087d2f..c922a4b 100644 --- a/src/main/java/com/magamochi/mangamochi/controller/GenreController.java +++ b/src/main/java/com/magamochi/controller/GenreController.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.controller; +package com.magamochi.controller; -import com.magamochi.mangamochi.common.dto.DefaultResponseDTO; -import com.magamochi.mangamochi.model.dto.GenreDTO; -import com.magamochi.mangamochi.service.GenreService; +import com.magamochi.common.dto.DefaultResponseDTO; +import com.magamochi.model.dto.GenreDTO; +import com.magamochi.service.GenreService; import io.swagger.v3.oas.annotations.Operation; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/magamochi/mangamochi/controller/ManagementController.java b/src/main/java/com/magamochi/controller/ManagementController.java similarity index 86% rename from src/main/java/com/magamochi/mangamochi/controller/ManagementController.java rename to src/main/java/com/magamochi/controller/ManagementController.java index a0404ec..c35ed20 100644 --- a/src/main/java/com/magamochi/mangamochi/controller/ManagementController.java +++ b/src/main/java/com/magamochi/controller/ManagementController.java @@ -1,13 +1,13 @@ -package com.magamochi.mangamochi.controller; +package com.magamochi.controller; -import com.magamochi.mangamochi.client.NtfyClient; -import com.magamochi.mangamochi.common.dto.DefaultResponseDTO; -import com.magamochi.mangamochi.model.dto.UpdateMangaDataCommand; -import com.magamochi.mangamochi.model.repository.UserRepository; -import com.magamochi.mangamochi.queue.UpdateMangaDataProducer; -import com.magamochi.mangamochi.task.ImageCleanupTask; -import com.magamochi.mangamochi.task.MangaFollowUpdateTask; -import com.magamochi.mangamochi.task.UpdateMangaListTask; +import com.magamochi.client.NtfyClient; +import com.magamochi.common.dto.DefaultResponseDTO; +import com.magamochi.model.dto.UpdateMangaDataCommand; +import com.magamochi.model.repository.UserRepository; +import com.magamochi.queue.UpdateMangaDataProducer; +import com.magamochi.task.ImageCleanupTask; +import com.magamochi.task.MangaFollowUpdateTask; +import com.magamochi.task.UpdateMangaListTask; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/magamochi/mangamochi/controller/MangaChapterController.java b/src/main/java/com/magamochi/controller/MangaChapterController.java similarity index 91% rename from src/main/java/com/magamochi/mangamochi/controller/MangaChapterController.java rename to src/main/java/com/magamochi/controller/MangaChapterController.java index ea777e1..1160d35 100644 --- a/src/main/java/com/magamochi/mangamochi/controller/MangaChapterController.java +++ b/src/main/java/com/magamochi/controller/MangaChapterController.java @@ -1,9 +1,9 @@ -package com.magamochi.mangamochi.controller; +package com.magamochi.controller; -import com.magamochi.mangamochi.common.dto.DefaultResponseDTO; -import com.magamochi.mangamochi.model.dto.*; -import com.magamochi.mangamochi.model.enumeration.ArchiveFileType; -import com.magamochi.mangamochi.service.MangaChapterService; +import com.magamochi.common.dto.DefaultResponseDTO; +import com.magamochi.model.dto.MangaChapterImagesDTO; +import com.magamochi.model.enumeration.ArchiveFileType; +import com.magamochi.service.MangaChapterService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; import io.swagger.v3.oas.annotations.media.Schema; diff --git a/src/main/java/com/magamochi/mangamochi/controller/MangaController.java b/src/main/java/com/magamochi/controller/MangaController.java similarity index 92% rename from src/main/java/com/magamochi/mangamochi/controller/MangaController.java rename to src/main/java/com/magamochi/controller/MangaController.java index 2dec3c0..48241bb 100644 --- a/src/main/java/com/magamochi/mangamochi/controller/MangaController.java +++ b/src/main/java/com/magamochi/controller/MangaController.java @@ -1,8 +1,11 @@ -package com.magamochi.mangamochi.controller; +package com.magamochi.controller; -import com.magamochi.mangamochi.common.dto.DefaultResponseDTO; -import com.magamochi.mangamochi.model.dto.*; -import com.magamochi.mangamochi.service.MangaService; +import com.magamochi.common.dto.DefaultResponseDTO; +import com.magamochi.model.dto.MangaChapterDTO; +import com.magamochi.model.dto.MangaDTO; +import com.magamochi.model.dto.MangaListDTO; +import com.magamochi.model.dto.MangaListFilterDTO; +import com.magamochi.service.MangaService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import java.util.List; diff --git a/src/main/java/com/magamochi/mangamochi/controller/MangaImportController.java b/src/main/java/com/magamochi/controller/MangaImportController.java similarity index 87% rename from src/main/java/com/magamochi/mangamochi/controller/MangaImportController.java rename to src/main/java/com/magamochi/controller/MangaImportController.java index 2586c73..a4c72a8 100644 --- a/src/main/java/com/magamochi/mangamochi/controller/MangaImportController.java +++ b/src/main/java/com/magamochi/controller/MangaImportController.java @@ -1,9 +1,10 @@ -package com.magamochi.mangamochi.controller; +package com.magamochi.controller; -import com.magamochi.mangamochi.common.dto.DefaultResponseDTO; -import com.magamochi.mangamochi.model.dto.*; -import com.magamochi.mangamochi.service.MangaImportService; -import com.magamochi.mangamochi.service.ProviderManualMangaImportService; +import com.magamochi.common.dto.DefaultResponseDTO; +import com.magamochi.model.dto.ImportMangaResponseDTO; +import com.magamochi.model.dto.ImportRequestDTO; +import com.magamochi.service.MangaImportService; +import com.magamochi.service.ProviderManualMangaImportService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.media.Content; diff --git a/src/main/java/com/magamochi/mangamochi/controller/MangaImportReviewController.java b/src/main/java/com/magamochi/controller/MangaImportReviewController.java similarity index 87% rename from src/main/java/com/magamochi/mangamochi/controller/MangaImportReviewController.java rename to src/main/java/com/magamochi/controller/MangaImportReviewController.java index 948fedb..733943c 100644 --- a/src/main/java/com/magamochi/mangamochi/controller/MangaImportReviewController.java +++ b/src/main/java/com/magamochi/controller/MangaImportReviewController.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.controller; +package com.magamochi.controller; -import com.magamochi.mangamochi.common.dto.DefaultResponseDTO; -import com.magamochi.mangamochi.model.dto.ImportReviewDTO; -import com.magamochi.mangamochi.service.MangaImportReviewService; +import com.magamochi.common.dto.DefaultResponseDTO; +import com.magamochi.model.dto.ImportReviewDTO; +import com.magamochi.service.MangaImportReviewService; import io.swagger.v3.oas.annotations.Operation; import java.util.List; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/magamochi/mangamochi/controller/ProviderController.java b/src/main/java/com/magamochi/controller/ProviderController.java similarity index 77% rename from src/main/java/com/magamochi/mangamochi/controller/ProviderController.java rename to src/main/java/com/magamochi/controller/ProviderController.java index 6ddf000..8accd60 100644 --- a/src/main/java/com/magamochi/mangamochi/controller/ProviderController.java +++ b/src/main/java/com/magamochi/controller/ProviderController.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.controller; +package com.magamochi.controller; -import com.magamochi.mangamochi.common.dto.DefaultResponseDTO; -import com.magamochi.mangamochi.model.dto.*; -import com.magamochi.mangamochi.service.ProviderService; +import com.magamochi.common.dto.DefaultResponseDTO; +import com.magamochi.model.dto.ProviderListDTO; +import com.magamochi.service.ProviderService; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/magamochi/mangamochi/controller/UserFavoriteMangaController.java b/src/main/java/com/magamochi/controller/UserFavoriteMangaController.java similarity index 86% rename from src/main/java/com/magamochi/mangamochi/controller/UserFavoriteMangaController.java rename to src/main/java/com/magamochi/controller/UserFavoriteMangaController.java index cf4703d..7e254d1 100644 --- a/src/main/java/com/magamochi/mangamochi/controller/UserFavoriteMangaController.java +++ b/src/main/java/com/magamochi/controller/UserFavoriteMangaController.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.controller; +package com.magamochi.controller; -import com.magamochi.mangamochi.common.dto.DefaultResponseDTO; -import com.magamochi.mangamochi.service.UserFavoriteMangaService; +import com.magamochi.common.dto.DefaultResponseDTO; +import com.magamochi.service.UserFavoriteMangaService; import io.swagger.v3.oas.annotations.Operation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/com/magamochi/mangamochi/model/enumeration/ArchiveFileType.java b/src/main/java/com/magamochi/mangamochi/model/enumeration/ArchiveFileType.java deleted file mode 100644 index 9982b20..0000000 --- a/src/main/java/com/magamochi/mangamochi/model/enumeration/ArchiveFileType.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.magamochi.mangamochi.model.enumeration; - -public enum ArchiveFileType { - CBZ, - CBR -} diff --git a/src/main/java/com/magamochi/mangamochi/model/enumeration/UserRole.java b/src/main/java/com/magamochi/mangamochi/model/enumeration/UserRole.java deleted file mode 100644 index 0823d20..0000000 --- a/src/main/java/com/magamochi/mangamochi/model/enumeration/UserRole.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.magamochi.mangamochi.model.enumeration; - -public enum UserRole { - USER -} diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/AuthenticationRequestDTO.java b/src/main/java/com/magamochi/model/dto/AuthenticationRequestDTO.java similarity index 76% rename from src/main/java/com/magamochi/mangamochi/model/dto/AuthenticationRequestDTO.java rename to src/main/java/com/magamochi/model/dto/AuthenticationRequestDTO.java index f5fada2..d45bbbe 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/AuthenticationRequestDTO.java +++ b/src/main/java/com/magamochi/model/dto/AuthenticationRequestDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/AuthenticationResponseDTO.java b/src/main/java/com/magamochi/model/dto/AuthenticationResponseDTO.java similarity index 71% rename from src/main/java/com/magamochi/mangamochi/model/dto/AuthenticationResponseDTO.java rename to src/main/java/com/magamochi/model/dto/AuthenticationResponseDTO.java index 0d5d1ec..dae2b22 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/AuthenticationResponseDTO.java +++ b/src/main/java/com/magamochi/model/dto/AuthenticationResponseDTO.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; -import com.magamochi.mangamochi.model.enumeration.UserRole; +import com.magamochi.model.enumeration.UserRole; import jakarta.validation.constraints.NotNull; public record AuthenticationResponseDTO( diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/ContentProviderMangaChapterResponseDTO.java b/src/main/java/com/magamochi/model/dto/ContentProviderMangaChapterResponseDTO.java similarity index 83% rename from src/main/java/com/magamochi/mangamochi/model/dto/ContentProviderMangaChapterResponseDTO.java rename to src/main/java/com/magamochi/model/dto/ContentProviderMangaChapterResponseDTO.java index 5fe280f..0ea052c 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/ContentProviderMangaChapterResponseDTO.java +++ b/src/main/java/com/magamochi/model/dto/ContentProviderMangaChapterResponseDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import jakarta.validation.constraints.NotBlank; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/ContentProviderMangaInfoResponseDTO.java b/src/main/java/com/magamochi/model/dto/ContentProviderMangaInfoResponseDTO.java similarity index 61% rename from src/main/java/com/magamochi/mangamochi/model/dto/ContentProviderMangaInfoResponseDTO.java rename to src/main/java/com/magamochi/model/dto/ContentProviderMangaInfoResponseDTO.java index f91ee58..82ced22 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/ContentProviderMangaInfoResponseDTO.java +++ b/src/main/java/com/magamochi/model/dto/ContentProviderMangaInfoResponseDTO.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; -import com.magamochi.mangamochi.model.enumeration.MangaStatus; +import com.magamochi.model.enumeration.MangaStatus; import jakarta.validation.constraints.NotBlank; public record ContentProviderMangaInfoResponseDTO( diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/GenreDTO.java b/src/main/java/com/magamochi/model/dto/GenreDTO.java similarity index 73% rename from src/main/java/com/magamochi/mangamochi/model/dto/GenreDTO.java rename to src/main/java/com/magamochi/model/dto/GenreDTO.java index f6f50c1..1283415 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/GenreDTO.java +++ b/src/main/java/com/magamochi/model/dto/GenreDTO.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; -import com.magamochi.mangamochi.model.entity.Genre; +import com.magamochi.model.entity.Genre; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/ImportMangaResponseDTO.java b/src/main/java/com/magamochi/model/dto/ImportMangaResponseDTO.java similarity index 70% rename from src/main/java/com/magamochi/mangamochi/model/dto/ImportMangaResponseDTO.java rename to src/main/java/com/magamochi/model/dto/ImportMangaResponseDTO.java index 7a4327c..3810e7f 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/ImportMangaResponseDTO.java +++ b/src/main/java/com/magamochi/model/dto/ImportMangaResponseDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/ImportRequestDTO.java b/src/main/java/com/magamochi/model/dto/ImportRequestDTO.java similarity index 76% rename from src/main/java/com/magamochi/mangamochi/model/dto/ImportRequestDTO.java rename to src/main/java/com/magamochi/model/dto/ImportRequestDTO.java index 2b0d9f9..e83fce5 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/ImportRequestDTO.java +++ b/src/main/java/com/magamochi/model/dto/ImportRequestDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/ImportReviewDTO.java b/src/main/java/com/magamochi/model/dto/ImportReviewDTO.java similarity index 84% rename from src/main/java/com/magamochi/mangamochi/model/dto/ImportReviewDTO.java rename to src/main/java/com/magamochi/model/dto/ImportReviewDTO.java index b771d0c..58935d7 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/ImportReviewDTO.java +++ b/src/main/java/com/magamochi/model/dto/ImportReviewDTO.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; -import com.magamochi.mangamochi.model.entity.MangaImportReview; +import com.magamochi.model.entity.MangaImportReview; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import java.time.Instant; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/LanguageDTO.java b/src/main/java/com/magamochi/model/dto/LanguageDTO.java similarity index 81% rename from src/main/java/com/magamochi/mangamochi/model/dto/LanguageDTO.java rename to src/main/java/com/magamochi/model/dto/LanguageDTO.java index e2d9163..438264f 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/LanguageDTO.java +++ b/src/main/java/com/magamochi/model/dto/LanguageDTO.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import static java.util.Objects.isNull; -import com.magamochi.mangamochi.model.entity.Language; +import com.magamochi.model.entity.Language; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterArchiveDTO.java b/src/main/java/com/magamochi/model/dto/MangaChapterArchiveDTO.java similarity index 81% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterArchiveDTO.java rename to src/main/java/com/magamochi/model/dto/MangaChapterArchiveDTO.java index 503602a..30c7500 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterArchiveDTO.java +++ b/src/main/java/com/magamochi/model/dto/MangaChapterArchiveDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterDTO.java b/src/main/java/com/magamochi/model/dto/MangaChapterDTO.java similarity index 84% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterDTO.java rename to src/main/java/com/magamochi/model/dto/MangaChapterDTO.java index 9da55db..9e008b1 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterDTO.java +++ b/src/main/java/com/magamochi/model/dto/MangaChapterDTO.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; -import com.magamochi.mangamochi.model.entity.MangaChapter; +import com.magamochi.model.entity.MangaChapter; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterDownloadCommand.java b/src/main/java/com/magamochi/model/dto/MangaChapterDownloadCommand.java similarity index 58% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterDownloadCommand.java rename to src/main/java/com/magamochi/model/dto/MangaChapterDownloadCommand.java index 3f72132..13d8b3a 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterDownloadCommand.java +++ b/src/main/java/com/magamochi/model/dto/MangaChapterDownloadCommand.java @@ -1,3 +1,3 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; public record MangaChapterDownloadCommand(Long chapterId) {} diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterImagesDTO.java b/src/main/java/com/magamochi/model/dto/MangaChapterImagesDTO.java similarity index 83% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterImagesDTO.java rename to src/main/java/com/magamochi/model/dto/MangaChapterImagesDTO.java index f13bff6..35b3d3b 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterImagesDTO.java +++ b/src/main/java/com/magamochi/model/dto/MangaChapterImagesDTO.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; -import com.magamochi.mangamochi.model.entity.MangaChapter; -import com.magamochi.mangamochi.model.entity.MangaChapterImage; +import com.magamochi.model.entity.MangaChapter; +import com.magamochi.model.entity.MangaChapterImage; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import java.util.Comparator; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterResponseDTO.java b/src/main/java/com/magamochi/model/dto/MangaChapterResponseDTO.java similarity index 86% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterResponseDTO.java rename to src/main/java/com/magamochi/model/dto/MangaChapterResponseDTO.java index 2d7890d..46194d9 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaChapterResponseDTO.java +++ b/src/main/java/com/magamochi/model/dto/MangaChapterResponseDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import jakarta.validation.constraints.NotNull; import java.util.UUID; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaDTO.java b/src/main/java/com/magamochi/model/dto/MangaDTO.java similarity index 87% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaDTO.java rename to src/main/java/com/magamochi/model/dto/MangaDTO.java index 454a8e7..dd5301b 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaDTO.java +++ b/src/main/java/com/magamochi/model/dto/MangaDTO.java @@ -1,12 +1,12 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import static java.util.Objects.isNull; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.entity.MangaAlternativeTitle; -import com.magamochi.mangamochi.model.entity.MangaChapter; -import com.magamochi.mangamochi.model.entity.MangaProvider; -import com.magamochi.mangamochi.model.enumeration.ProviderStatus; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.MangaAlternativeTitle; +import com.magamochi.model.entity.MangaChapter; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.model.enumeration.ProviderStatus; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import java.time.OffsetDateTime; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaDexMangaDTO.java b/src/main/java/com/magamochi/model/dto/MangaDexMangaDTO.java similarity index 86% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaDexMangaDTO.java rename to src/main/java/com/magamochi/model/dto/MangaDexMangaDTO.java index 38c6753..127fcdf 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaDexMangaDTO.java +++ b/src/main/java/com/magamochi/model/dto/MangaDexMangaDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaListDTO.java b/src/main/java/com/magamochi/model/dto/MangaListDTO.java similarity index 92% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaListDTO.java rename to src/main/java/com/magamochi/model/dto/MangaListDTO.java index e4cc66f..bd08320 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaListDTO.java +++ b/src/main/java/com/magamochi/model/dto/MangaListDTO.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import static java.util.Objects.nonNull; -import com.magamochi.mangamochi.model.entity.Manga; +import com.magamochi.model.entity.Manga; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import java.time.OffsetDateTime; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaListFilterDTO.java b/src/main/java/com/magamochi/model/dto/MangaListFilterDTO.java similarity index 80% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaListFilterDTO.java rename to src/main/java/com/magamochi/model/dto/MangaListFilterDTO.java index f025d7b..dfd670e 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaListFilterDTO.java +++ b/src/main/java/com/magamochi/model/dto/MangaListFilterDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import java.util.List; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaListUpdateCommand.java b/src/main/java/com/magamochi/model/dto/MangaListUpdateCommand.java similarity index 65% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaListUpdateCommand.java rename to src/main/java/com/magamochi/model/dto/MangaListUpdateCommand.java index 28f714e..3e15233 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaListUpdateCommand.java +++ b/src/main/java/com/magamochi/model/dto/MangaListUpdateCommand.java @@ -1,3 +1,3 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; public record MangaListUpdateCommand(String contentProviderName, Integer page) {} diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/MangaMessageDTO.java b/src/main/java/com/magamochi/model/dto/MangaMessageDTO.java similarity index 78% rename from src/main/java/com/magamochi/mangamochi/model/dto/MangaMessageDTO.java rename to src/main/java/com/magamochi/model/dto/MangaMessageDTO.java index 910d99b..d529faa 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/MangaMessageDTO.java +++ b/src/main/java/com/magamochi/model/dto/MangaMessageDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import java.util.List; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/ProviderListDTO.java b/src/main/java/com/magamochi/model/dto/ProviderListDTO.java similarity index 84% rename from src/main/java/com/magamochi/mangamochi/model/dto/ProviderListDTO.java rename to src/main/java/com/magamochi/model/dto/ProviderListDTO.java index 6cb226f..a92a2f7 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/ProviderListDTO.java +++ b/src/main/java/com/magamochi/model/dto/ProviderListDTO.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; -import com.magamochi.mangamochi.model.entity.*; +import com.magamochi.model.entity.Provider; import jakarta.validation.constraints.NotNull; import java.util.List; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/RefreshTokenRequestDTO.java b/src/main/java/com/magamochi/model/dto/RefreshTokenRequestDTO.java similarity index 73% rename from src/main/java/com/magamochi/mangamochi/model/dto/RefreshTokenRequestDTO.java rename to src/main/java/com/magamochi/model/dto/RefreshTokenRequestDTO.java index d93fc5d..0d78a49 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/RefreshTokenRequestDTO.java +++ b/src/main/java/com/magamochi/model/dto/RefreshTokenRequestDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/RegistrationRequestDTO.java b/src/main/java/com/magamochi/model/dto/RegistrationRequestDTO.java similarity index 65% rename from src/main/java/com/magamochi/mangamochi/model/dto/RegistrationRequestDTO.java rename to src/main/java/com/magamochi/model/dto/RegistrationRequestDTO.java index 55cb983..f3d544f 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/RegistrationRequestDTO.java +++ b/src/main/java/com/magamochi/model/dto/RegistrationRequestDTO.java @@ -1,3 +1,3 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; public record RegistrationRequestDTO(String name, String email, String password) {} diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/TitleMatchRequestDTO.java b/src/main/java/com/magamochi/model/dto/TitleMatchRequestDTO.java similarity index 83% rename from src/main/java/com/magamochi/mangamochi/model/dto/TitleMatchRequestDTO.java rename to src/main/java/com/magamochi/model/dto/TitleMatchRequestDTO.java index a31b88c..835f1c0 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/TitleMatchRequestDTO.java +++ b/src/main/java/com/magamochi/model/dto/TitleMatchRequestDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import java.util.List; import lombok.Builder; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/TitleMatchResponseDTO.java b/src/main/java/com/magamochi/model/dto/TitleMatchResponseDTO.java similarity index 79% rename from src/main/java/com/magamochi/mangamochi/model/dto/TitleMatchResponseDTO.java rename to src/main/java/com/magamochi/model/dto/TitleMatchResponseDTO.java index c2a3362..d5d9f0d 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/TitleMatchResponseDTO.java +++ b/src/main/java/com/magamochi/model/dto/TitleMatchResponseDTO.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; import lombok.Builder; import lombok.Getter; diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/UpdateMangaDataCommand.java b/src/main/java/com/magamochi/model/dto/UpdateMangaDataCommand.java similarity index 55% rename from src/main/java/com/magamochi/mangamochi/model/dto/UpdateMangaDataCommand.java rename to src/main/java/com/magamochi/model/dto/UpdateMangaDataCommand.java index f37aac6..bca7526 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/UpdateMangaDataCommand.java +++ b/src/main/java/com/magamochi/model/dto/UpdateMangaDataCommand.java @@ -1,3 +1,3 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; public record UpdateMangaDataCommand(Long mangaId) {} diff --git a/src/main/java/com/magamochi/mangamochi/model/dto/UpdateMangaFollowChapterListCommand.java b/src/main/java/com/magamochi/model/dto/UpdateMangaFollowChapterListCommand.java similarity index 63% rename from src/main/java/com/magamochi/mangamochi/model/dto/UpdateMangaFollowChapterListCommand.java rename to src/main/java/com/magamochi/model/dto/UpdateMangaFollowChapterListCommand.java index 848720b..442ae9f 100644 --- a/src/main/java/com/magamochi/mangamochi/model/dto/UpdateMangaFollowChapterListCommand.java +++ b/src/main/java/com/magamochi/model/dto/UpdateMangaFollowChapterListCommand.java @@ -1,3 +1,3 @@ -package com.magamochi.mangamochi.model.dto; +package com.magamochi.model.dto; public record UpdateMangaFollowChapterListCommand(Long mangaProviderId) {} diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/Author.java b/src/main/java/com/magamochi/model/entity/Author.java similarity index 92% rename from src/main/java/com/magamochi/mangamochi/model/entity/Author.java rename to src/main/java/com/magamochi/model/entity/Author.java index e5217c6..22a2430 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/Author.java +++ b/src/main/java/com/magamochi/model/entity/Author.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import java.time.Instant; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/FlareSession.java b/src/main/java/com/magamochi/model/entity/FlareSession.java similarity index 83% rename from src/main/java/com/magamochi/mangamochi/model/entity/FlareSession.java rename to src/main/java/com/magamochi/model/entity/FlareSession.java index af02dba..e93224f 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/FlareSession.java +++ b/src/main/java/com/magamochi/model/entity/FlareSession.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import java.time.Instant; import lombok.Builder; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/Genre.java b/src/main/java/com/magamochi/model/entity/Genre.java similarity index 89% rename from src/main/java/com/magamochi/mangamochi/model/entity/Genre.java rename to src/main/java/com/magamochi/model/entity/Genre.java index de1b80d..a78e748 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/Genre.java +++ b/src/main/java/com/magamochi/model/entity/Genre.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import java.util.List; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/Image.java b/src/main/java/com/magamochi/model/entity/Image.java similarity index 91% rename from src/main/java/com/magamochi/mangamochi/model/entity/Image.java rename to src/main/java/com/magamochi/model/entity/Image.java index c13ce49..ec636cc 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/Image.java +++ b/src/main/java/com/magamochi/model/entity/Image.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import java.time.Instant; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/Language.java b/src/main/java/com/magamochi/model/entity/Language.java similarity index 86% rename from src/main/java/com/magamochi/mangamochi/model/entity/Language.java rename to src/main/java/com/magamochi/model/entity/Language.java index e09c187..b2b6250 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/Language.java +++ b/src/main/java/com/magamochi/model/entity/Language.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/Manga.java b/src/main/java/com/magamochi/model/entity/Manga.java similarity index 96% rename from src/main/java/com/magamochi/mangamochi/model/entity/Manga.java rename to src/main/java/com/magamochi/model/entity/Manga.java index 6c75e62..7eaaa32 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/Manga.java +++ b/src/main/java/com/magamochi/model/entity/Manga.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import java.time.Instant; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/MangaAlternativeTitle.java b/src/main/java/com/magamochi/model/entity/MangaAlternativeTitle.java similarity index 88% rename from src/main/java/com/magamochi/mangamochi/model/entity/MangaAlternativeTitle.java rename to src/main/java/com/magamochi/model/entity/MangaAlternativeTitle.java index 61f1d19..b178e04 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/MangaAlternativeTitle.java +++ b/src/main/java/com/magamochi/model/entity/MangaAlternativeTitle.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/MangaAuthor.java b/src/main/java/com/magamochi/model/entity/MangaAuthor.java similarity index 89% rename from src/main/java/com/magamochi/mangamochi/model/entity/MangaAuthor.java rename to src/main/java/com/magamochi/model/entity/MangaAuthor.java index d85e216..0e3468e 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/MangaAuthor.java +++ b/src/main/java/com/magamochi/model/entity/MangaAuthor.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/MangaChapter.java b/src/main/java/com/magamochi/model/entity/MangaChapter.java similarity index 95% rename from src/main/java/com/magamochi/mangamochi/model/entity/MangaChapter.java rename to src/main/java/com/magamochi/model/entity/MangaChapter.java index 0427f9e..d47f11d 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/MangaChapter.java +++ b/src/main/java/com/magamochi/model/entity/MangaChapter.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import java.time.Instant; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/MangaChapterImage.java b/src/main/java/com/magamochi/model/entity/MangaChapterImage.java similarity index 93% rename from src/main/java/com/magamochi/mangamochi/model/entity/MangaChapterImage.java rename to src/main/java/com/magamochi/model/entity/MangaChapterImage.java index abcfd00..25da2ba 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/MangaChapterImage.java +++ b/src/main/java/com/magamochi/model/entity/MangaChapterImage.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import java.time.Instant; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/MangaGenre.java b/src/main/java/com/magamochi/model/entity/MangaGenre.java similarity index 89% rename from src/main/java/com/magamochi/mangamochi/model/entity/MangaGenre.java rename to src/main/java/com/magamochi/model/entity/MangaGenre.java index 5f05135..7c0df2e 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/MangaGenre.java +++ b/src/main/java/com/magamochi/model/entity/MangaGenre.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/MangaImportReview.java b/src/main/java/com/magamochi/model/entity/MangaImportReview.java similarity index 91% rename from src/main/java/com/magamochi/mangamochi/model/entity/MangaImportReview.java rename to src/main/java/com/magamochi/model/entity/MangaImportReview.java index 9321c84..e291e7e 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/MangaImportReview.java +++ b/src/main/java/com/magamochi/model/entity/MangaImportReview.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import java.time.Instant; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/MangaProvider.java b/src/main/java/com/magamochi/model/entity/MangaProvider.java similarity index 94% rename from src/main/java/com/magamochi/mangamochi/model/entity/MangaProvider.java rename to src/main/java/com/magamochi/model/entity/MangaProvider.java index fbcb97d..0be20c9 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/MangaProvider.java +++ b/src/main/java/com/magamochi/model/entity/MangaProvider.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import java.time.Instant; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/Provider.java b/src/main/java/com/magamochi/model/entity/Provider.java similarity index 87% rename from src/main/java/com/magamochi/mangamochi/model/entity/Provider.java rename to src/main/java/com/magamochi/model/entity/Provider.java index bbea2ac..5e6d5d7 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/Provider.java +++ b/src/main/java/com/magamochi/model/entity/Provider.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; -import com.magamochi.mangamochi.model.enumeration.ProviderStatus; +import com.magamochi.model.enumeration.ProviderStatus; import jakarta.persistence.*; import java.time.Instant; import java.util.List; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/User.java b/src/main/java/com/magamochi/model/entity/User.java similarity index 85% rename from src/main/java/com/magamochi/mangamochi/model/entity/User.java rename to src/main/java/com/magamochi/model/entity/User.java index b40f6ff..dd52061 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/User.java +++ b/src/main/java/com/magamochi/model/entity/User.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; -import com.magamochi.mangamochi.model.enumeration.UserRole; +import com.magamochi.model.enumeration.UserRole; import jakarta.persistence.*; import java.util.Set; import lombok.*; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/UserFavoriteManga.java b/src/main/java/com/magamochi/model/entity/UserFavoriteManga.java similarity index 91% rename from src/main/java/com/magamochi/mangamochi/model/entity/UserFavoriteManga.java rename to src/main/java/com/magamochi/model/entity/UserFavoriteManga.java index a684f17..102f50d 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/UserFavoriteManga.java +++ b/src/main/java/com/magamochi/model/entity/UserFavoriteManga.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import java.time.Instant; diff --git a/src/main/java/com/magamochi/mangamochi/model/entity/UserMangaFollow.java b/src/main/java/com/magamochi/model/entity/UserMangaFollow.java similarity index 89% rename from src/main/java/com/magamochi/mangamochi/model/entity/UserMangaFollow.java rename to src/main/java/com/magamochi/model/entity/UserMangaFollow.java index 633c17d..c62932f 100644 --- a/src/main/java/com/magamochi/mangamochi/model/entity/UserMangaFollow.java +++ b/src/main/java/com/magamochi/model/entity/UserMangaFollow.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.entity; +package com.magamochi.model.entity; import jakarta.persistence.*; import lombok.*; diff --git a/src/main/java/com/magamochi/model/enumeration/ArchiveFileType.java b/src/main/java/com/magamochi/model/enumeration/ArchiveFileType.java new file mode 100644 index 0000000..4a26d3f --- /dev/null +++ b/src/main/java/com/magamochi/model/enumeration/ArchiveFileType.java @@ -0,0 +1,6 @@ +package com.magamochi.model.enumeration; + +public enum ArchiveFileType { + CBZ, + CBR +} diff --git a/src/main/java/com/magamochi/mangamochi/model/enumeration/MangaStatus.java b/src/main/java/com/magamochi/model/enumeration/MangaStatus.java similarity index 62% rename from src/main/java/com/magamochi/mangamochi/model/enumeration/MangaStatus.java rename to src/main/java/com/magamochi/model/enumeration/MangaStatus.java index d0dc22e..d7e3ca5 100644 --- a/src/main/java/com/magamochi/mangamochi/model/enumeration/MangaStatus.java +++ b/src/main/java/com/magamochi/model/enumeration/MangaStatus.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.enumeration; +package com.magamochi.model.enumeration; public enum MangaStatus { ONGOING, diff --git a/src/main/java/com/magamochi/mangamochi/model/enumeration/ProviderStatus.java b/src/main/java/com/magamochi/model/enumeration/ProviderStatus.java similarity index 50% rename from src/main/java/com/magamochi/mangamochi/model/enumeration/ProviderStatus.java rename to src/main/java/com/magamochi/model/enumeration/ProviderStatus.java index cb09460..c09ddb0 100644 --- a/src/main/java/com/magamochi/mangamochi/model/enumeration/ProviderStatus.java +++ b/src/main/java/com/magamochi/model/enumeration/ProviderStatus.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.model.enumeration; +package com.magamochi.model.enumeration; public enum ProviderStatus { ACTIVE, diff --git a/src/main/java/com/magamochi/model/enumeration/UserRole.java b/src/main/java/com/magamochi/model/enumeration/UserRole.java new file mode 100644 index 0000000..dc9b57e --- /dev/null +++ b/src/main/java/com/magamochi/model/enumeration/UserRole.java @@ -0,0 +1,5 @@ +package com.magamochi.model.enumeration; + +public enum UserRole { + USER +} diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/AuthorRepository.java b/src/main/java/com/magamochi/model/repository/AuthorRepository.java similarity index 70% rename from src/main/java/com/magamochi/mangamochi/model/repository/AuthorRepository.java rename to src/main/java/com/magamochi/model/repository/AuthorRepository.java index 4ab61ff..52e4465 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/AuthorRepository.java +++ b/src/main/java/com/magamochi/model/repository/AuthorRepository.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.Author; +import com.magamochi.model.entity.Author; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/GenreRepository.java b/src/main/java/com/magamochi/model/repository/GenreRepository.java similarity index 70% rename from src/main/java/com/magamochi/mangamochi/model/repository/GenreRepository.java rename to src/main/java/com/magamochi/model/repository/GenreRepository.java index 438148e..3acbe30 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/GenreRepository.java +++ b/src/main/java/com/magamochi/model/repository/GenreRepository.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.Genre; +import com.magamochi.model.entity.Genre; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/ImageRepository.java b/src/main/java/com/magamochi/model/repository/ImageRepository.java similarity index 60% rename from src/main/java/com/magamochi/mangamochi/model/repository/ImageRepository.java rename to src/main/java/com/magamochi/model/repository/ImageRepository.java index 688fa9b..9decd54 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/ImageRepository.java +++ b/src/main/java/com/magamochi/model/repository/ImageRepository.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.Image; +import com.magamochi.model.entity.Image; import java.util.UUID; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/LanguageRepository.java b/src/main/java/com/magamochi/model/repository/LanguageRepository.java similarity index 67% rename from src/main/java/com/magamochi/mangamochi/model/repository/LanguageRepository.java rename to src/main/java/com/magamochi/model/repository/LanguageRepository.java index 5411c94..0c288c2 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/LanguageRepository.java +++ b/src/main/java/com/magamochi/model/repository/LanguageRepository.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.Language; +import com.magamochi.model.entity.Language; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/MangaAlternativeTitlesRepository.java b/src/main/java/com/magamochi/model/repository/MangaAlternativeTitlesRepository.java similarity index 59% rename from src/main/java/com/magamochi/mangamochi/model/repository/MangaAlternativeTitlesRepository.java rename to src/main/java/com/magamochi/model/repository/MangaAlternativeTitlesRepository.java index 150f704..86bc9a0 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/MangaAlternativeTitlesRepository.java +++ b/src/main/java/com/magamochi/model/repository/MangaAlternativeTitlesRepository.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.MangaAlternativeTitle; +import com.magamochi.model.entity.MangaAlternativeTitle; import org.springframework.data.jpa.repository.JpaRepository; public interface MangaAlternativeTitlesRepository diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/MangaAuthorRepository.java b/src/main/java/com/magamochi/model/repository/MangaAuthorRepository.java similarity index 53% rename from src/main/java/com/magamochi/mangamochi/model/repository/MangaAuthorRepository.java rename to src/main/java/com/magamochi/model/repository/MangaAuthorRepository.java index 5020397..78a4833 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/MangaAuthorRepository.java +++ b/src/main/java/com/magamochi/model/repository/MangaAuthorRepository.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.Author; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.entity.MangaAuthor; +import com.magamochi.model.entity.Author; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.MangaAuthor; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/MangaChapterImageRepository.java b/src/main/java/com/magamochi/model/repository/MangaChapterImageRepository.java similarity index 59% rename from src/main/java/com/magamochi/mangamochi/model/repository/MangaChapterImageRepository.java rename to src/main/java/com/magamochi/model/repository/MangaChapterImageRepository.java index a312418..0dd8574 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/MangaChapterImageRepository.java +++ b/src/main/java/com/magamochi/model/repository/MangaChapterImageRepository.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.MangaChapter; -import com.magamochi.mangamochi.model.entity.MangaChapterImage; +import com.magamochi.model.entity.MangaChapter; +import com.magamochi.model.entity.MangaChapterImage; import java.util.List; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/MangaChapterRepository.java b/src/main/java/com/magamochi/model/repository/MangaChapterRepository.java similarity index 71% rename from src/main/java/com/magamochi/mangamochi/model/repository/MangaChapterRepository.java rename to src/main/java/com/magamochi/model/repository/MangaChapterRepository.java index 7e104f0..3292cff 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/MangaChapterRepository.java +++ b/src/main/java/com/magamochi/model/repository/MangaChapterRepository.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.MangaChapter; -import com.magamochi.mangamochi.model.entity.MangaProvider; +import com.magamochi.model.entity.MangaChapter; +import com.magamochi.model.entity.MangaProvider; import jakarta.validation.constraints.NotBlank; import java.util.List; import java.util.Optional; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/MangaGenreRepository.java b/src/main/java/com/magamochi/model/repository/MangaGenreRepository.java similarity index 59% rename from src/main/java/com/magamochi/mangamochi/model/repository/MangaGenreRepository.java rename to src/main/java/com/magamochi/model/repository/MangaGenreRepository.java index fd100fc..c0843b9 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/MangaGenreRepository.java +++ b/src/main/java/com/magamochi/model/repository/MangaGenreRepository.java @@ -1,6 +1,8 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.*; +import com.magamochi.model.entity.Genre; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.MangaGenre; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/MangaImportReviewRepository.java b/src/main/java/com/magamochi/model/repository/MangaImportReviewRepository.java similarity index 67% rename from src/main/java/com/magamochi/mangamochi/model/repository/MangaImportReviewRepository.java rename to src/main/java/com/magamochi/model/repository/MangaImportReviewRepository.java index 8114803..023006f 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/MangaImportReviewRepository.java +++ b/src/main/java/com/magamochi/model/repository/MangaImportReviewRepository.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.MangaImportReview; +import com.magamochi.model.entity.MangaImportReview; import org.springframework.data.jpa.repository.JpaRepository; public interface MangaImportReviewRepository extends JpaRepository { diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/MangaProviderRepository.java b/src/main/java/com/magamochi/model/repository/MangaProviderRepository.java similarity index 63% rename from src/main/java/com/magamochi/mangamochi/model/repository/MangaProviderRepository.java rename to src/main/java/com/magamochi/model/repository/MangaProviderRepository.java index 814d6d5..eb10676 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/MangaProviderRepository.java +++ b/src/main/java/com/magamochi/model/repository/MangaProviderRepository.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.entity.MangaProvider; -import com.magamochi.mangamochi.model.entity.Provider; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.model.entity.Provider; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/MangaRepository.java b/src/main/java/com/magamochi/model/repository/MangaRepository.java similarity index 82% rename from src/main/java/com/magamochi/mangamochi/model/repository/MangaRepository.java rename to src/main/java/com/magamochi/model/repository/MangaRepository.java index 8e981e9..9f0a088 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/MangaRepository.java +++ b/src/main/java/com/magamochi/model/repository/MangaRepository.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.Manga; +import com.magamochi.model.entity.Manga; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/ProviderRepository.java b/src/main/java/com/magamochi/model/repository/ProviderRepository.java similarity index 67% rename from src/main/java/com/magamochi/mangamochi/model/repository/ProviderRepository.java rename to src/main/java/com/magamochi/model/repository/ProviderRepository.java index 762bc93..57ba04a 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/ProviderRepository.java +++ b/src/main/java/com/magamochi/model/repository/ProviderRepository.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.Provider; +import com.magamochi.model.entity.Provider; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/UserFavoriteMangaRepository.java b/src/main/java/com/magamochi/model/repository/UserFavoriteMangaRepository.java similarity index 64% rename from src/main/java/com/magamochi/mangamochi/model/repository/UserFavoriteMangaRepository.java rename to src/main/java/com/magamochi/model/repository/UserFavoriteMangaRepository.java index 5567b26..365c5ba 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/UserFavoriteMangaRepository.java +++ b/src/main/java/com/magamochi/model/repository/UserFavoriteMangaRepository.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.entity.User; -import com.magamochi.mangamochi.model.entity.UserFavoriteManga; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.User; +import com.magamochi.model.entity.UserFavoriteManga; import java.util.Optional; import java.util.Set; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/UserMangaFollowRepository.java b/src/main/java/com/magamochi/model/repository/UserMangaFollowRepository.java similarity index 68% rename from src/main/java/com/magamochi/mangamochi/model/repository/UserMangaFollowRepository.java rename to src/main/java/com/magamochi/model/repository/UserMangaFollowRepository.java index 9bb374a..154e532 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/UserMangaFollowRepository.java +++ b/src/main/java/com/magamochi/model/repository/UserMangaFollowRepository.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.entity.User; -import com.magamochi.mangamochi.model.entity.UserMangaFollow; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.User; +import com.magamochi.model.entity.UserMangaFollow; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/repository/UserRepository.java b/src/main/java/com/magamochi/model/repository/UserRepository.java similarity index 70% rename from src/main/java/com/magamochi/mangamochi/model/repository/UserRepository.java rename to src/main/java/com/magamochi/model/repository/UserRepository.java index 6b31929..f083182 100644 --- a/src/main/java/com/magamochi/mangamochi/model/repository/UserRepository.java +++ b/src/main/java/com/magamochi/model/repository/UserRepository.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.model.repository; +package com.magamochi.model.repository; -import com.magamochi.mangamochi.model.entity.User; +import com.magamochi.model.entity.User; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/com/magamochi/mangamochi/model/specification/MangaSpecification.java b/src/main/java/com/magamochi/model/specification/MangaSpecification.java similarity index 92% rename from src/main/java/com/magamochi/mangamochi/model/specification/MangaSpecification.java rename to src/main/java/com/magamochi/model/specification/MangaSpecification.java index 267938e..4720847 100644 --- a/src/main/java/com/magamochi/mangamochi/model/specification/MangaSpecification.java +++ b/src/main/java/com/magamochi/model/specification/MangaSpecification.java @@ -1,11 +1,11 @@ -package com.magamochi.mangamochi.model.specification; +package com.magamochi.model.specification; import static java.util.Objects.nonNull; -import com.magamochi.mangamochi.model.dto.MangaListFilterDTO; -import com.magamochi.mangamochi.model.entity.Author; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.entity.User; +import com.magamochi.model.dto.MangaListFilterDTO; +import com.magamochi.model.entity.Author; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.User; import jakarta.persistence.criteria.*; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/magamochi/mangamochi/queue/MangaChapterDownloadConsumer.java b/src/main/java/com/magamochi/queue/MangaChapterDownloadConsumer.java similarity index 81% rename from src/main/java/com/magamochi/mangamochi/queue/MangaChapterDownloadConsumer.java rename to src/main/java/com/magamochi/queue/MangaChapterDownloadConsumer.java index 3c286c2..43da465 100644 --- a/src/main/java/com/magamochi/mangamochi/queue/MangaChapterDownloadConsumer.java +++ b/src/main/java/com/magamochi/queue/MangaChapterDownloadConsumer.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.queue; +package com.magamochi.queue; -import com.magamochi.mangamochi.model.dto.MangaChapterDownloadCommand; -import com.magamochi.mangamochi.service.MangaChapterService; +import com.magamochi.model.dto.MangaChapterDownloadCommand; +import com.magamochi.service.MangaChapterService; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.annotation.RabbitListener; diff --git a/src/main/java/com/magamochi/mangamochi/queue/MangaChapterDownloadProducer.java b/src/main/java/com/magamochi/queue/MangaChapterDownloadProducer.java similarity index 86% rename from src/main/java/com/magamochi/mangamochi/queue/MangaChapterDownloadProducer.java rename to src/main/java/com/magamochi/queue/MangaChapterDownloadProducer.java index dfafb53..740eaf4 100644 --- a/src/main/java/com/magamochi/mangamochi/queue/MangaChapterDownloadProducer.java +++ b/src/main/java/com/magamochi/queue/MangaChapterDownloadProducer.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.queue; +package com.magamochi.queue; -import com.magamochi.mangamochi.model.dto.MangaChapterDownloadCommand; +import com.magamochi.model.dto.MangaChapterDownloadCommand; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.core.RabbitTemplate; diff --git a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaDataConsumer.java b/src/main/java/com/magamochi/queue/UpdateMangaDataConsumer.java similarity index 78% rename from src/main/java/com/magamochi/mangamochi/queue/UpdateMangaDataConsumer.java rename to src/main/java/com/magamochi/queue/UpdateMangaDataConsumer.java index 519c5bc..2aa0169 100644 --- a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaDataConsumer.java +++ b/src/main/java/com/magamochi/queue/UpdateMangaDataConsumer.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.queue; +package com.magamochi.queue; -import com.magamochi.mangamochi.model.dto.UpdateMangaDataCommand; -import com.magamochi.mangamochi.service.MangaImportService; +import com.magamochi.model.dto.UpdateMangaDataCommand; +import com.magamochi.service.MangaImportService; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.annotation.RabbitListener; diff --git a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaDataProducer.java b/src/main/java/com/magamochi/queue/UpdateMangaDataProducer.java similarity index 86% rename from src/main/java/com/magamochi/mangamochi/queue/UpdateMangaDataProducer.java rename to src/main/java/com/magamochi/queue/UpdateMangaDataProducer.java index 12f67a9..8516218 100644 --- a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaDataProducer.java +++ b/src/main/java/com/magamochi/queue/UpdateMangaDataProducer.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.queue; +package com.magamochi.queue; -import com.magamochi.mangamochi.model.dto.UpdateMangaDataCommand; +import com.magamochi.model.dto.UpdateMangaDataCommand; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.core.RabbitTemplate; diff --git a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaFollowChapterListConsumer.java b/src/main/java/com/magamochi/queue/UpdateMangaFollowChapterListConsumer.java similarity index 79% rename from src/main/java/com/magamochi/mangamochi/queue/UpdateMangaFollowChapterListConsumer.java rename to src/main/java/com/magamochi/queue/UpdateMangaFollowChapterListConsumer.java index 4d1632f..64b40f2 100644 --- a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaFollowChapterListConsumer.java +++ b/src/main/java/com/magamochi/queue/UpdateMangaFollowChapterListConsumer.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.queue; +package com.magamochi.queue; -import com.magamochi.mangamochi.model.dto.UpdateMangaFollowChapterListCommand; -import com.magamochi.mangamochi.service.MangaService; +import com.magamochi.model.dto.UpdateMangaFollowChapterListCommand; +import com.magamochi.service.MangaService; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.annotation.RabbitListener; diff --git a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaFollowChapterListProducer.java b/src/main/java/com/magamochi/queue/UpdateMangaFollowChapterListProducer.java similarity index 86% rename from src/main/java/com/magamochi/mangamochi/queue/UpdateMangaFollowChapterListProducer.java rename to src/main/java/com/magamochi/queue/UpdateMangaFollowChapterListProducer.java index 14ee2c9..124d3a5 100644 --- a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaFollowChapterListProducer.java +++ b/src/main/java/com/magamochi/queue/UpdateMangaFollowChapterListProducer.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.queue; +package com.magamochi.queue; -import com.magamochi.mangamochi.model.dto.UpdateMangaFollowChapterListCommand; +import com.magamochi.model.dto.UpdateMangaFollowChapterListCommand; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.core.RabbitTemplate; diff --git a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaListConsumer.java b/src/main/java/com/magamochi/queue/UpdateMangaListConsumer.java similarity index 79% rename from src/main/java/com/magamochi/mangamochi/queue/UpdateMangaListConsumer.java rename to src/main/java/com/magamochi/queue/UpdateMangaListConsumer.java index e8e3a0b..6a04c3c 100644 --- a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaListConsumer.java +++ b/src/main/java/com/magamochi/queue/UpdateMangaListConsumer.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.queue; +package com.magamochi.queue; -import com.magamochi.mangamochi.model.dto.MangaListUpdateCommand; -import com.magamochi.mangamochi.service.MangaListService; +import com.magamochi.model.dto.MangaListUpdateCommand; +import com.magamochi.service.MangaListService; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.annotation.RabbitListener; diff --git a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaListProducer.java b/src/main/java/com/magamochi/queue/UpdateMangaListProducer.java similarity index 86% rename from src/main/java/com/magamochi/mangamochi/queue/UpdateMangaListProducer.java rename to src/main/java/com/magamochi/queue/UpdateMangaListProducer.java index e154d0d..7d74af5 100644 --- a/src/main/java/com/magamochi/mangamochi/queue/UpdateMangaListProducer.java +++ b/src/main/java/com/magamochi/queue/UpdateMangaListProducer.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.queue; +package com.magamochi.queue; -import com.magamochi.mangamochi.model.dto.MangaListUpdateCommand; +import com.magamochi.model.dto.MangaListUpdateCommand; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.amqp.rabbit.core.RabbitTemplate; diff --git a/src/main/java/com/magamochi/mangamochi/registry/FlareSessionRegistry.java b/src/main/java/com/magamochi/registry/FlareSessionRegistry.java similarity index 83% rename from src/main/java/com/magamochi/mangamochi/registry/FlareSessionRegistry.java rename to src/main/java/com/magamochi/registry/FlareSessionRegistry.java index 33f6b68..969480f 100644 --- a/src/main/java/com/magamochi/mangamochi/registry/FlareSessionRegistry.java +++ b/src/main/java/com/magamochi/registry/FlareSessionRegistry.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.registry; +package com.magamochi.registry; -import com.magamochi.mangamochi.model.entity.FlareSession; +import com.magamochi.model.entity.FlareSession; import java.util.concurrent.ConcurrentHashMap; import lombok.Getter; import org.springframework.stereotype.Component; diff --git a/src/main/java/com/magamochi/mangamochi/security/JwtRequestFilter.java b/src/main/java/com/magamochi/security/JwtRequestFilter.java similarity index 94% rename from src/main/java/com/magamochi/mangamochi/security/JwtRequestFilter.java rename to src/main/java/com/magamochi/security/JwtRequestFilter.java index 719c8f2..a41c07e 100644 --- a/src/main/java/com/magamochi/mangamochi/security/JwtRequestFilter.java +++ b/src/main/java/com/magamochi/security/JwtRequestFilter.java @@ -1,10 +1,10 @@ -package com.magamochi.mangamochi.security; +package com.magamochi.security; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import com.magamochi.mangamochi.service.CustomUserDetailsService; -import com.magamochi.mangamochi.util.JwtUtil; +import com.magamochi.service.CustomUserDetailsService; +import com.magamochi.util.JwtUtil; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/com/magamochi/mangamochi/service/CustomUserDetailsService.java b/src/main/java/com/magamochi/service/CustomUserDetailsService.java similarity index 91% rename from src/main/java/com/magamochi/mangamochi/service/CustomUserDetailsService.java rename to src/main/java/com/magamochi/service/CustomUserDetailsService.java index 9ce19af..c15b00a 100644 --- a/src/main/java/com/magamochi/mangamochi/service/CustomUserDetailsService.java +++ b/src/main/java/com/magamochi/service/CustomUserDetailsService.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; -import com.magamochi.mangamochi.model.repository.UserRepository; +import com.magamochi.model.repository.UserRepository; import java.util.Collections; import lombok.RequiredArgsConstructor; import org.springframework.security.core.authority.SimpleGrantedAuthority; diff --git a/src/main/java/com/magamochi/mangamochi/service/FlareService.java b/src/main/java/com/magamochi/service/FlareService.java similarity index 88% rename from src/main/java/com/magamochi/mangamochi/service/FlareService.java rename to src/main/java/com/magamochi/service/FlareService.java index bac79a2..8ee2d9d 100644 --- a/src/main/java/com/magamochi/mangamochi/service/FlareService.java +++ b/src/main/java/com/magamochi/service/FlareService.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; -import com.magamochi.mangamochi.client.FlareClient; +import com.magamochi.client.FlareClient; import lombok.RequiredArgsConstructor; import org.jsoup.Jsoup; import org.jsoup.nodes.Document; diff --git a/src/main/java/com/magamochi/mangamochi/service/FlareSessionManager.java b/src/main/java/com/magamochi/service/FlareSessionManager.java similarity index 88% rename from src/main/java/com/magamochi/mangamochi/service/FlareSessionManager.java rename to src/main/java/com/magamochi/service/FlareSessionManager.java index 97c16d8..eea1d60 100644 --- a/src/main/java/com/magamochi/mangamochi/service/FlareSessionManager.java +++ b/src/main/java/com/magamochi/service/FlareSessionManager.java @@ -1,11 +1,11 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import com.magamochi.mangamochi.client.FlareClient; -import com.magamochi.mangamochi.model.entity.FlareSession; -import com.magamochi.mangamochi.registry.FlareSessionRegistry; +import com.magamochi.client.FlareClient; +import com.magamochi.model.entity.FlareSession; +import com.magamochi.registry.FlareSessionRegistry; import java.time.Duration; import java.time.Instant; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/magamochi/mangamochi/service/GenreService.java b/src/main/java/com/magamochi/service/GenreService.java similarity index 69% rename from src/main/java/com/magamochi/mangamochi/service/GenreService.java rename to src/main/java/com/magamochi/service/GenreService.java index bf6d4c2..e18f4ef 100644 --- a/src/main/java/com/magamochi/mangamochi/service/GenreService.java +++ b/src/main/java/com/magamochi/service/GenreService.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; -import com.magamochi.mangamochi.model.dto.GenreDTO; -import com.magamochi.mangamochi.model.repository.GenreRepository; +import com.magamochi.model.dto.GenreDTO; +import com.magamochi.model.repository.GenreRepository; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/magamochi/mangamochi/service/ImageService.java b/src/main/java/com/magamochi/service/ImageService.java similarity index 81% rename from src/main/java/com/magamochi/mangamochi/service/ImageService.java rename to src/main/java/com/magamochi/service/ImageService.java index 8162b06..da41ced 100644 --- a/src/main/java/com/magamochi/mangamochi/service/ImageService.java +++ b/src/main/java/com/magamochi/service/ImageService.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; -import com.magamochi.mangamochi.model.entity.Image; -import com.magamochi.mangamochi.model.repository.ImageRepository; +import com.magamochi.model.entity.Image; +import com.magamochi.model.repository.ImageRepository; import java.io.InputStream; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/com/magamochi/mangamochi/service/LanguageService.java b/src/main/java/com/magamochi/service/LanguageService.java similarity index 64% rename from src/main/java/com/magamochi/mangamochi/service/LanguageService.java rename to src/main/java/com/magamochi/service/LanguageService.java index 7c7ba84..b37ff9d 100644 --- a/src/main/java/com/magamochi/mangamochi/service/LanguageService.java +++ b/src/main/java/com/magamochi/service/LanguageService.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; -import com.magamochi.mangamochi.common.exception.NotFoundException; -import com.magamochi.mangamochi.model.entity.Language; -import com.magamochi.mangamochi.model.repository.LanguageRepository; +import com.magamochi.common.exception.NotFoundException; +import com.magamochi.model.entity.Language; +import com.magamochi.model.repository.LanguageRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/magamochi/mangamochi/service/MangaChapterService.java b/src/main/java/com/magamochi/service/MangaChapterService.java similarity index 91% rename from src/main/java/com/magamochi/mangamochi/service/MangaChapterService.java rename to src/main/java/com/magamochi/service/MangaChapterService.java index 98085f9..3c0ab72 100644 --- a/src/main/java/com/magamochi/mangamochi/service/MangaChapterService.java +++ b/src/main/java/com/magamochi/service/MangaChapterService.java @@ -1,15 +1,15 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import com.google.common.util.concurrent.RateLimiter; -import com.magamochi.mangamochi.common.exception.UnprocessableException; -import com.magamochi.mangamochi.model.dto.MangaChapterArchiveDTO; -import com.magamochi.mangamochi.model.dto.MangaChapterImagesDTO; -import com.magamochi.mangamochi.model.entity.MangaChapter; -import com.magamochi.mangamochi.model.entity.MangaChapterImage; -import com.magamochi.mangamochi.model.enumeration.ArchiveFileType; -import com.magamochi.mangamochi.model.repository.MangaChapterImageRepository; -import com.magamochi.mangamochi.model.repository.MangaChapterRepository; -import com.magamochi.mangamochi.service.providers.ContentProviderFactory; +import com.magamochi.common.exception.UnprocessableException; +import com.magamochi.model.dto.MangaChapterArchiveDTO; +import com.magamochi.model.dto.MangaChapterImagesDTO; +import com.magamochi.model.entity.MangaChapter; +import com.magamochi.model.entity.MangaChapterImage; +import com.magamochi.model.enumeration.ArchiveFileType; +import com.magamochi.model.repository.MangaChapterImageRepository; +import com.magamochi.model.repository.MangaChapterRepository; +import com.magamochi.service.providers.ContentProviderFactory; import io.github.resilience4j.retry.Retry; import io.github.resilience4j.retry.RetryRegistry; import java.io.BufferedInputStream; diff --git a/src/main/java/com/magamochi/mangamochi/service/MangaCreationService.java b/src/main/java/com/magamochi/service/MangaCreationService.java similarity index 88% rename from src/main/java/com/magamochi/mangamochi/service/MangaCreationService.java rename to src/main/java/com/magamochi/service/MangaCreationService.java index 6e22b1e..343ab56 100644 --- a/src/main/java/com/magamochi/mangamochi/service/MangaCreationService.java +++ b/src/main/java/com/magamochi/service/MangaCreationService.java @@ -1,18 +1,18 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static java.util.Objects.nonNull; import com.google.common.util.concurrent.RateLimiter; -import com.magamochi.mangamochi.client.AniListClient; -import com.magamochi.mangamochi.client.JikanClient; -import com.magamochi.mangamochi.model.dto.TitleMatchRequestDTO; -import com.magamochi.mangamochi.model.dto.UpdateMangaDataCommand; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.entity.MangaImportReview; -import com.magamochi.mangamochi.model.entity.Provider; -import com.magamochi.mangamochi.model.repository.MangaImportReviewRepository; -import com.magamochi.mangamochi.model.repository.MangaRepository; -import com.magamochi.mangamochi.queue.UpdateMangaDataProducer; +import com.magamochi.client.AniListClient; +import com.magamochi.client.JikanClient; +import com.magamochi.model.dto.TitleMatchRequestDTO; +import com.magamochi.model.dto.UpdateMangaDataCommand; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.MangaImportReview; +import com.magamochi.model.entity.Provider; +import com.magamochi.model.repository.MangaImportReviewRepository; +import com.magamochi.model.repository.MangaRepository; +import com.magamochi.queue.UpdateMangaDataProducer; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/magamochi/mangamochi/service/MangaImportReviewService.java b/src/main/java/com/magamochi/service/MangaImportReviewService.java similarity index 76% rename from src/main/java/com/magamochi/mangamochi/service/MangaImportReviewService.java rename to src/main/java/com/magamochi/service/MangaImportReviewService.java index e0a0a30..7b772cd 100644 --- a/src/main/java/com/magamochi/mangamochi/service/MangaImportReviewService.java +++ b/src/main/java/com/magamochi/service/MangaImportReviewService.java @@ -1,19 +1,19 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static java.util.Objects.isNull; import com.google.common.util.concurrent.RateLimiter; -import com.magamochi.mangamochi.client.JikanClient; -import com.magamochi.mangamochi.common.exception.NotFoundException; -import com.magamochi.mangamochi.model.dto.ImportReviewDTO; -import com.magamochi.mangamochi.model.dto.UpdateMangaDataCommand; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.entity.MangaImportReview; -import com.magamochi.mangamochi.model.entity.MangaProvider; -import com.magamochi.mangamochi.model.repository.MangaImportReviewRepository; -import com.magamochi.mangamochi.model.repository.MangaProviderRepository; -import com.magamochi.mangamochi.model.repository.MangaRepository; -import com.magamochi.mangamochi.queue.UpdateMangaDataProducer; +import com.magamochi.client.JikanClient; +import com.magamochi.common.exception.NotFoundException; +import com.magamochi.model.dto.ImportReviewDTO; +import com.magamochi.model.dto.UpdateMangaDataCommand; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.MangaImportReview; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.model.repository.MangaImportReviewRepository; +import com.magamochi.model.repository.MangaProviderRepository; +import com.magamochi.model.repository.MangaRepository; +import com.magamochi.queue.UpdateMangaDataProducer; import java.util.List; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/magamochi/mangamochi/service/MangaImportService.java b/src/main/java/com/magamochi/service/MangaImportService.java similarity index 96% rename from src/main/java/com/magamochi/mangamochi/service/MangaImportService.java rename to src/main/java/com/magamochi/service/MangaImportService.java index ef95e92..eb6c578 100644 --- a/src/main/java/com/magamochi/mangamochi/service/MangaImportService.java +++ b/src/main/java/com/magamochi/service/MangaImportService.java @@ -1,16 +1,16 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; import com.google.common.util.concurrent.RateLimiter; -import com.magamochi.mangamochi.client.AniListClient; -import com.magamochi.mangamochi.client.JikanClient; -import com.magamochi.mangamochi.common.exception.NotFoundException; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaChapterResponseDTO; -import com.magamochi.mangamochi.model.entity.*; -import com.magamochi.mangamochi.model.repository.*; -import com.magamochi.mangamochi.util.DoubleUtil; +import com.magamochi.client.AniListClient; +import com.magamochi.client.JikanClient; +import com.magamochi.common.exception.NotFoundException; +import com.magamochi.model.dto.ContentProviderMangaChapterResponseDTO; +import com.magamochi.model.entity.*; +import com.magamochi.model.repository.*; +import com.magamochi.util.DoubleUtil; import java.io.*; import java.net.URI; import java.net.URISyntaxException; diff --git a/src/main/java/com/magamochi/mangamochi/service/MangaListService.java b/src/main/java/com/magamochi/service/MangaListService.java similarity index 87% rename from src/main/java/com/magamochi/mangamochi/service/MangaListService.java rename to src/main/java/com/magamochi/service/MangaListService.java index add1f16..6f51af4 100644 --- a/src/main/java/com/magamochi/mangamochi/service/MangaListService.java +++ b/src/main/java/com/magamochi/service/MangaListService.java @@ -1,10 +1,10 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static java.util.Objects.isNull; -import com.magamochi.mangamochi.model.entity.MangaProvider; -import com.magamochi.mangamochi.model.repository.MangaProviderRepository; -import com.magamochi.mangamochi.service.providers.PagedContentProviderFactory; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.model.repository.MangaProviderRepository; +import com.magamochi.service.providers.PagedContentProviderFactory; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/magamochi/mangamochi/service/MangaService.java b/src/main/java/com/magamochi/service/MangaService.java similarity index 90% rename from src/main/java/com/magamochi/mangamochi/service/MangaService.java rename to src/main/java/com/magamochi/service/MangaService.java index 4e39e72..7df23a5 100644 --- a/src/main/java/com/magamochi/mangamochi/service/MangaService.java +++ b/src/main/java/com/magamochi/service/MangaService.java @@ -1,18 +1,18 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static java.util.Objects.nonNull; -import com.magamochi.mangamochi.client.NtfyClient; -import com.magamochi.mangamochi.common.exception.NotFoundException; -import com.magamochi.mangamochi.model.dto.*; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.entity.MangaChapter; -import com.magamochi.mangamochi.model.entity.MangaProvider; -import com.magamochi.mangamochi.model.entity.UserMangaFollow; -import com.magamochi.mangamochi.model.repository.*; -import com.magamochi.mangamochi.model.specification.MangaSpecification; -import com.magamochi.mangamochi.queue.MangaChapterDownloadProducer; -import com.magamochi.mangamochi.service.providers.ContentProviderFactory; +import com.magamochi.client.NtfyClient; +import com.magamochi.common.exception.NotFoundException; +import com.magamochi.model.dto.*; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.MangaChapter; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.model.entity.UserMangaFollow; +import com.magamochi.model.repository.*; +import com.magamochi.model.specification.MangaSpecification; +import com.magamochi.queue.MangaChapterDownloadProducer; +import com.magamochi.service.providers.ContentProviderFactory; import java.util.Comparator; import java.util.List; import java.util.Set; diff --git a/src/main/java/com/magamochi/mangamochi/service/ProviderManualMangaImportService.java b/src/main/java/com/magamochi/service/ProviderManualMangaImportService.java similarity index 81% rename from src/main/java/com/magamochi/mangamochi/service/ProviderManualMangaImportService.java rename to src/main/java/com/magamochi/service/ProviderManualMangaImportService.java index 358a1df..00cba42 100644 --- a/src/main/java/com/magamochi/mangamochi/service/ProviderManualMangaImportService.java +++ b/src/main/java/com/magamochi/service/ProviderManualMangaImportService.java @@ -1,15 +1,17 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static java.util.Objects.isNull; import static java.util.Objects.nonNull; -import com.magamochi.mangamochi.common.exception.NotFoundException; -import com.magamochi.mangamochi.model.dto.ImportMangaResponseDTO; -import com.magamochi.mangamochi.model.dto.ImportRequestDTO; -import com.magamochi.mangamochi.model.entity.*; -import com.magamochi.mangamochi.model.enumeration.ProviderStatus; -import com.magamochi.mangamochi.model.repository.*; -import com.magamochi.mangamochi.service.providers.ManualImportContentProviderFactory; +import com.magamochi.common.exception.NotFoundException; +import com.magamochi.model.dto.ImportMangaResponseDTO; +import com.magamochi.model.dto.ImportRequestDTO; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.model.entity.Provider; +import com.magamochi.model.enumeration.ProviderStatus; +import com.magamochi.model.repository.MangaProviderRepository; +import com.magamochi.model.repository.ProviderRepository; +import com.magamochi.service.providers.ManualImportContentProviderFactory; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/magamochi/mangamochi/service/ProviderService.java b/src/main/java/com/magamochi/service/ProviderService.java similarity index 79% rename from src/main/java/com/magamochi/mangamochi/service/ProviderService.java rename to src/main/java/com/magamochi/service/ProviderService.java index 88581c2..47f7e3d 100644 --- a/src/main/java/com/magamochi/mangamochi/service/ProviderService.java +++ b/src/main/java/com/magamochi/service/ProviderService.java @@ -1,11 +1,11 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static java.util.Objects.nonNull; -import com.magamochi.mangamochi.model.dto.ProviderListDTO; -import com.magamochi.mangamochi.model.entity.Provider; -import com.magamochi.mangamochi.model.enumeration.ProviderStatus; -import com.magamochi.mangamochi.model.repository.ProviderRepository; +import com.magamochi.model.dto.ProviderListDTO; +import com.magamochi.model.entity.Provider; +import com.magamochi.model.enumeration.ProviderStatus; +import com.magamochi.model.repository.ProviderRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/magamochi/mangamochi/service/S3Service.java b/src/main/java/com/magamochi/service/S3Service.java similarity index 98% rename from src/main/java/com/magamochi/mangamochi/service/S3Service.java rename to src/main/java/com/magamochi/service/S3Service.java index 1d15bd7..77eb28c 100644 --- a/src/main/java/com/magamochi/mangamochi/service/S3Service.java +++ b/src/main/java/com/magamochi/service/S3Service.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static java.util.Objects.nonNull; diff --git a/src/main/java/com/magamochi/mangamochi/service/TitleMatcherService.java b/src/main/java/com/magamochi/service/TitleMatcherService.java similarity index 92% rename from src/main/java/com/magamochi/mangamochi/service/TitleMatcherService.java rename to src/main/java/com/magamochi/service/TitleMatcherService.java index de6ab3a..fc85034 100644 --- a/src/main/java/com/magamochi/mangamochi/service/TitleMatcherService.java +++ b/src/main/java/com/magamochi/service/TitleMatcherService.java @@ -1,10 +1,10 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static org.apache.commons.lang3.StringUtils.isBlank; import static org.springframework.util.CollectionUtils.isEmpty; -import com.magamochi.mangamochi.model.dto.TitleMatchRequestDTO; -import com.magamochi.mangamochi.model.dto.TitleMatchResponseDTO; +import com.magamochi.model.dto.TitleMatchRequestDTO; +import com.magamochi.model.dto.TitleMatchResponseDTO; import lombok.extern.log4j.Log4j2; import org.apache.commons.text.similarity.LevenshteinDistance; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/magamochi/mangamochi/service/UserFavoriteMangaService.java b/src/main/java/com/magamochi/service/UserFavoriteMangaService.java similarity index 78% rename from src/main/java/com/magamochi/mangamochi/service/UserFavoriteMangaService.java rename to src/main/java/com/magamochi/service/UserFavoriteMangaService.java index e93c184..cb160d7 100644 --- a/src/main/java/com/magamochi/mangamochi/service/UserFavoriteMangaService.java +++ b/src/main/java/com/magamochi/service/UserFavoriteMangaService.java @@ -1,10 +1,10 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; -import com.magamochi.mangamochi.common.exception.NotFoundException; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.entity.UserFavoriteManga; -import com.magamochi.mangamochi.model.repository.MangaRepository; -import com.magamochi.mangamochi.model.repository.UserFavoriteMangaRepository; +import com.magamochi.common.exception.NotFoundException; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.entity.UserFavoriteManga; +import com.magamochi.model.repository.MangaRepository; +import com.magamochi.model.repository.UserFavoriteMangaRepository; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/magamochi/mangamochi/service/UserService.java b/src/main/java/com/magamochi/service/UserService.java similarity index 84% rename from src/main/java/com/magamochi/mangamochi/service/UserService.java rename to src/main/java/com/magamochi/service/UserService.java index d9ad125..32ad556 100644 --- a/src/main/java/com/magamochi/mangamochi/service/UserService.java +++ b/src/main/java/com/magamochi/service/UserService.java @@ -1,17 +1,17 @@ -package com.magamochi.mangamochi.service; +package com.magamochi.service; import static java.util.Objects.isNull; -import com.magamochi.mangamochi.common.exception.ConflictException; -import com.magamochi.mangamochi.common.exception.NotFoundException; -import com.magamochi.mangamochi.model.dto.AuthenticationRequestDTO; -import com.magamochi.mangamochi.model.dto.AuthenticationResponseDTO; -import com.magamochi.mangamochi.model.dto.RefreshTokenRequestDTO; -import com.magamochi.mangamochi.model.dto.RegistrationRequestDTO; -import com.magamochi.mangamochi.model.entity.User; -import com.magamochi.mangamochi.model.enumeration.UserRole; -import com.magamochi.mangamochi.model.repository.UserRepository; -import com.magamochi.mangamochi.util.JwtUtil; +import com.magamochi.common.exception.ConflictException; +import com.magamochi.common.exception.NotFoundException; +import com.magamochi.model.dto.AuthenticationRequestDTO; +import com.magamochi.model.dto.AuthenticationResponseDTO; +import com.magamochi.model.dto.RefreshTokenRequestDTO; +import com.magamochi.model.dto.RegistrationRequestDTO; +import com.magamochi.model.entity.User; +import com.magamochi.model.enumeration.UserRole; +import com.magamochi.model.repository.UserRepository; +import com.magamochi.util.JwtUtil; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.security.authentication.AuthenticationManager; diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/ContentProvider.java b/src/main/java/com/magamochi/service/providers/ContentProvider.java similarity index 55% rename from src/main/java/com/magamochi/mangamochi/service/providers/ContentProvider.java rename to src/main/java/com/magamochi/service/providers/ContentProvider.java index 9cb16cb..c30a940 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/ContentProvider.java +++ b/src/main/java/com/magamochi/service/providers/ContentProvider.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.service.providers; +package com.magamochi.service.providers; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaChapterResponseDTO; -import com.magamochi.mangamochi.model.entity.MangaProvider; +import com.magamochi.model.dto.ContentProviderMangaChapterResponseDTO; +import com.magamochi.model.entity.MangaProvider; import java.util.List; import java.util.Map; diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/ContentProviderFactory.java b/src/main/java/com/magamochi/service/providers/ContentProviderFactory.java similarity index 91% rename from src/main/java/com/magamochi/mangamochi/service/providers/ContentProviderFactory.java rename to src/main/java/com/magamochi/service/providers/ContentProviderFactory.java index c3b6ef9..25dc06f 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/ContentProviderFactory.java +++ b/src/main/java/com/magamochi/service/providers/ContentProviderFactory.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.service.providers; +package com.magamochi.service.providers; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/ContentProviders.java b/src/main/java/com/magamochi/service/providers/ContentProviders.java similarity index 86% rename from src/main/java/com/magamochi/mangamochi/service/providers/ContentProviders.java rename to src/main/java/com/magamochi/service/providers/ContentProviders.java index c7f347a..d68908b 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/ContentProviders.java +++ b/src/main/java/com/magamochi/service/providers/ContentProviders.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.service.providers; +package com.magamochi.service.providers; public class ContentProviders { public static final String MANGA_LIVRE_TO = "Manga Livre.to"; diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/ManualImportContentProvider.java b/src/main/java/com/magamochi/service/providers/ManualImportContentProvider.java similarity index 62% rename from src/main/java/com/magamochi/mangamochi/service/providers/ManualImportContentProvider.java rename to src/main/java/com/magamochi/service/providers/ManualImportContentProvider.java index a96c2c7..807f98c 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/ManualImportContentProvider.java +++ b/src/main/java/com/magamochi/service/providers/ManualImportContentProvider.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.service.providers; +package com.magamochi.service.providers; public interface ManualImportContentProvider { String getMangaTitle(String value); diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/ManualImportContentProviderFactory.java b/src/main/java/com/magamochi/service/providers/ManualImportContentProviderFactory.java similarity index 92% rename from src/main/java/com/magamochi/mangamochi/service/providers/ManualImportContentProviderFactory.java rename to src/main/java/com/magamochi/service/providers/ManualImportContentProviderFactory.java index e0d4654..a60f858 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/ManualImportContentProviderFactory.java +++ b/src/main/java/com/magamochi/service/providers/ManualImportContentProviderFactory.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.service.providers; +package com.magamochi.service.providers; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/PagedContentProvider.java b/src/main/java/com/magamochi/service/providers/PagedContentProvider.java similarity index 56% rename from src/main/java/com/magamochi/mangamochi/service/providers/PagedContentProvider.java rename to src/main/java/com/magamochi/service/providers/PagedContentProvider.java index 7cc59fe..8ff4c82 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/PagedContentProvider.java +++ b/src/main/java/com/magamochi/service/providers/PagedContentProvider.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.service.providers; +package com.magamochi.service.providers; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaInfoResponseDTO; +import com.magamochi.model.dto.ContentProviderMangaInfoResponseDTO; import java.util.List; public interface PagedContentProvider { diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/PagedContentProviderFactory.java b/src/main/java/com/magamochi/service/providers/PagedContentProviderFactory.java similarity index 91% rename from src/main/java/com/magamochi/mangamochi/service/providers/PagedContentProviderFactory.java rename to src/main/java/com/magamochi/service/providers/PagedContentProviderFactory.java index aa0dfba..4909c6e 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/PagedContentProviderFactory.java +++ b/src/main/java/com/magamochi/service/providers/PagedContentProviderFactory.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.service.providers; +package com.magamochi.service.providers; import java.util.Map; import java.util.Objects; diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/impl/BatoProvider.java b/src/main/java/com/magamochi/service/providers/impl/BatoProvider.java similarity index 83% rename from src/main/java/com/magamochi/mangamochi/service/providers/impl/BatoProvider.java rename to src/main/java/com/magamochi/service/providers/impl/BatoProvider.java index fbd1a9b..c8de42b 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/impl/BatoProvider.java +++ b/src/main/java/com/magamochi/service/providers/impl/BatoProvider.java @@ -1,14 +1,14 @@ -package com.magamochi.mangamochi.service.providers.impl; +package com.magamochi.service.providers.impl; import static java.util.Objects.isNull; -import com.magamochi.mangamochi.common.exception.UnprocessableException; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaChapterResponseDTO; -import com.magamochi.mangamochi.model.entity.MangaProvider; -import com.magamochi.mangamochi.service.FlareService; -import com.magamochi.mangamochi.service.providers.ContentProvider; -import com.magamochi.mangamochi.service.providers.ContentProviders; -import com.magamochi.mangamochi.service.providers.ManualImportContentProvider; +import com.magamochi.common.exception.UnprocessableException; +import com.magamochi.model.dto.ContentProviderMangaChapterResponseDTO; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.service.FlareService; +import com.magamochi.service.providers.ContentProvider; +import com.magamochi.service.providers.ContentProviders; +import com.magamochi.service.providers.ManualImportContentProvider; import java.util.*; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/impl/MangaDexProvider.java b/src/main/java/com/magamochi/service/providers/impl/MangaDexProvider.java similarity index 89% rename from src/main/java/com/magamochi/mangamochi/service/providers/impl/MangaDexProvider.java rename to src/main/java/com/magamochi/service/providers/impl/MangaDexProvider.java index 6948181..6f96e8a 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/impl/MangaDexProvider.java +++ b/src/main/java/com/magamochi/service/providers/impl/MangaDexProvider.java @@ -1,15 +1,15 @@ -package com.magamochi.mangamochi.service.providers.impl; +package com.magamochi.service.providers.impl; import static java.util.Objects.isNull; import com.google.common.util.concurrent.RateLimiter; -import com.magamochi.mangamochi.client.MangaDexClient; -import com.magamochi.mangamochi.common.exception.UnprocessableException; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaChapterResponseDTO; -import com.magamochi.mangamochi.model.entity.MangaProvider; -import com.magamochi.mangamochi.service.providers.ContentProvider; -import com.magamochi.mangamochi.service.providers.ContentProviders; -import com.magamochi.mangamochi.service.providers.ManualImportContentProvider; +import com.magamochi.client.MangaDexClient; +import com.magamochi.common.exception.UnprocessableException; +import com.magamochi.model.dto.ContentProviderMangaChapterResponseDTO; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.service.providers.ContentProvider; +import com.magamochi.service.providers.ContentProviders; +import com.magamochi.service.providers.ManualImportContentProvider; import java.util.*; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/impl/MangaLivreBlogProvider.java b/src/main/java/com/magamochi/service/providers/impl/MangaLivreBlogProvider.java similarity index 91% rename from src/main/java/com/magamochi/mangamochi/service/providers/impl/MangaLivreBlogProvider.java rename to src/main/java/com/magamochi/service/providers/impl/MangaLivreBlogProvider.java index 648edb4..02173cf 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/impl/MangaLivreBlogProvider.java +++ b/src/main/java/com/magamochi/service/providers/impl/MangaLivreBlogProvider.java @@ -1,12 +1,12 @@ -package com.magamochi.mangamochi.service.providers.impl; +package com.magamochi.service.providers.impl; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaChapterResponseDTO; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaInfoResponseDTO; -import com.magamochi.mangamochi.model.entity.MangaProvider; -import com.magamochi.mangamochi.model.enumeration.MangaStatus; -import com.magamochi.mangamochi.service.providers.ContentProvider; -import com.magamochi.mangamochi.service.providers.ContentProviders; -import com.magamochi.mangamochi.service.providers.PagedContentProvider; +import com.magamochi.model.dto.ContentProviderMangaChapterResponseDTO; +import com.magamochi.model.dto.ContentProviderMangaInfoResponseDTO; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.model.enumeration.MangaStatus; +import com.magamochi.service.providers.ContentProvider; +import com.magamochi.service.providers.ContentProviders; +import com.magamochi.service.providers.PagedContentProvider; import java.io.IOException; import java.util.*; import java.util.regex.Pattern; diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/impl/MangaLivreProvider.java b/src/main/java/com/magamochi/service/providers/impl/MangaLivreProvider.java similarity index 88% rename from src/main/java/com/magamochi/mangamochi/service/providers/impl/MangaLivreProvider.java rename to src/main/java/com/magamochi/service/providers/impl/MangaLivreProvider.java index d133ac5..5d237ee 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/impl/MangaLivreProvider.java +++ b/src/main/java/com/magamochi/service/providers/impl/MangaLivreProvider.java @@ -1,15 +1,15 @@ -package com.magamochi.mangamochi.service.providers.impl; +package com.magamochi.service.providers.impl; import static java.util.Objects.nonNull; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaChapterResponseDTO; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaInfoResponseDTO; -import com.magamochi.mangamochi.model.entity.MangaProvider; -import com.magamochi.mangamochi.model.enumeration.MangaStatus; -import com.magamochi.mangamochi.service.FlareService; -import com.magamochi.mangamochi.service.providers.ContentProvider; -import com.magamochi.mangamochi.service.providers.ContentProviders; -import com.magamochi.mangamochi.service.providers.PagedContentProvider; +import com.magamochi.model.dto.ContentProviderMangaChapterResponseDTO; +import com.magamochi.model.dto.ContentProviderMangaInfoResponseDTO; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.model.enumeration.MangaStatus; +import com.magamochi.service.FlareService; +import com.magamochi.service.providers.ContentProvider; +import com.magamochi.service.providers.ContentProviders; +import com.magamochi.service.providers.PagedContentProvider; import java.util.*; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/src/main/java/com/magamochi/mangamochi/service/providers/impl/PinkRosaScanProvider.java b/src/main/java/com/magamochi/service/providers/impl/PinkRosaScanProvider.java similarity index 89% rename from src/main/java/com/magamochi/mangamochi/service/providers/impl/PinkRosaScanProvider.java rename to src/main/java/com/magamochi/service/providers/impl/PinkRosaScanProvider.java index 6e30086..c02e6d3 100644 --- a/src/main/java/com/magamochi/mangamochi/service/providers/impl/PinkRosaScanProvider.java +++ b/src/main/java/com/magamochi/service/providers/impl/PinkRosaScanProvider.java @@ -1,16 +1,16 @@ -package com.magamochi.mangamochi.service.providers.impl; +package com.magamochi.service.providers.impl; import static java.util.Objects.isNull; import static org.apache.commons.lang3.StringUtils.isBlank; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaChapterResponseDTO; -import com.magamochi.mangamochi.model.dto.ContentProviderMangaInfoResponseDTO; -import com.magamochi.mangamochi.model.entity.MangaProvider; -import com.magamochi.mangamochi.model.enumeration.MangaStatus; -import com.magamochi.mangamochi.service.FlareService; -import com.magamochi.mangamochi.service.providers.ContentProvider; -import com.magamochi.mangamochi.service.providers.ContentProviders; -import com.magamochi.mangamochi.service.providers.PagedContentProvider; +import com.magamochi.model.dto.ContentProviderMangaChapterResponseDTO; +import com.magamochi.model.dto.ContentProviderMangaInfoResponseDTO; +import com.magamochi.model.entity.MangaProvider; +import com.magamochi.model.enumeration.MangaStatus; +import com.magamochi.service.FlareService; +import com.magamochi.service.providers.ContentProvider; +import com.magamochi.service.providers.ContentProviders; +import com.magamochi.service.providers.PagedContentProvider; import java.util.*; import java.util.stream.Collectors; import java.util.stream.IntStream; diff --git a/src/main/java/com/magamochi/mangamochi/task/FlareSessionCleanupTask.java b/src/main/java/com/magamochi/task/FlareSessionCleanupTask.java similarity index 85% rename from src/main/java/com/magamochi/mangamochi/task/FlareSessionCleanupTask.java rename to src/main/java/com/magamochi/task/FlareSessionCleanupTask.java index bf0efc9..0b957b1 100644 --- a/src/main/java/com/magamochi/mangamochi/task/FlareSessionCleanupTask.java +++ b/src/main/java/com/magamochi/task/FlareSessionCleanupTask.java @@ -1,7 +1,7 @@ -package com.magamochi.mangamochi.task; +package com.magamochi.task; -import com.magamochi.mangamochi.client.FlareClient; -import com.magamochi.mangamochi.registry.FlareSessionRegistry; +import com.magamochi.client.FlareClient; +import com.magamochi.registry.FlareSessionRegistry; import java.time.Duration; import java.time.Instant; import lombok.RequiredArgsConstructor; diff --git a/src/main/java/com/magamochi/mangamochi/task/FlareStartupCleanupTask.java b/src/main/java/com/magamochi/task/FlareStartupCleanupTask.java similarity index 89% rename from src/main/java/com/magamochi/mangamochi/task/FlareStartupCleanupTask.java rename to src/main/java/com/magamochi/task/FlareStartupCleanupTask.java index 5ceb54d..637a993 100644 --- a/src/main/java/com/magamochi/mangamochi/task/FlareStartupCleanupTask.java +++ b/src/main/java/com/magamochi/task/FlareStartupCleanupTask.java @@ -1,6 +1,6 @@ -package com.magamochi.mangamochi.task; +package com.magamochi.task; -import com.magamochi.mangamochi.client.FlareClient; +import com.magamochi.client.FlareClient; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.boot.context.event.ApplicationReadyEvent; diff --git a/src/main/java/com/magamochi/mangamochi/task/ImageCleanupTask.java b/src/main/java/com/magamochi/task/ImageCleanupTask.java similarity index 87% rename from src/main/java/com/magamochi/mangamochi/task/ImageCleanupTask.java rename to src/main/java/com/magamochi/task/ImageCleanupTask.java index f9756be..6bbac36 100644 --- a/src/main/java/com/magamochi/mangamochi/task/ImageCleanupTask.java +++ b/src/main/java/com/magamochi/task/ImageCleanupTask.java @@ -1,8 +1,8 @@ -package com.magamochi.mangamochi.task; +package com.magamochi.task; -import com.magamochi.mangamochi.model.entity.Image; -import com.magamochi.mangamochi.model.repository.*; -import com.magamochi.mangamochi.service.S3Service; +import com.magamochi.model.entity.Image; +import com.magamochi.model.repository.ImageRepository; +import com.magamochi.service.S3Service; import java.util.stream.Collectors; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/com/magamochi/mangamochi/task/MangaFollowUpdateTask.java b/src/main/java/com/magamochi/task/MangaFollowUpdateTask.java similarity index 80% rename from src/main/java/com/magamochi/mangamochi/task/MangaFollowUpdateTask.java rename to src/main/java/com/magamochi/task/MangaFollowUpdateTask.java index 8e67714..6979d6d 100644 --- a/src/main/java/com/magamochi/mangamochi/task/MangaFollowUpdateTask.java +++ b/src/main/java/com/magamochi/task/MangaFollowUpdateTask.java @@ -1,10 +1,10 @@ -package com.magamochi.mangamochi.task; +package com.magamochi.task; -import com.magamochi.mangamochi.model.dto.UpdateMangaFollowChapterListCommand; -import com.magamochi.mangamochi.model.entity.Manga; -import com.magamochi.mangamochi.model.enumeration.ProviderStatus; -import com.magamochi.mangamochi.model.repository.MangaRepository; -import com.magamochi.mangamochi.queue.UpdateMangaFollowChapterListProducer; +import com.magamochi.model.dto.UpdateMangaFollowChapterListCommand; +import com.magamochi.model.entity.Manga; +import com.magamochi.model.enumeration.ProviderStatus; +import com.magamochi.model.repository.MangaRepository; +import com.magamochi.queue.UpdateMangaFollowChapterListProducer; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/com/magamochi/mangamochi/task/UpdateMangaDataTask.java b/src/main/java/com/magamochi/task/UpdateMangaDataTask.java similarity index 77% rename from src/main/java/com/magamochi/mangamochi/task/UpdateMangaDataTask.java rename to src/main/java/com/magamochi/task/UpdateMangaDataTask.java index f0988b2..ff67b48 100644 --- a/src/main/java/com/magamochi/mangamochi/task/UpdateMangaDataTask.java +++ b/src/main/java/com/magamochi/task/UpdateMangaDataTask.java @@ -1,10 +1,10 @@ -package com.magamochi.mangamochi.task; +package com.magamochi.task; import static java.util.Objects.isNull; -import com.magamochi.mangamochi.model.dto.UpdateMangaDataCommand; -import com.magamochi.mangamochi.model.repository.*; -import com.magamochi.mangamochi.queue.UpdateMangaDataProducer; +import com.magamochi.model.dto.UpdateMangaDataCommand; +import com.magamochi.model.repository.MangaRepository; +import com.magamochi.queue.UpdateMangaDataProducer; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; import org.springframework.scheduling.annotation.Scheduled; diff --git a/src/main/java/com/magamochi/mangamochi/task/UpdateMangaListTask.java b/src/main/java/com/magamochi/task/UpdateMangaListTask.java similarity index 81% rename from src/main/java/com/magamochi/mangamochi/task/UpdateMangaListTask.java rename to src/main/java/com/magamochi/task/UpdateMangaListTask.java index 315060a..54395dd 100644 --- a/src/main/java/com/magamochi/mangamochi/task/UpdateMangaListTask.java +++ b/src/main/java/com/magamochi/task/UpdateMangaListTask.java @@ -1,11 +1,11 @@ -package com.magamochi.mangamochi.task; +package com.magamochi.task; -import com.magamochi.mangamochi.common.exception.NotFoundException; -import com.magamochi.mangamochi.model.dto.MangaListUpdateCommand; -import com.magamochi.mangamochi.model.repository.ProviderRepository; -import com.magamochi.mangamochi.queue.UpdateMangaListProducer; -import com.magamochi.mangamochi.service.providers.PagedContentProvider; -import com.magamochi.mangamochi.service.providers.PagedContentProviderFactory; +import com.magamochi.common.exception.NotFoundException; +import com.magamochi.model.dto.MangaListUpdateCommand; +import com.magamochi.model.repository.ProviderRepository; +import com.magamochi.queue.UpdateMangaListProducer; +import com.magamochi.service.providers.PagedContentProvider; +import com.magamochi.service.providers.PagedContentProviderFactory; import java.util.stream.IntStream; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2; diff --git a/src/main/java/com/magamochi/mangamochi/util/DoubleUtil.java b/src/main/java/com/magamochi/util/DoubleUtil.java similarity index 91% rename from src/main/java/com/magamochi/mangamochi/util/DoubleUtil.java rename to src/main/java/com/magamochi/util/DoubleUtil.java index a809d25..5452721 100644 --- a/src/main/java/com/magamochi/mangamochi/util/DoubleUtil.java +++ b/src/main/java/com/magamochi/util/DoubleUtil.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.util; +package com.magamochi.util; import java.math.BigDecimal; import java.math.RoundingMode; diff --git a/src/main/java/com/magamochi/mangamochi/util/JwtUtil.java b/src/main/java/com/magamochi/util/JwtUtil.java similarity index 98% rename from src/main/java/com/magamochi/mangamochi/util/JwtUtil.java rename to src/main/java/com/magamochi/util/JwtUtil.java index 4fc03b9..1b9964c 100644 --- a/src/main/java/com/magamochi/mangamochi/util/JwtUtil.java +++ b/src/main/java/com/magamochi/util/JwtUtil.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi.util; +package com.magamochi.util; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; diff --git a/src/test/java/com/magamochi/mangamochi/MangamochiApplicationTests.java b/src/test/java/com/magamochi/MangamochiApplicationTests.java similarity index 86% rename from src/test/java/com/magamochi/mangamochi/MangamochiApplicationTests.java rename to src/test/java/com/magamochi/MangamochiApplicationTests.java index 3846a8d..4ac1bfd 100644 --- a/src/test/java/com/magamochi/mangamochi/MangamochiApplicationTests.java +++ b/src/test/java/com/magamochi/MangamochiApplicationTests.java @@ -1,4 +1,4 @@ -package com.magamochi.mangamochi; +package com.magamochi; import lombok.RequiredArgsConstructor; import lombok.extern.log4j.Log4j2;