From 323d0759827bfd14419ac6c142f5bc5b4abb23ec Mon Sep 17 00:00:00 2001 From: Don Strawsburg Date: Sat, 3 Jan 2026 22:48:09 -0500 Subject: [PATCH] moving and reorganizing --- .../battlbuilder/BattlBuilderApplication.java | 2 +- .../classification/PartRoleResolver.java | 2 +- .../classification/PlatformResolver.java | 2 +- .../admin/ClassificationReconcileService.java | 4 ++-- .../impl/ProductClassifierImpl.java | 4 ++-- .../battlbuilder/cli/BetaInviteCliRunner.java | 2 +- .../battlbuilder/common/package-info.java | 4 ++-- .../battlbuilder/config/CacheConfig.java | 2 +- .../AuthController.java | 6 +++--- .../BuilderBootstrapController.java | 6 +++--- .../CategoryController.java | 4 ++-- .../EmailTrackingController.java | 4 ++-- .../ImportController.java | 4 ++-- .../MerchantDebugController.java | 4 ++-- .../PartRoleMappingController.java | 4 ++-- .../ProductController.java | 6 ++---- .../admin/AdminBetaInviteController.java | 4 ++-- .../admin/AdminCategoryController.java | 4 ++-- .../admin/AdminDashboardController.java | 4 ++-- .../admin/AdminPartCategoryController.java | 4 ++-- .../admin/AdminPartRoleMappingController.java | 6 +++--- .../admin/AdminPlatformController.java | 4 ++-- .../admin/MerchantAdminController.java | 4 ++-- .../admin/PlatformViewController.java | 2 +- .../controller/admin/package-info.java | 11 +++++++++++ .../api/v1/BrandController.java | 6 +++--- .../api/v1/BuildController.java | 4 ++-- .../api/v1/BuildV1Controller.java | 4 ++-- .../api/v1/CatalogController.java | 4 ++-- .../api/v1/EmailController.java | 6 +++--- .../api/v1/ImageController.java | 4 ++-- .../api/v1/MeController.java | 4 ++-- .../api/v1/ProductV1Controller.java | 4 ++-- .../api/v1/StateController.java | 6 +++--- .../api/v1/UserController.java | 6 +++--- .../controller/api/v1/package-info.java | 11 +++++++++++ .../battlbuilder/controller/package-info.java | 11 +++++++++++ .../controllers/admin/package-info.java | 11 ----------- .../controllers/api/v1/package-info.java | 11 ----------- .../battlbuilder/controllers/package-info.java | 11 ----------- .../enrichment/EnrichmentSource.java | 3 +++ .../enrichment/EnrichmentStatus.java | 11 +++++++++++ .../enrichment/EnrichmentType.java | 3 +++ .../ai/AiEnrichmentOrchestrator.java | 6 +++--- .../AdminEnrichmentController.java | 8 ++++---- .../{models => model}/ProductEnrichment.java | 2 +- .../ProductEnrichmentRepository.java | 4 ++-- .../CaliberEnrichmentService.java | 6 +++--- .../{repos => repo}/AccountRepository.java | 2 +- .../{repos => repo}/AuthTokenRepository.java | 2 +- .../{repos => repo}/BrandRepository.java | 2 +- .../{repos => repo}/BuildItemRepository.java | 2 +- .../BuildProfileRepository.java | 2 +- .../{repos => repo}/BuildRepository.java | 2 +- .../CanonicalCategoryRepository.java | 2 +- .../CategoryMappingRepository.java | 2 +- .../EmailRequestRepository.java | 2 +- .../EmailTemplateRepository.java | 2 +- .../{repos => repo}/FeedImportRepository.java | 2 +- .../{repos => repo}/ImageBlobRepository.java | 2 +- .../{repos => repo}/ImageMetaRepository.java | 2 +- .../MerchantCategoryMapRepository.java | 2 +- .../{repos => repo}/MerchantRepository.java | 2 +- .../PartCategoryRepository.java | 2 +- .../PartRoleMappingRepository.java | 2 +- .../PartRoleRuleRepository.java | 2 +- .../{repos => repo}/PlatformRepository.java | 2 +- .../PlatformRuleRepository.java | 2 +- .../PriceHistoryRepository.java | 2 +- .../ProductOfferRepository.java | 2 +- .../{repos => repo}/ProductRepository.java | 4 ++-- .../{repos => repo}/StateRepository.java | 2 +- .../{repos => repo}/UserRepository.java | 2 +- .../spec/CatalogProductSpecifications.java | 2 +- .../{repos => repo}/package-info.java | 2 +- .../projections/CatalogRow.java | 2 +- .../security/CustomUserDetailsService.java | 2 +- .../security/JwtAuthenticationFilter.java | 2 +- .../{services => service}/BrandService.java | 2 +- .../{services => service}/BuildService.java | 2 +- .../{services => service}/BuildsService.java | 2 +- .../CatalogQueryService.java | 2 +- .../CategoryClassificationService.java | 2 +- .../CategoryMappingRecommendationService.java | 6 +++--- .../CurrentUserService.java | 4 ++-- .../ImportStatusAdminService.java | 6 +++--- .../MappingAdminService.java | 10 +++++----- .../MerchantFeedImportService.java | 2 +- .../PartCategoryResolverService.java | 4 ++-- .../PartRoleMappingService.java | 4 ++-- .../ProductQueryService.java | 2 +- .../ReclassificationService.java | 2 +- .../admin/AdminProductService.java | 2 +- .../admin/AdminUserService.java | 4 ++-- .../admin/StatesService.java | 2 +- .../admin/UsersService.java | 2 +- .../admin/admin_services_package_info.java | 4 ++-- .../admin/impl/AdminDashboardService.java | 8 ++++---- .../admin/impl/AdminProductServiceImpl.java | 6 +++--- .../admin/impl/StatesServiceImpl.java | 6 +++--- .../admin/impl/UsersServiceImpl.java | 6 +++--- .../admin/package-info.java | 2 +- .../auth/BetaAuthService.java | 2 +- .../auth/impl/BetaAuthServiceImpl.java | 10 +++++----- .../auth/impl/BetaInviteService.java | 8 ++++---- .../impl/BrandServiceImpl.java | 6 +++--- .../impl/BuildServiceImpl.java | 18 ++++++++---------- .../impl/CatalogQueryServiceImpl.java | 10 +++++----- .../CategoryClassificationServiceImpl.java | 4 ++-- .../impl/ImageService.java | 6 +++--- .../impl/MerchantCategoryMappingService.java | 4 ++-- .../impl/MerchantFeedImportServiceImpl.java | 15 +++++++-------- .../impl/ProductQueryServiceImpl.java | 10 ++++------ .../impl/ReclassificationServiceImpl.java | 6 +++--- .../impl/package-info.java | 2 +- .../{services => service}/package-info.java | 2 +- .../utils/EmailService.java | 2 +- .../utils/ImageUrlToMinioMigrator.java | 4 ++-- .../MigrateProductImagesToMinioRunner.java | 2 +- .../utils/TemplateRenderer.java | 2 +- .../utils/TemplatedEmailService.java | 4 ++-- .../utils/impl/EmailServiceImpl.java | 6 +++--- .../utils/impl/package-info.java | 2 +- .../battlbuilder/utils/package-info.java | 11 ----------- .../web/admin/AdminImportStatusController.java | 2 +- .../web/admin/AdminMappingController.java | 2 +- .../web/admin/AdminMerchantController.java | 2 +- .../web/admin/AdminProductController.java | 2 +- .../web/admin/AdminUserController.java | 2 +- .../admin/CategoryMappingAdminController.java | 2 +- .../battlbuilder/web/admin/package-info.java | 2 +- .../battlbuilder/web/package-info.java | 2 +- 132 files changed, 277 insertions(+), 278 deletions(-) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/AuthController.java (97%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/BuilderBootstrapController.java (95%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/CategoryController.java (89%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/EmailTrackingController.java (93%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/ImportController.java (88%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/MerchantDebugController.java (83%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/PartRoleMappingController.java (88%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/ProductController.java (87%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/admin/AdminBetaInviteController.java (92%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/admin/AdminCategoryController.java (89%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/admin/AdminDashboardController.java (86%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/admin/AdminPartCategoryController.java (89%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/admin/AdminPartRoleMappingController.java (96%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/admin/AdminPlatformController.java (91%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/admin/MerchantAdminController.java (92%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/admin/PlatformViewController.java (83%) create mode 100644 src/main/java/group/goforward/battlbuilder/controller/admin/package-info.java rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/api/v1/BrandController.java (87%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/api/v1/BuildController.java (85%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/api/v1/BuildV1Controller.java (96%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/api/v1/CatalogController.java (94%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/api/v1/EmailController.java (96%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/api/v1/ImageController.java (92%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/api/v1/MeController.java (98%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/api/v1/ProductV1Controller.java (93%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/api/v1/StateController.java (88%) rename src/main/java/group/goforward/battlbuilder/{controllers => controller}/api/v1/UserController.java (87%) create mode 100644 src/main/java/group/goforward/battlbuilder/controller/api/v1/package-info.java create mode 100644 src/main/java/group/goforward/battlbuilder/controller/package-info.java delete mode 100644 src/main/java/group/goforward/battlbuilder/controllers/admin/package-info.java delete mode 100644 src/main/java/group/goforward/battlbuilder/controllers/api/v1/package-info.java delete mode 100644 src/main/java/group/goforward/battlbuilder/controllers/package-info.java rename src/main/java/group/goforward/battlbuilder/enrichment/{controllers => controller}/AdminEnrichmentController.java (95%) rename src/main/java/group/goforward/battlbuilder/enrichment/{models => model}/ProductEnrichment.java (98%) rename src/main/java/group/goforward/battlbuilder/enrichment/{repos => repo}/ProductEnrichmentRepository.java (95%) rename src/main/java/group/goforward/battlbuilder/enrichment/{services => service}/CaliberEnrichmentService.java (92%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/AccountRepository.java (80%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/AuthTokenRepository.java (95%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/BrandRepository.java (84%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/BuildItemRepository.java (86%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/BuildProfileRepository.java (88%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/BuildRepository.java (92%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/CanonicalCategoryRepository.java (91%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/CategoryMappingRepository.java (94%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/EmailRequestRepository.java (91%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/EmailTemplateRepository.java (89%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/FeedImportRepository.java (79%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/ImageBlobRepository.java (79%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/ImageMetaRepository.java (79%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/MerchantCategoryMapRepository.java (98%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/MerchantRepository.java (83%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/PartCategoryRepository.java (89%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/PartRoleMappingRepository.java (95%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/PartRoleRuleRepository.java (87%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/PlatformRepository.java (85%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/PlatformRuleRepository.java (90%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/PriceHistoryRepository.java (80%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/ProductOfferRepository.java (95%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/ProductRepository.java (99%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/StateRepository.java (83%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/UserRepository.java (97%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/catalog/spec/CatalogProductSpecifications.java (97%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/package-info.java (84%) rename src/main/java/group/goforward/battlbuilder/{repos => repo}/projections/CatalogRow.java (83%) rename src/main/java/group/goforward/battlbuilder/{services => service}/BrandService.java (85%) rename src/main/java/group/goforward/battlbuilder/{services => service}/BuildService.java (93%) rename src/main/java/group/goforward/battlbuilder/{services => service}/BuildsService.java (79%) rename src/main/java/group/goforward/battlbuilder/{services => service}/CatalogQueryService.java (92%) rename src/main/java/group/goforward/battlbuilder/{services => service}/CategoryClassificationService.java (94%) rename src/main/java/group/goforward/battlbuilder/{services => service}/CategoryMappingRecommendationService.java (93%) rename src/main/java/group/goforward/battlbuilder/{services => service}/CurrentUserService.java (94%) rename src/main/java/group/goforward/battlbuilder/{services => service}/ImportStatusAdminService.java (87%) rename src/main/java/group/goforward/battlbuilder/{services => service}/MappingAdminService.java (96%) rename src/main/java/group/goforward/battlbuilder/{services => service}/MerchantFeedImportService.java (86%) rename src/main/java/group/goforward/battlbuilder/{services => service}/PartCategoryResolverService.java (90%) rename src/main/java/group/goforward/battlbuilder/{services => service}/PartRoleMappingService.java (90%) rename src/main/java/group/goforward/battlbuilder/{services => service}/ProductQueryService.java (92%) rename src/main/java/group/goforward/battlbuilder/{services => service}/ReclassificationService.java (89%) rename src/main/java/group/goforward/battlbuilder/{services => service}/admin/AdminProductService.java (91%) rename src/main/java/group/goforward/battlbuilder/{services => service}/admin/AdminUserService.java (94%) rename src/main/java/group/goforward/battlbuilder/{services => service}/admin/StatesService.java (83%) rename src/main/java/group/goforward/battlbuilder/{services => service}/admin/UsersService.java (83%) rename src/main/java/group/goforward/battlbuilder/{services => service}/admin/admin_services_package_info.java (59%) rename src/main/java/group/goforward/battlbuilder/{services => service}/admin/impl/AdminDashboardService.java (85%) rename src/main/java/group/goforward/battlbuilder/{services => service}/admin/impl/AdminProductServiceImpl.java (91%) rename src/main/java/group/goforward/battlbuilder/{services => service}/admin/impl/StatesServiceImpl.java (78%) rename src/main/java/group/goforward/battlbuilder/{services => service}/admin/impl/UsersServiceImpl.java (78%) rename src/main/java/group/goforward/battlbuilder/{services => service}/admin/package-info.java (88%) rename src/main/java/group/goforward/battlbuilder/{services => service}/auth/BetaAuthService.java (94%) rename src/main/java/group/goforward/battlbuilder/{services => service}/auth/impl/BetaAuthServiceImpl.java (97%) rename src/main/java/group/goforward/battlbuilder/{services => service}/auth/impl/BetaInviteService.java (96%) rename src/main/java/group/goforward/battlbuilder/{services => service}/impl/BrandServiceImpl.java (80%) rename src/main/java/group/goforward/battlbuilder/{services => service}/impl/BuildServiceImpl.java (96%) rename src/main/java/group/goforward/battlbuilder/{services => service}/impl/CatalogQueryServiceImpl.java (96%) rename src/main/java/group/goforward/battlbuilder/{services => service}/impl/CategoryClassificationServiceImpl.java (97%) rename src/main/java/group/goforward/battlbuilder/{services => service}/impl/ImageService.java (93%) rename src/main/java/group/goforward/battlbuilder/{services => service}/impl/MerchantCategoryMappingService.java (89%) rename src/main/java/group/goforward/battlbuilder/{services => service}/impl/MerchantFeedImportServiceImpl.java (98%) rename src/main/java/group/goforward/battlbuilder/{services => service}/impl/ProductQueryServiceImpl.java (95%) rename src/main/java/group/goforward/battlbuilder/{services => service}/impl/ReclassificationServiceImpl.java (97%) rename src/main/java/group/goforward/battlbuilder/{services => service}/impl/package-info.java (78%) rename src/main/java/group/goforward/battlbuilder/{services => service}/package-info.java (85%) rename src/main/java/group/goforward/battlbuilder/{services => service}/utils/EmailService.java (90%) rename src/main/java/group/goforward/battlbuilder/{services => service}/utils/ImageUrlToMinioMigrator.java (98%) rename src/main/java/group/goforward/battlbuilder/{services => service}/utils/MigrateProductImagesToMinioRunner.java (94%) rename src/main/java/group/goforward/battlbuilder/{services => service}/utils/TemplateRenderer.java (87%) rename src/main/java/group/goforward/battlbuilder/{services => service}/utils/TemplatedEmailService.java (90%) rename src/main/java/group/goforward/battlbuilder/{services => service}/utils/impl/EmailServiceImpl.java (95%) rename src/main/java/group/goforward/battlbuilder/{services => service}/utils/impl/package-info.java (79%) delete mode 100644 src/main/java/group/goforward/battlbuilder/utils/package-info.java diff --git a/src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java b/src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java index d881b7d..db17e26 100644 --- a/src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java +++ b/src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java @@ -15,7 +15,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; "group.goforward.battlbuilder.enrichment" }) @EnableJpaRepositories(basePackages = { - "group.goforward.battlbuilder.repos", + "group.goforward.battlbuilder.repo", "group.goforward.battlbuilder.enrichment" }) public class BattlBuilderApplication { diff --git a/src/main/java/group/goforward/battlbuilder/catalog/classification/PartRoleResolver.java b/src/main/java/group/goforward/battlbuilder/catalog/classification/PartRoleResolver.java index 6453e8f..13db265 100644 --- a/src/main/java/group/goforward/battlbuilder/catalog/classification/PartRoleResolver.java +++ b/src/main/java/group/goforward/battlbuilder/catalog/classification/PartRoleResolver.java @@ -1,7 +1,7 @@ package group.goforward.battlbuilder.catalog.classification; import group.goforward.battlbuilder.model.PartRoleRule; -import group.goforward.battlbuilder.repos.PartRoleRuleRepository; +import group.goforward.battlbuilder.repo.PartRoleRuleRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/group/goforward/battlbuilder/catalog/classification/PlatformResolver.java b/src/main/java/group/goforward/battlbuilder/catalog/classification/PlatformResolver.java index 4d5c39f..7e6d9f7 100644 --- a/src/main/java/group/goforward/battlbuilder/catalog/classification/PlatformResolver.java +++ b/src/main/java/group/goforward/battlbuilder/catalog/classification/PlatformResolver.java @@ -1,7 +1,7 @@ package group.goforward.battlbuilder.catalog.classification; import group.goforward.battlbuilder.model.PlatformRule; -import group.goforward.battlbuilder.repos.PlatformRuleRepository; +import group.goforward.battlbuilder.repo.PlatformRuleRepository; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; diff --git a/src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationReconcileService.java b/src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationReconcileService.java index a4df457..7713d86 100644 --- a/src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationReconcileService.java +++ b/src/main/java/group/goforward/battlbuilder/classification/admin/ClassificationReconcileService.java @@ -5,8 +5,8 @@ import group.goforward.battlbuilder.classification.ProductClassifier; import group.goforward.battlbuilder.model.MerchantCategoryMap; import group.goforward.battlbuilder.model.PartRoleSource; import group.goforward.battlbuilder.model.Product; -import group.goforward.battlbuilder.repos.ProductRepository; -import group.goforward.battlbuilder.repos.ProductOfferRepository; +import group.goforward.battlbuilder.repo.ProductRepository; +import group.goforward.battlbuilder.repo.ProductOfferRepository; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/battlbuilder/classification/impl/ProductClassifierImpl.java b/src/main/java/group/goforward/battlbuilder/classification/impl/ProductClassifierImpl.java index dcdbe08..4664b5a 100644 --- a/src/main/java/group/goforward/battlbuilder/classification/impl/ProductClassifierImpl.java +++ b/src/main/java/group/goforward/battlbuilder/classification/impl/ProductClassifierImpl.java @@ -4,8 +4,8 @@ import group.goforward.battlbuilder.classification.ClassificationResult; import group.goforward.battlbuilder.classification.ProductClassifier; import group.goforward.battlbuilder.model.MerchantCategoryMap; import group.goforward.battlbuilder.model.Product; -import group.goforward.battlbuilder.repos.MerchantCategoryMapRepository; -import group.goforward.battlbuilder.repos.ProductOfferRepository; +import group.goforward.battlbuilder.repo.MerchantCategoryMapRepository; +import group.goforward.battlbuilder.repo.ProductOfferRepository; import org.springframework.stereotype.Component; import java.util.LinkedHashMap; diff --git a/src/main/java/group/goforward/battlbuilder/cli/BetaInviteCliRunner.java b/src/main/java/group/goforward/battlbuilder/cli/BetaInviteCliRunner.java index 8da605b..940d908 100644 --- a/src/main/java/group/goforward/battlbuilder/cli/BetaInviteCliRunner.java +++ b/src/main/java/group/goforward/battlbuilder/cli/BetaInviteCliRunner.java @@ -1,6 +1,6 @@ package group.goforward.battlbuilder.cli; -import group.goforward.battlbuilder.services.auth.impl.BetaInviteService; +import group.goforward.battlbuilder.service.auth.impl.BetaInviteService; import org.springframework.beans.factory.annotation.Value; import org.springframework.boot.CommandLineRunner; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; diff --git a/src/main/java/group/goforward/battlbuilder/common/package-info.java b/src/main/java/group/goforward/battlbuilder/common/package-info.java index 652b139..121d879 100644 --- a/src/main/java/group/goforward/battlbuilder/common/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/common/package-info.java @@ -1,7 +1,7 @@ /** - * Utility controllers package for the BattlBuilder application. + * Utility controller package for the BattlBuilder application. *

- * Contains utility REST controllers for email handling and + * Contains utility REST controller for email handling and * health check operations. * * @author Forward Group, LLC diff --git a/src/main/java/group/goforward/battlbuilder/config/CacheConfig.java b/src/main/java/group/goforward/battlbuilder/config/CacheConfig.java index 02eac29..c8b1e13 100644 --- a/src/main/java/group/goforward/battlbuilder/config/CacheConfig.java +++ b/src/main/java/group/goforward/battlbuilder/config/CacheConfig.java @@ -12,7 +12,7 @@ public class CacheConfig { @Bean public CacheManager cacheManager() { - // Must match the @Cacheable value(s) used in controllers/services. + // Must match the @Cacheable value(s) used in controller/service. // ProductV1Controller uses: "gunbuilderProductsV1" return new ConcurrentMapCacheManager( "gunbuilderProductsV1", diff --git a/src/main/java/group/goforward/battlbuilder/controllers/AuthController.java b/src/main/java/group/goforward/battlbuilder/controller/AuthController.java similarity index 97% rename from src/main/java/group/goforward/battlbuilder/controllers/AuthController.java rename to src/main/java/group/goforward/battlbuilder/controller/AuthController.java index c2bc2d2..c10b8a0 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/AuthController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/AuthController.java @@ -1,9 +1,9 @@ -package group.goforward.battlbuilder.controllers; +package group.goforward.battlbuilder.controller; import group.goforward.battlbuilder.model.User; -import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.repo.UserRepository; import group.goforward.battlbuilder.security.JwtService; -import group.goforward.battlbuilder.services.auth.BetaAuthService; +import group.goforward.battlbuilder.service.auth.BetaAuthService; import group.goforward.battlbuilder.web.dto.auth.AuthResponse; import group.goforward.battlbuilder.web.dto.auth.BetaSignupRequest; import group.goforward.battlbuilder.web.dto.auth.LoginRequest; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/BuilderBootstrapController.java b/src/main/java/group/goforward/battlbuilder/controller/BuilderBootstrapController.java similarity index 95% rename from src/main/java/group/goforward/battlbuilder/controllers/BuilderBootstrapController.java rename to src/main/java/group/goforward/battlbuilder/controller/BuilderBootstrapController.java index f60b42d..ead24e7 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/BuilderBootstrapController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/BuilderBootstrapController.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.controllers; +package group.goforward.battlbuilder.controller; import group.goforward.battlbuilder.model.PartRoleMapping; -import group.goforward.battlbuilder.repos.PartCategoryRepository; -import group.goforward.battlbuilder.repos.PartRoleMappingRepository; +import group.goforward.battlbuilder.repo.PartCategoryRepository; +import group.goforward.battlbuilder.repo.PartRoleMappingRepository; import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/CategoryController.java b/src/main/java/group/goforward/battlbuilder/controller/CategoryController.java similarity index 89% rename from src/main/java/group/goforward/battlbuilder/controllers/CategoryController.java rename to src/main/java/group/goforward/battlbuilder/controller/CategoryController.java index 00c3de7..1748289 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/CategoryController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/CategoryController.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.controllers; +package group.goforward.battlbuilder.controller; -import group.goforward.battlbuilder.repos.PartCategoryRepository; +import group.goforward.battlbuilder.repo.PartCategoryRepository; import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/EmailTrackingController.java b/src/main/java/group/goforward/battlbuilder/controller/EmailTrackingController.java similarity index 93% rename from src/main/java/group/goforward/battlbuilder/controllers/EmailTrackingController.java rename to src/main/java/group/goforward/battlbuilder/controller/EmailTrackingController.java index d31c1f7..9bf358b 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/EmailTrackingController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/EmailTrackingController.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.controllers; +package group.goforward.battlbuilder.controller; -import group.goforward.battlbuilder.repos.EmailRequestRepository; +import group.goforward.battlbuilder.repo.EmailRequestRepository; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/ImportController.java b/src/main/java/group/goforward/battlbuilder/controller/ImportController.java similarity index 88% rename from src/main/java/group/goforward/battlbuilder/controllers/ImportController.java rename to src/main/java/group/goforward/battlbuilder/controller/ImportController.java index ae70ecd..e4d98cf 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/ImportController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/ImportController.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.controllers; +package group.goforward.battlbuilder.controller; -import group.goforward.battlbuilder.services.MerchantFeedImportService; +import group.goforward.battlbuilder.service.MerchantFeedImportService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/MerchantDebugController.java b/src/main/java/group/goforward/battlbuilder/controller/MerchantDebugController.java similarity index 83% rename from src/main/java/group/goforward/battlbuilder/controllers/MerchantDebugController.java rename to src/main/java/group/goforward/battlbuilder/controller/MerchantDebugController.java index 9461e48..5cb9d5d 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/MerchantDebugController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/MerchantDebugController.java @@ -1,7 +1,7 @@ -package group.goforward.battlbuilder.controllers; +package group.goforward.battlbuilder.controller; import group.goforward.battlbuilder.model.Merchant; -import group.goforward.battlbuilder.repos.MerchantRepository; +import group.goforward.battlbuilder.repo.MerchantRepository; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java b/src/main/java/group/goforward/battlbuilder/controller/PartRoleMappingController.java similarity index 88% rename from src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java rename to src/main/java/group/goforward/battlbuilder/controller/PartRoleMappingController.java index 485d203..9e1cbc7 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/PartRoleMappingController.java @@ -1,6 +1,6 @@ -//package group.goforward.battlbuilder.controllers; +//package group.goforward.battlbuilder.controller; // -//import group.goforward.battlbuilder.services.PartRoleMappingService; +//import group.goforward.battlbuilder.service.PartRoleMappingService; //import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto; //import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto; //import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/ProductController.java b/src/main/java/group/goforward/battlbuilder/controller/ProductController.java similarity index 87% rename from src/main/java/group/goforward/battlbuilder/controllers/ProductController.java rename to src/main/java/group/goforward/battlbuilder/controller/ProductController.java index ecbd36f..b00b185 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/ProductController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/ProductController.java @@ -1,7 +1,5 @@ -package group.goforward.battlbuilder.controllers; +package group.goforward.battlbuilder.controller; -import group.goforward.battlbuilder.web.dto.ProductOfferDto; -import group.goforward.battlbuilder.web.dto.ProductSummaryDto; import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -20,7 +18,7 @@ import java.util.List; *

* NOTE: * Even when disabled, Spring still compiles this class. So it must not reference - * missing services/methods. + * missing service/methods. */ @Deprecated @RestController diff --git a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminBetaInviteController.java b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminBetaInviteController.java similarity index 92% rename from src/main/java/group/goforward/battlbuilder/controllers/admin/AdminBetaInviteController.java rename to src/main/java/group/goforward/battlbuilder/controller/admin/AdminBetaInviteController.java index 6584f87..9355d7a 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminBetaInviteController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminBetaInviteController.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.controllers.admin; +package group.goforward.battlbuilder.controller.admin; -import group.goforward.battlbuilder.services.auth.impl.BetaInviteService; +import group.goforward.battlbuilder.service.auth.impl.BetaInviteService; import group.goforward.battlbuilder.web.dto.admin.AdminBetaRequestDto; import group.goforward.battlbuilder.web.dto.admin.AdminInviteResponse; import org.springframework.data.domain.Page; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminCategoryController.java b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminCategoryController.java similarity index 89% rename from src/main/java/group/goforward/battlbuilder/controllers/admin/AdminCategoryController.java rename to src/main/java/group/goforward/battlbuilder/controller/admin/AdminCategoryController.java index 993ffa3..650fe03 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminCategoryController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminCategoryController.java @@ -1,7 +1,7 @@ -package group.goforward.battlbuilder.controllers.admin; +package group.goforward.battlbuilder.controller.admin; import group.goforward.battlbuilder.model.PartCategory; -import group.goforward.battlbuilder.repos.PartCategoryRepository; +import group.goforward.battlbuilder.repo.PartCategoryRepository; import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminDashboardController.java b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminDashboardController.java similarity index 86% rename from src/main/java/group/goforward/battlbuilder/controllers/admin/AdminDashboardController.java rename to src/main/java/group/goforward/battlbuilder/controller/admin/AdminDashboardController.java index ee4cbc7..a0a74b4 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminDashboardController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminDashboardController.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.controllers.admin; +package group.goforward.battlbuilder.controller.admin; -import group.goforward.battlbuilder.services.admin.impl.AdminDashboardService; +import group.goforward.battlbuilder.service.admin.impl.AdminDashboardService; import group.goforward.battlbuilder.web.dto.admin.AdminDashboardOverviewDto; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPartCategoryController.java b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminPartCategoryController.java similarity index 89% rename from src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPartCategoryController.java rename to src/main/java/group/goforward/battlbuilder/controller/admin/AdminPartCategoryController.java index 5ae1c30..c8bf4f6 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPartCategoryController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminPartCategoryController.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.controllers.admin; +package group.goforward.battlbuilder.controller.admin; -import group.goforward.battlbuilder.repos.PartCategoryRepository; +import group.goforward.battlbuilder.repo.PartCategoryRepository; import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPartRoleMappingController.java b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminPartRoleMappingController.java similarity index 96% rename from src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPartRoleMappingController.java rename to src/main/java/group/goforward/battlbuilder/controller/admin/AdminPartRoleMappingController.java index 1d3d961..f3c606d 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPartRoleMappingController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminPartRoleMappingController.java @@ -1,9 +1,9 @@ -package group.goforward.battlbuilder.controllers.admin; +package group.goforward.battlbuilder.controller.admin; import group.goforward.battlbuilder.model.PartCategory; import group.goforward.battlbuilder.model.PartRoleMapping; -import group.goforward.battlbuilder.repos.PartCategoryRepository; -import group.goforward.battlbuilder.repos.PartRoleMappingRepository; +import group.goforward.battlbuilder.repo.PartCategoryRepository; +import group.goforward.battlbuilder.repo.PartRoleMappingRepository; import group.goforward.battlbuilder.web.dto.admin.AdminPartRoleMappingDto; import group.goforward.battlbuilder.web.dto.admin.CreatePartRoleMappingRequest; import group.goforward.battlbuilder.web.dto.admin.UpdatePartRoleMappingRequest; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPlatformController.java b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminPlatformController.java similarity index 91% rename from src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPlatformController.java rename to src/main/java/group/goforward/battlbuilder/controller/admin/AdminPlatformController.java index ad441b4..bce1f91 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPlatformController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/admin/AdminPlatformController.java @@ -1,7 +1,7 @@ -package group.goforward.battlbuilder.controllers.admin; +package group.goforward.battlbuilder.controller.admin; import group.goforward.battlbuilder.model.Platform; -import group.goforward.battlbuilder.repos.PlatformRepository; +import group.goforward.battlbuilder.repo.PlatformRepository; import group.goforward.battlbuilder.web.dto.admin.PlatformDto; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/admin/MerchantAdminController.java b/src/main/java/group/goforward/battlbuilder/controller/admin/MerchantAdminController.java similarity index 92% rename from src/main/java/group/goforward/battlbuilder/controllers/admin/MerchantAdminController.java rename to src/main/java/group/goforward/battlbuilder/controller/admin/MerchantAdminController.java index b86fa06..89fc186 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/admin/MerchantAdminController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/admin/MerchantAdminController.java @@ -1,5 +1,5 @@ // MerchantAdminController.java -package group.goforward.battlbuilder.controllers.admin; +package group.goforward.battlbuilder.controller.admin; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; @@ -9,7 +9,7 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import group.goforward.battlbuilder.model.Merchant; -import group.goforward.battlbuilder.repos.MerchantRepository; +import group.goforward.battlbuilder.repo.MerchantRepository; import group.goforward.battlbuilder.web.dto.MerchantAdminDto; import java.util.List; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/admin/PlatformViewController.java b/src/main/java/group/goforward/battlbuilder/controller/admin/PlatformViewController.java similarity index 83% rename from src/main/java/group/goforward/battlbuilder/controllers/admin/PlatformViewController.java rename to src/main/java/group/goforward/battlbuilder/controller/admin/PlatformViewController.java index 6951c1c..88033d0 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/admin/PlatformViewController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/admin/PlatformViewController.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.controllers.admin; +package group.goforward.battlbuilder.controller.admin; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.GetMapping; diff --git a/src/main/java/group/goforward/battlbuilder/controller/admin/package-info.java b/src/main/java/group/goforward/battlbuilder/controller/admin/package-info.java new file mode 100644 index 0000000..62a3d30 --- /dev/null +++ b/src/main/java/group/goforward/battlbuilder/controller/admin/package-info.java @@ -0,0 +1,11 @@ +/** + * Admin controller package for the BattlBuilder application. + *

+ * Contains REST controller for administrative operations including + * category management, platform configuration, and merchant administration. + * + * @author Forward Group, LLC + * @version 1.0 + * @since 2025-12-10 + */ +package group.goforward.battlbuilder.controller.admin; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BrandController.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/BrandController.java similarity index 87% rename from src/main/java/group/goforward/battlbuilder/controllers/api/v1/BrandController.java rename to src/main/java/group/goforward/battlbuilder/controller/api/v1/BrandController.java index 68f6ea1..b82cdfe 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BrandController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/BrandController.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.controllers.api.v1; +package group.goforward.battlbuilder.controller.api.v1; import group.goforward.battlbuilder.model.Brand; -import group.goforward.battlbuilder.repos.BrandRepository; -import group.goforward.battlbuilder.services.BrandService; +import group.goforward.battlbuilder.repo.BrandRepository; +import group.goforward.battlbuilder.service.BrandService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildController.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/BuildController.java similarity index 85% rename from src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildController.java rename to src/main/java/group/goforward/battlbuilder/controller/api/v1/BuildController.java index 2c06ee7..e5a5e53 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/BuildController.java @@ -1,7 +1,7 @@ -package group.goforward.battlbuilder.controllers.api.v1; +package group.goforward.battlbuilder.controller.api.v1; import group.goforward.battlbuilder.model.Build; -import group.goforward.battlbuilder.repos.BuildRepository; +import group.goforward.battlbuilder.repo.BuildRepository; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildV1Controller.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/BuildV1Controller.java similarity index 96% rename from src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildV1Controller.java rename to src/main/java/group/goforward/battlbuilder/controller/api/v1/BuildV1Controller.java index 3b9826c..74f08d2 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/BuildV1Controller.java +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/BuildV1Controller.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.controllers.api.v1; +package group.goforward.battlbuilder.controller.api.v1; -import group.goforward.battlbuilder.services.BuildService; +import group.goforward.battlbuilder.service.BuildService; import group.goforward.battlbuilder.web.dto.BuildDto; import group.goforward.battlbuilder.web.dto.BuildFeedCardDto; import group.goforward.battlbuilder.web.dto.BuildSummaryDto; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/CatalogController.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/CatalogController.java similarity index 94% rename from src/main/java/group/goforward/battlbuilder/controllers/api/v1/CatalogController.java rename to src/main/java/group/goforward/battlbuilder/controller/api/v1/CatalogController.java index 5b38310..2514ce6 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/CatalogController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/CatalogController.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.controllers.api.v1; +package group.goforward.battlbuilder.controller.api.v1; -import group.goforward.battlbuilder.services.CatalogQueryService; +import group.goforward.battlbuilder.service.CatalogQueryService; import group.goforward.battlbuilder.web.dto.ProductSummaryDto; import group.goforward.battlbuilder.web.dto.catalog.CatalogProductIdsRequest; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/EmailController.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/EmailController.java similarity index 96% rename from src/main/java/group/goforward/battlbuilder/controllers/api/v1/EmailController.java rename to src/main/java/group/goforward/battlbuilder/controller/api/v1/EmailController.java index 68d5523..eaca61a 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/EmailController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/EmailController.java @@ -1,11 +1,11 @@ -package group.goforward.battlbuilder.controllers.api.v1; +package group.goforward.battlbuilder.controller.api.v1; import group.goforward.battlbuilder.common.ApiResponse; import group.goforward.battlbuilder.dto.EmailRequestDto; import group.goforward.battlbuilder.model.EmailRequest; import group.goforward.battlbuilder.model.EmailStatus; -import group.goforward.battlbuilder.repos.EmailRequestRepository; -import group.goforward.battlbuilder.services.utils.EmailService; +import group.goforward.battlbuilder.repo.EmailRequestRepository; +import group.goforward.battlbuilder.service.utils.EmailService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ImageController.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/ImageController.java similarity index 92% rename from src/main/java/group/goforward/battlbuilder/controllers/api/v1/ImageController.java rename to src/main/java/group/goforward/battlbuilder/controller/api/v1/ImageController.java index d1dc29a..a53d0c3 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ImageController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/ImageController.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.controllers.api.v1; +package group.goforward.battlbuilder.controller.api.v1; import group.goforward.battlbuilder.model.ImageMeta; import group.goforward.battlbuilder.security.UserPrincipal; -import group.goforward.battlbuilder.services.impl.ImageService; +import group.goforward.battlbuilder.service.impl.ImageService; import org.springframework.http.CacheControl; import org.springframework.http.MediaType; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/MeController.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/MeController.java similarity index 98% rename from src/main/java/group/goforward/battlbuilder/controllers/api/v1/MeController.java rename to src/main/java/group/goforward/battlbuilder/controller/api/v1/MeController.java index fb841ac..4424a76 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/MeController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/MeController.java @@ -1,7 +1,7 @@ -package group.goforward.battlbuilder.controllers.api.v1; +package group.goforward.battlbuilder.controller.api.v1; import group.goforward.battlbuilder.model.User; -import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.repo.UserRepository; import org.springframework.http.ResponseEntity; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductV1Controller.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/ProductV1Controller.java similarity index 93% rename from src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductV1Controller.java rename to src/main/java/group/goforward/battlbuilder/controller/api/v1/ProductV1Controller.java index f5d9d08..020d90e 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/ProductV1Controller.java +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/ProductV1Controller.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.controllers.api.v1; +package group.goforward.battlbuilder.controller.api.v1; -import group.goforward.battlbuilder.services.ProductQueryService; +import group.goforward.battlbuilder.service.ProductQueryService; import group.goforward.battlbuilder.web.dto.ProductOfferDto; import group.goforward.battlbuilder.web.dto.ProductSummaryDto; import org.springframework.cache.annotation.Cacheable; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/StateController.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/StateController.java similarity index 88% rename from src/main/java/group/goforward/battlbuilder/controllers/api/v1/StateController.java rename to src/main/java/group/goforward/battlbuilder/controller/api/v1/StateController.java index 53ff7c0..69cfc3c 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/StateController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/StateController.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.controllers.api.v1; +package group.goforward.battlbuilder.controller.api.v1; import group.goforward.battlbuilder.model.State; -import group.goforward.battlbuilder.repos.StateRepository; -import group.goforward.battlbuilder.services.admin.StatesService; +import group.goforward.battlbuilder.repo.StateRepository; +import group.goforward.battlbuilder.service.admin.StatesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/UserController.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/UserController.java similarity index 87% rename from src/main/java/group/goforward/battlbuilder/controllers/api/v1/UserController.java rename to src/main/java/group/goforward/battlbuilder/controller/api/v1/UserController.java index 1e9c863..f4728ba 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/UserController.java +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/UserController.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.controllers.api.v1; +package group.goforward.battlbuilder.controller.api.v1; import group.goforward.battlbuilder.model.User; -import group.goforward.battlbuilder.repos.UserRepository; -import group.goforward.battlbuilder.services.admin.UsersService; +import group.goforward.battlbuilder.repo.UserRepository; +import group.goforward.battlbuilder.service.admin.UsersService; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/controller/api/v1/package-info.java b/src/main/java/group/goforward/battlbuilder/controller/api/v1/package-info.java new file mode 100644 index 0000000..ab6dba3 --- /dev/null +++ b/src/main/java/group/goforward/battlbuilder/controller/api/v1/package-info.java @@ -0,0 +1,11 @@ +/** + * API controller package for the BattlBuilder application. + *

+ * Contains REST API controller for public-facing endpoints including + * brand management, state information, and user operations. + * + * @author Forward Group, LLC + * @version 1.0 + * @since 2025-12-10 + */ +package group.goforward.battlbuilder.controller.api.v1; diff --git a/src/main/java/group/goforward/battlbuilder/controller/package-info.java b/src/main/java/group/goforward/battlbuilder/controller/package-info.java new file mode 100644 index 0000000..4f59de0 --- /dev/null +++ b/src/main/java/group/goforward/battlbuilder/controller/package-info.java @@ -0,0 +1,11 @@ +/** + * Utility controller package for the BattlBuilder application. + *

+ * Contains utility REST controller for email handling and + * health check operations. + * + * @author Forward Group, LLC + * @version 1.0 + * @since 2025-12-10 + */ +package group.goforward.battlbuilder.controller; \ No newline at end of file diff --git a/src/main/java/group/goforward/battlbuilder/controllers/admin/package-info.java b/src/main/java/group/goforward/battlbuilder/controllers/admin/package-info.java deleted file mode 100644 index 32ff6f6..0000000 --- a/src/main/java/group/goforward/battlbuilder/controllers/admin/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Admin controllers package for the BattlBuilder application. - *

- * Contains REST controllers for administrative operations including - * category management, platform configuration, and merchant administration. - * - * @author Forward Group, LLC - * @version 1.0 - * @since 2025-12-10 - */ -package group.goforward.battlbuilder.controllers.admin; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/package-info.java b/src/main/java/group/goforward/battlbuilder/controllers/api/v1/package-info.java deleted file mode 100644 index 443848d..0000000 --- a/src/main/java/group/goforward/battlbuilder/controllers/api/v1/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/** - * API controllers package for the BattlBuilder application. - *

- * Contains REST API controllers for public-facing endpoints including - * brand management, state information, and user operations. - * - * @author Forward Group, LLC - * @version 1.0 - * @since 2025-12-10 - */ -package group.goforward.battlbuilder.controllers.api.v1; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/package-info.java b/src/main/java/group/goforward/battlbuilder/controllers/package-info.java deleted file mode 100644 index 7f3fa4e..0000000 --- a/src/main/java/group/goforward/battlbuilder/controllers/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Utility controllers package for the BattlBuilder application. - *

- * Contains utility REST controllers for email handling and - * health check operations. - * - * @author Forward Group, LLC - * @version 1.0 - * @since 2025-12-10 - */ -package group.goforward.battlbuilder.controllers; \ No newline at end of file diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentSource.java b/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentSource.java index 8a52ca1..8cbaae5 100644 --- a/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentSource.java +++ b/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentSource.java @@ -1,5 +1,8 @@ package group.goforward.battlbuilder.enrichment; +/** + * Enum representing the source of an enrichment. + */ public enum EnrichmentSource { AI, RULES, diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentStatus.java b/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentStatus.java index de16e1d..7c3ee38 100644 --- a/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentStatus.java +++ b/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentStatus.java @@ -1,4 +1,15 @@ package group.goforward.battlbuilder.enrichment; +/** + * Status of an enrichment in the system. + * + *

Possible values: + *

+ */ public enum EnrichmentStatus { PENDING_REVIEW, diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentType.java b/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentType.java index 0c9bc96..69203f1 100644 --- a/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentType.java +++ b/src/main/java/group/goforward/battlbuilder/enrichment/EnrichmentType.java @@ -1,5 +1,8 @@ package group.goforward.battlbuilder.enrichment; +/** + * Enum representing different types of enrichment that can be applied to products. + */ public enum EnrichmentType { CALIBER, CALIBER_GROUP, diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java b/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java index 432c1bb..9746bdb 100644 --- a/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java +++ b/src/main/java/group/goforward/battlbuilder/enrichment/ai/AiEnrichmentOrchestrator.java @@ -2,11 +2,11 @@ package group.goforward.battlbuilder.enrichment.ai; import group.goforward.battlbuilder.enrichment.*; import group.goforward.battlbuilder.enrichment.ai.dto.CaliberExtractionResult; -import group.goforward.battlbuilder.enrichment.models.ProductEnrichment; -import group.goforward.battlbuilder.enrichment.repos.ProductEnrichmentRepository; +import group.goforward.battlbuilder.enrichment.model.ProductEnrichment; +import group.goforward.battlbuilder.enrichment.repo.ProductEnrichmentRepository; import group.goforward.battlbuilder.enrichment.taxonomies.CaliberTaxonomy; import group.goforward.battlbuilder.model.Product; -import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.repo.ProductRepository; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/controllers/AdminEnrichmentController.java b/src/main/java/group/goforward/battlbuilder/enrichment/controller/AdminEnrichmentController.java similarity index 95% rename from src/main/java/group/goforward/battlbuilder/enrichment/controllers/AdminEnrichmentController.java rename to src/main/java/group/goforward/battlbuilder/enrichment/controller/AdminEnrichmentController.java index 97a94f0..ddd4ff9 100644 --- a/src/main/java/group/goforward/battlbuilder/enrichment/controllers/AdminEnrichmentController.java +++ b/src/main/java/group/goforward/battlbuilder/enrichment/controller/AdminEnrichmentController.java @@ -1,12 +1,12 @@ -package group.goforward.battlbuilder.enrichment.controllers; +package group.goforward.battlbuilder.enrichment.controller; import group.goforward.battlbuilder.enrichment.taxonomies.CaliberTaxonomy; import group.goforward.battlbuilder.enrichment.EnrichmentStatus; import group.goforward.battlbuilder.enrichment.EnrichmentType; -import group.goforward.battlbuilder.enrichment.models.ProductEnrichment; +import group.goforward.battlbuilder.enrichment.model.ProductEnrichment; import group.goforward.battlbuilder.enrichment.ai.AiEnrichmentOrchestrator; -import group.goforward.battlbuilder.enrichment.repos.ProductEnrichmentRepository; -import group.goforward.battlbuilder.enrichment.services.CaliberEnrichmentService; +import group.goforward.battlbuilder.enrichment.repo.ProductEnrichmentRepository; +import group.goforward.battlbuilder.enrichment.service.CaliberEnrichmentService; import org.springframework.data.domain.PageRequest; import org.springframework.http.ResponseEntity; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/models/ProductEnrichment.java b/src/main/java/group/goforward/battlbuilder/enrichment/model/ProductEnrichment.java similarity index 98% rename from src/main/java/group/goforward/battlbuilder/enrichment/models/ProductEnrichment.java rename to src/main/java/group/goforward/battlbuilder/enrichment/model/ProductEnrichment.java index cd82318..f46e10c 100644 --- a/src/main/java/group/goforward/battlbuilder/enrichment/models/ProductEnrichment.java +++ b/src/main/java/group/goforward/battlbuilder/enrichment/model/ProductEnrichment.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.enrichment.models; +package group.goforward.battlbuilder.enrichment.model; import group.goforward.battlbuilder.enrichment.EnrichmentSource; import group.goforward.battlbuilder.enrichment.EnrichmentStatus; diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/repos/ProductEnrichmentRepository.java b/src/main/java/group/goforward/battlbuilder/enrichment/repo/ProductEnrichmentRepository.java similarity index 95% rename from src/main/java/group/goforward/battlbuilder/enrichment/repos/ProductEnrichmentRepository.java rename to src/main/java/group/goforward/battlbuilder/enrichment/repo/ProductEnrichmentRepository.java index 1b2eda5..fc95df8 100644 --- a/src/main/java/group/goforward/battlbuilder/enrichment/repos/ProductEnrichmentRepository.java +++ b/src/main/java/group/goforward/battlbuilder/enrichment/repo/ProductEnrichmentRepository.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.enrichment.repos; +package group.goforward.battlbuilder.enrichment.repo; import group.goforward.battlbuilder.enrichment.EnrichmentStatus; import group.goforward.battlbuilder.enrichment.EnrichmentType; -import group.goforward.battlbuilder.enrichment.models.ProductEnrichment; +import group.goforward.battlbuilder.enrichment.model.ProductEnrichment; import org.springframework.data.domain.Pageable; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/group/goforward/battlbuilder/enrichment/services/CaliberEnrichmentService.java b/src/main/java/group/goforward/battlbuilder/enrichment/service/CaliberEnrichmentService.java similarity index 92% rename from src/main/java/group/goforward/battlbuilder/enrichment/services/CaliberEnrichmentService.java rename to src/main/java/group/goforward/battlbuilder/enrichment/service/CaliberEnrichmentService.java index 5e5d3f3..62a2ade 100644 --- a/src/main/java/group/goforward/battlbuilder/enrichment/services/CaliberEnrichmentService.java +++ b/src/main/java/group/goforward/battlbuilder/enrichment/service/CaliberEnrichmentService.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.enrichment.services; +package group.goforward.battlbuilder.enrichment.service; import group.goforward.battlbuilder.enrichment.*; -import group.goforward.battlbuilder.enrichment.models.ProductEnrichment; -import group.goforward.battlbuilder.enrichment.repos.ProductEnrichmentRepository; +import group.goforward.battlbuilder.enrichment.model.ProductEnrichment; +import group.goforward.battlbuilder.enrichment.repo.ProductEnrichmentRepository; import jakarta.persistence.EntityManager; import jakarta.persistence.PersistenceContext; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/battlbuilder/repos/AccountRepository.java b/src/main/java/group/goforward/battlbuilder/repo/AccountRepository.java similarity index 80% rename from src/main/java/group/goforward/battlbuilder/repos/AccountRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/AccountRepository.java index c9e73cd..669442e 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/AccountRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/AccountRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.Account; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/AuthTokenRepository.java b/src/main/java/group/goforward/battlbuilder/repo/AuthTokenRepository.java similarity index 95% rename from src/main/java/group/goforward/battlbuilder/repos/AuthTokenRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/AuthTokenRepository.java index 478fe29..5efb9e5 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/AuthTokenRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/AuthTokenRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.AuthToken; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/BrandRepository.java b/src/main/java/group/goforward/battlbuilder/repo/BrandRepository.java similarity index 84% rename from src/main/java/group/goforward/battlbuilder/repos/BrandRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/BrandRepository.java index 836bec7..dadc0b8 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/BrandRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/BrandRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.Brand; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java b/src/main/java/group/goforward/battlbuilder/repo/BuildItemRepository.java similarity index 86% rename from src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/BuildItemRepository.java index aafe71a..85dbc94 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/BuildItemRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.BuildItem; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/BuildProfileRepository.java b/src/main/java/group/goforward/battlbuilder/repo/BuildProfileRepository.java similarity index 88% rename from src/main/java/group/goforward/battlbuilder/repos/BuildProfileRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/BuildProfileRepository.java index 9a2cf1b..c251553 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/BuildProfileRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/BuildProfileRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.BuildProfile; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/BuildRepository.java b/src/main/java/group/goforward/battlbuilder/repo/BuildRepository.java similarity index 92% rename from src/main/java/group/goforward/battlbuilder/repos/BuildRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/BuildRepository.java index daf0ec9..d78b6fc 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/BuildRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/BuildRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.Build; import org.springframework.data.domain.Page; diff --git a/src/main/java/group/goforward/battlbuilder/repos/CanonicalCategoryRepository.java b/src/main/java/group/goforward/battlbuilder/repo/CanonicalCategoryRepository.java similarity index 91% rename from src/main/java/group/goforward/battlbuilder/repos/CanonicalCategoryRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/CanonicalCategoryRepository.java index 7f8e7b8..1d10a97 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/CanonicalCategoryRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/CanonicalCategoryRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.CanonicalCategory; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/CategoryMappingRepository.java b/src/main/java/group/goforward/battlbuilder/repo/CategoryMappingRepository.java similarity index 94% rename from src/main/java/group/goforward/battlbuilder/repos/CategoryMappingRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/CategoryMappingRepository.java index 4b1f281..0f6a198 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/CategoryMappingRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/CategoryMappingRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.CategoryMapping; import group.goforward.battlbuilder.model.Merchant; diff --git a/src/main/java/group/goforward/battlbuilder/repos/EmailRequestRepository.java b/src/main/java/group/goforward/battlbuilder/repo/EmailRequestRepository.java similarity index 91% rename from src/main/java/group/goforward/battlbuilder/repos/EmailRequestRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/EmailRequestRepository.java index 6dbe9ec..6242a79 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/EmailRequestRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/EmailRequestRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.EmailRequest; import group.goforward.battlbuilder.model.EmailStatus; diff --git a/src/main/java/group/goforward/battlbuilder/repos/EmailTemplateRepository.java b/src/main/java/group/goforward/battlbuilder/repo/EmailTemplateRepository.java similarity index 89% rename from src/main/java/group/goforward/battlbuilder/repos/EmailTemplateRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/EmailTemplateRepository.java index f3d62ca..4e41fb5 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/EmailTemplateRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/EmailTemplateRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.EmailTemplate; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/FeedImportRepository.java b/src/main/java/group/goforward/battlbuilder/repo/FeedImportRepository.java similarity index 79% rename from src/main/java/group/goforward/battlbuilder/repos/FeedImportRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/FeedImportRepository.java index 5b8769c..354a006 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/FeedImportRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/FeedImportRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.FeedImport; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/ImageBlobRepository.java b/src/main/java/group/goforward/battlbuilder/repo/ImageBlobRepository.java similarity index 79% rename from src/main/java/group/goforward/battlbuilder/repos/ImageBlobRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/ImageBlobRepository.java index 8867a79..23c260b 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/ImageBlobRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/ImageBlobRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.ImageBlob; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/ImageMetaRepository.java b/src/main/java/group/goforward/battlbuilder/repo/ImageMetaRepository.java similarity index 79% rename from src/main/java/group/goforward/battlbuilder/repos/ImageMetaRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/ImageMetaRepository.java index 0d400f8..c8773bc 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/ImageMetaRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/ImageMetaRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.ImageMeta; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/MerchantCategoryMapRepository.java b/src/main/java/group/goforward/battlbuilder/repo/MerchantCategoryMapRepository.java similarity index 98% rename from src/main/java/group/goforward/battlbuilder/repos/MerchantCategoryMapRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/MerchantCategoryMapRepository.java index 734ee54..9523dcd 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/MerchantCategoryMapRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/MerchantCategoryMapRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.MerchantCategoryMap; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/MerchantRepository.java b/src/main/java/group/goforward/battlbuilder/repo/MerchantRepository.java similarity index 83% rename from src/main/java/group/goforward/battlbuilder/repos/MerchantRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/MerchantRepository.java index 49cb4aa..da5280d 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/MerchantRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/MerchantRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.Merchant; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/PartCategoryRepository.java b/src/main/java/group/goforward/battlbuilder/repo/PartCategoryRepository.java similarity index 89% rename from src/main/java/group/goforward/battlbuilder/repos/PartCategoryRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/PartCategoryRepository.java index 20d32c2..27043c7 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/PartCategoryRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/PartCategoryRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.PartCategory; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/PartRoleMappingRepository.java b/src/main/java/group/goforward/battlbuilder/repo/PartRoleMappingRepository.java similarity index 95% rename from src/main/java/group/goforward/battlbuilder/repos/PartRoleMappingRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/PartRoleMappingRepository.java index 8bced23..6a17f17 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/PartRoleMappingRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/PartRoleMappingRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.PartRoleMapping; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/PartRoleRuleRepository.java b/src/main/java/group/goforward/battlbuilder/repo/PartRoleRuleRepository.java similarity index 87% rename from src/main/java/group/goforward/battlbuilder/repos/PartRoleRuleRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/PartRoleRuleRepository.java index f14a8ef..a42e87d 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/PartRoleRuleRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/PartRoleRuleRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.PartRoleRule; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/PlatformRepository.java b/src/main/java/group/goforward/battlbuilder/repo/PlatformRepository.java similarity index 85% rename from src/main/java/group/goforward/battlbuilder/repos/PlatformRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/PlatformRepository.java index 55a70bd..f41e768 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/PlatformRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/PlatformRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.Platform; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/PlatformRuleRepository.java b/src/main/java/group/goforward/battlbuilder/repo/PlatformRuleRepository.java similarity index 90% rename from src/main/java/group/goforward/battlbuilder/repos/PlatformRuleRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/PlatformRuleRepository.java index 78d1538..77edb15 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/PlatformRuleRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/PlatformRuleRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.PlatformRule; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/PriceHistoryRepository.java b/src/main/java/group/goforward/battlbuilder/repo/PriceHistoryRepository.java similarity index 80% rename from src/main/java/group/goforward/battlbuilder/repos/PriceHistoryRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/PriceHistoryRepository.java index 7e32dd3..b61bf82 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/PriceHistoryRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/PriceHistoryRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.PriceHistory; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/ProductOfferRepository.java b/src/main/java/group/goforward/battlbuilder/repo/ProductOfferRepository.java similarity index 95% rename from src/main/java/group/goforward/battlbuilder/repos/ProductOfferRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/ProductOfferRepository.java index 5049100..4bb51e8 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/ProductOfferRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/ProductOfferRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.ProductOffer; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java b/src/main/java/group/goforward/battlbuilder/repo/ProductRepository.java similarity index 99% rename from src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/ProductRepository.java index 5da6193..fadf572 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/ProductRepository.java @@ -1,10 +1,10 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.ImportStatus; import group.goforward.battlbuilder.model.Brand; import group.goforward.battlbuilder.model.Product; -import group.goforward.battlbuilder.repos.projections.CatalogRow; +import group.goforward.battlbuilder.repo.projections.CatalogRow; import group.goforward.battlbuilder.web.dto.catalog.CatalogOptionRow; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; diff --git a/src/main/java/group/goforward/battlbuilder/repos/StateRepository.java b/src/main/java/group/goforward/battlbuilder/repo/StateRepository.java similarity index 83% rename from src/main/java/group/goforward/battlbuilder/repos/StateRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/StateRepository.java index 3cc98c9..5f5b16e 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/StateRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/StateRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.State; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/UserRepository.java b/src/main/java/group/goforward/battlbuilder/repo/UserRepository.java similarity index 97% rename from src/main/java/group/goforward/battlbuilder/repos/UserRepository.java rename to src/main/java/group/goforward/battlbuilder/repo/UserRepository.java index 6547f4b..afb1402 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/UserRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repo/UserRepository.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; import group.goforward.battlbuilder.model.User; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/battlbuilder/repos/catalog/spec/CatalogProductSpecifications.java b/src/main/java/group/goforward/battlbuilder/repo/catalog/spec/CatalogProductSpecifications.java similarity index 97% rename from src/main/java/group/goforward/battlbuilder/repos/catalog/spec/CatalogProductSpecifications.java rename to src/main/java/group/goforward/battlbuilder/repo/catalog/spec/CatalogProductSpecifications.java index 63c4f8f..eba79f3 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/catalog/spec/CatalogProductSpecifications.java +++ b/src/main/java/group/goforward/battlbuilder/repo/catalog/spec/CatalogProductSpecifications.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos.catalog.spec; +package group.goforward.battlbuilder.repo.catalog.spec; import group.goforward.battlbuilder.model.Product; import group.goforward.battlbuilder.model.ProductStatus; diff --git a/src/main/java/group/goforward/battlbuilder/repos/package-info.java b/src/main/java/group/goforward/battlbuilder/repo/package-info.java similarity index 84% rename from src/main/java/group/goforward/battlbuilder/repos/package-info.java rename to src/main/java/group/goforward/battlbuilder/repo/package-info.java index c885a04..bb3e8b5 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/repo/package-info.java @@ -8,4 +8,4 @@ * @version 1.0 * @since 2025-12-10 */ -package group.goforward.battlbuilder.repos; +package group.goforward.battlbuilder.repo; diff --git a/src/main/java/group/goforward/battlbuilder/repos/projections/CatalogRow.java b/src/main/java/group/goforward/battlbuilder/repo/projections/CatalogRow.java similarity index 83% rename from src/main/java/group/goforward/battlbuilder/repos/projections/CatalogRow.java rename to src/main/java/group/goforward/battlbuilder/repo/projections/CatalogRow.java index 0d91493..45bc5bf 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/projections/CatalogRow.java +++ b/src/main/java/group/goforward/battlbuilder/repo/projections/CatalogRow.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.repos.projections; +package group.goforward.battlbuilder.repo.projections; public interface CatalogRow { Long getId(); diff --git a/src/main/java/group/goforward/battlbuilder/security/CustomUserDetailsService.java b/src/main/java/group/goforward/battlbuilder/security/CustomUserDetailsService.java index f22cf41..ddfff7a 100644 --- a/src/main/java/group/goforward/battlbuilder/security/CustomUserDetailsService.java +++ b/src/main/java/group/goforward/battlbuilder/security/CustomUserDetailsService.java @@ -1,7 +1,7 @@ package group.goforward.battlbuilder.security; import group.goforward.battlbuilder.model.User; -import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.repo.UserRepository; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.security.core.userdetails.UserDetailsService; import org.springframework.security.core.userdetails.UsernameNotFoundException; diff --git a/src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationFilter.java b/src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationFilter.java index 24c5ca6..103c23a 100644 --- a/src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationFilter.java +++ b/src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationFilter.java @@ -1,7 +1,7 @@ package group.goforward.battlbuilder.security; import group.goforward.battlbuilder.model.User; -import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.repo.UserRepository; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/group/goforward/battlbuilder/services/BrandService.java b/src/main/java/group/goforward/battlbuilder/service/BrandService.java similarity index 85% rename from src/main/java/group/goforward/battlbuilder/services/BrandService.java rename to src/main/java/group/goforward/battlbuilder/service/BrandService.java index dd99689..66681b1 100644 --- a/src/main/java/group/goforward/battlbuilder/services/BrandService.java +++ b/src/main/java/group/goforward/battlbuilder/service/BrandService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; import group.goforward.battlbuilder.model.Brand; diff --git a/src/main/java/group/goforward/battlbuilder/services/BuildService.java b/src/main/java/group/goforward/battlbuilder/service/BuildService.java similarity index 93% rename from src/main/java/group/goforward/battlbuilder/services/BuildService.java rename to src/main/java/group/goforward/battlbuilder/service/BuildService.java index 30c14ec..b1e663c 100644 --- a/src/main/java/group/goforward/battlbuilder/services/BuildService.java +++ b/src/main/java/group/goforward/battlbuilder/service/BuildService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; import group.goforward.battlbuilder.web.dto.BuildDto; import group.goforward.battlbuilder.web.dto.BuildFeedCardDto; diff --git a/src/main/java/group/goforward/battlbuilder/services/BuildsService.java b/src/main/java/group/goforward/battlbuilder/service/BuildsService.java similarity index 79% rename from src/main/java/group/goforward/battlbuilder/services/BuildsService.java rename to src/main/java/group/goforward/battlbuilder/service/BuildsService.java index 47e9b2d..d623f83 100644 --- a/src/main/java/group/goforward/battlbuilder/services/BuildsService.java +++ b/src/main/java/group/goforward/battlbuilder/service/BuildsService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; import aj.org.objectweb.asm.commons.Remapper; import group.goforward.battlbuilder.model.Brand; diff --git a/src/main/java/group/goforward/battlbuilder/services/CatalogQueryService.java b/src/main/java/group/goforward/battlbuilder/service/CatalogQueryService.java similarity index 92% rename from src/main/java/group/goforward/battlbuilder/services/CatalogQueryService.java rename to src/main/java/group/goforward/battlbuilder/service/CatalogQueryService.java index c405278..6a768b0 100644 --- a/src/main/java/group/goforward/battlbuilder/services/CatalogQueryService.java +++ b/src/main/java/group/goforward/battlbuilder/service/CatalogQueryService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; import group.goforward.battlbuilder.web.dto.ProductSummaryDto; import group.goforward.battlbuilder.web.dto.catalog.CatalogProductIdsRequest; diff --git a/src/main/java/group/goforward/battlbuilder/services/CategoryClassificationService.java b/src/main/java/group/goforward/battlbuilder/service/CategoryClassificationService.java similarity index 94% rename from src/main/java/group/goforward/battlbuilder/services/CategoryClassificationService.java rename to src/main/java/group/goforward/battlbuilder/service/CategoryClassificationService.java index a6fc9eb..36d2f72 100644 --- a/src/main/java/group/goforward/battlbuilder/services/CategoryClassificationService.java +++ b/src/main/java/group/goforward/battlbuilder/service/CategoryClassificationService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; import group.goforward.battlbuilder.imports.MerchantFeedRow; import group.goforward.battlbuilder.model.Merchant; diff --git a/src/main/java/group/goforward/battlbuilder/services/CategoryMappingRecommendationService.java b/src/main/java/group/goforward/battlbuilder/service/CategoryMappingRecommendationService.java similarity index 93% rename from src/main/java/group/goforward/battlbuilder/services/CategoryMappingRecommendationService.java rename to src/main/java/group/goforward/battlbuilder/service/CategoryMappingRecommendationService.java index 9e4ac94..9a0871f 100644 --- a/src/main/java/group/goforward/battlbuilder/services/CategoryMappingRecommendationService.java +++ b/src/main/java/group/goforward/battlbuilder/service/CategoryMappingRecommendationService.java @@ -1,8 +1,8 @@ -// src/main/java/group/goforward/ballistic/services/CategoryMappingRecommendationService.java -package group.goforward.battlbuilder.services; +// src/main/java/group/goforward/ballistic/service/CategoryMappingRecommendationService.java +package group.goforward.battlbuilder.service; import group.goforward.battlbuilder.model.Product; -import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.repo.ProductRepository; import group.goforward.battlbuilder.web.dto.CategoryMappingRecommendationDto; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/battlbuilder/services/CurrentUserService.java b/src/main/java/group/goforward/battlbuilder/service/CurrentUserService.java similarity index 94% rename from src/main/java/group/goforward/battlbuilder/services/CurrentUserService.java rename to src/main/java/group/goforward/battlbuilder/service/CurrentUserService.java index d22d54b..1d5d342 100644 --- a/src/main/java/group/goforward/battlbuilder/services/CurrentUserService.java +++ b/src/main/java/group/goforward/battlbuilder/service/CurrentUserService.java @@ -1,7 +1,7 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; import group.goforward.battlbuilder.model.User; -import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.repo.UserRepository; import org.springframework.http.HttpStatus; import org.springframework.security.authentication.AnonymousAuthenticationToken; import org.springframework.security.core.Authentication; diff --git a/src/main/java/group/goforward/battlbuilder/services/ImportStatusAdminService.java b/src/main/java/group/goforward/battlbuilder/service/ImportStatusAdminService.java similarity index 87% rename from src/main/java/group/goforward/battlbuilder/services/ImportStatusAdminService.java rename to src/main/java/group/goforward/battlbuilder/service/ImportStatusAdminService.java index 7eb229d..01090e2 100644 --- a/src/main/java/group/goforward/battlbuilder/services/ImportStatusAdminService.java +++ b/src/main/java/group/goforward/battlbuilder/service/ImportStatusAdminService.java @@ -1,8 +1,8 @@ -// src/main/java/group/goforward/ballistic/services/ImportStatusAdminService.java -package group.goforward.battlbuilder.services; +// src/main/java/group/goforward/ballistic/service/ImportStatusAdminService.java +package group.goforward.battlbuilder.service; import group.goforward.battlbuilder.model.ImportStatus; -import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.repo.ProductRepository; import group.goforward.battlbuilder.web.dto.ImportStatusByMerchantDto; import group.goforward.battlbuilder.web.dto.ImportStatusSummaryDto; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/battlbuilder/services/MappingAdminService.java b/src/main/java/group/goforward/battlbuilder/service/MappingAdminService.java similarity index 96% rename from src/main/java/group/goforward/battlbuilder/services/MappingAdminService.java rename to src/main/java/group/goforward/battlbuilder/service/MappingAdminService.java index f0fc5fc..dae7c57 100644 --- a/src/main/java/group/goforward/battlbuilder/services/MappingAdminService.java +++ b/src/main/java/group/goforward/battlbuilder/service/MappingAdminService.java @@ -1,13 +1,13 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; import group.goforward.battlbuilder.model.ImportStatus; import group.goforward.battlbuilder.model.Merchant; import group.goforward.battlbuilder.model.MerchantCategoryMap; import group.goforward.battlbuilder.model.CanonicalCategory; -import group.goforward.battlbuilder.repos.CanonicalCategoryRepository; -import group.goforward.battlbuilder.repos.MerchantCategoryMapRepository; -import group.goforward.battlbuilder.repos.MerchantRepository; -import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.repo.CanonicalCategoryRepository; +import group.goforward.battlbuilder.repo.MerchantCategoryMapRepository; +import group.goforward.battlbuilder.repo.MerchantRepository; +import group.goforward.battlbuilder.repo.ProductRepository; import group.goforward.battlbuilder.web.dto.MappingOptionsDto; import group.goforward.battlbuilder.web.dto.PendingMappingBucketDto; import group.goforward.battlbuilder.web.dto.RawCategoryMappingRowDto; diff --git a/src/main/java/group/goforward/battlbuilder/services/MerchantFeedImportService.java b/src/main/java/group/goforward/battlbuilder/service/MerchantFeedImportService.java similarity index 86% rename from src/main/java/group/goforward/battlbuilder/services/MerchantFeedImportService.java rename to src/main/java/group/goforward/battlbuilder/service/MerchantFeedImportService.java index ac5d93c..40d72fe 100644 --- a/src/main/java/group/goforward/battlbuilder/services/MerchantFeedImportService.java +++ b/src/main/java/group/goforward/battlbuilder/service/MerchantFeedImportService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; public interface MerchantFeedImportService { diff --git a/src/main/java/group/goforward/battlbuilder/services/PartCategoryResolverService.java b/src/main/java/group/goforward/battlbuilder/service/PartCategoryResolverService.java similarity index 90% rename from src/main/java/group/goforward/battlbuilder/services/PartCategoryResolverService.java rename to src/main/java/group/goforward/battlbuilder/service/PartCategoryResolverService.java index 58c0155..d63ae04 100644 --- a/src/main/java/group/goforward/battlbuilder/services/PartCategoryResolverService.java +++ b/src/main/java/group/goforward/battlbuilder/service/PartCategoryResolverService.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; import group.goforward.battlbuilder.model.PartCategory; import group.goforward.battlbuilder.model.PartRoleMapping; -import group.goforward.battlbuilder.repos.PartRoleMappingRepository; +import group.goforward.battlbuilder.repo.PartRoleMappingRepository; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/group/goforward/battlbuilder/services/PartRoleMappingService.java b/src/main/java/group/goforward/battlbuilder/service/PartRoleMappingService.java similarity index 90% rename from src/main/java/group/goforward/battlbuilder/services/PartRoleMappingService.java rename to src/main/java/group/goforward/battlbuilder/service/PartRoleMappingService.java index 5e0b52b..b7a0575 100644 --- a/src/main/java/group/goforward/battlbuilder/services/PartRoleMappingService.java +++ b/src/main/java/group/goforward/battlbuilder/service/PartRoleMappingService.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; -import group.goforward.battlbuilder.repos.PartRoleMappingRepository; +import group.goforward.battlbuilder.repo.PartRoleMappingRepository; import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto; import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto; import group.goforward.battlbuilder.web.mapper.PartRoleMappingMapper; diff --git a/src/main/java/group/goforward/battlbuilder/services/ProductQueryService.java b/src/main/java/group/goforward/battlbuilder/service/ProductQueryService.java similarity index 92% rename from src/main/java/group/goforward/battlbuilder/services/ProductQueryService.java rename to src/main/java/group/goforward/battlbuilder/service/ProductQueryService.java index 0ca20d1..7f1d859 100644 --- a/src/main/java/group/goforward/battlbuilder/services/ProductQueryService.java +++ b/src/main/java/group/goforward/battlbuilder/service/ProductQueryService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; import group.goforward.battlbuilder.web.dto.ProductOfferDto; import group.goforward.battlbuilder.web.dto.ProductSummaryDto; diff --git a/src/main/java/group/goforward/battlbuilder/services/ReclassificationService.java b/src/main/java/group/goforward/battlbuilder/service/ReclassificationService.java similarity index 89% rename from src/main/java/group/goforward/battlbuilder/services/ReclassificationService.java rename to src/main/java/group/goforward/battlbuilder/service/ReclassificationService.java index aab6a2a..44c18b9 100644 --- a/src/main/java/group/goforward/battlbuilder/services/ReclassificationService.java +++ b/src/main/java/group/goforward/battlbuilder/service/ReclassificationService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; public interface ReclassificationService { int reclassifyPendingForMerchant(Integer merchantId); diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/AdminProductService.java b/src/main/java/group/goforward/battlbuilder/service/admin/AdminProductService.java similarity index 91% rename from src/main/java/group/goforward/battlbuilder/services/admin/AdminProductService.java rename to src/main/java/group/goforward/battlbuilder/service/admin/AdminProductService.java index 9cbf4c7..e26baaf 100644 --- a/src/main/java/group/goforward/battlbuilder/services/admin/AdminProductService.java +++ b/src/main/java/group/goforward/battlbuilder/service/admin/AdminProductService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services.admin; +package group.goforward.battlbuilder.service.admin; import group.goforward.battlbuilder.web.dto.admin.AdminProductSearchRequest; import group.goforward.battlbuilder.web.dto.admin.ProductAdminRowDto; diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/AdminUserService.java b/src/main/java/group/goforward/battlbuilder/service/admin/AdminUserService.java similarity index 94% rename from src/main/java/group/goforward/battlbuilder/services/admin/AdminUserService.java rename to src/main/java/group/goforward/battlbuilder/service/admin/AdminUserService.java index f330866..69981c3 100644 --- a/src/main/java/group/goforward/battlbuilder/services/admin/AdminUserService.java +++ b/src/main/java/group/goforward/battlbuilder/service/admin/AdminUserService.java @@ -1,7 +1,7 @@ -package group.goforward.battlbuilder.services.admin; +package group.goforward.battlbuilder.service.admin; import group.goforward.battlbuilder.model.User; -import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.repo.UserRepository; import group.goforward.battlbuilder.web.dto.admin.AdminUserDto; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/StatesService.java b/src/main/java/group/goforward/battlbuilder/service/admin/StatesService.java similarity index 83% rename from src/main/java/group/goforward/battlbuilder/services/admin/StatesService.java rename to src/main/java/group/goforward/battlbuilder/service/admin/StatesService.java index f13941c..f22a5b2 100644 --- a/src/main/java/group/goforward/battlbuilder/services/admin/StatesService.java +++ b/src/main/java/group/goforward/battlbuilder/service/admin/StatesService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services.admin; +package group.goforward.battlbuilder.service.admin; import group.goforward.battlbuilder.model.State; diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/UsersService.java b/src/main/java/group/goforward/battlbuilder/service/admin/UsersService.java similarity index 83% rename from src/main/java/group/goforward/battlbuilder/services/admin/UsersService.java rename to src/main/java/group/goforward/battlbuilder/service/admin/UsersService.java index 27fd092..936affa 100644 --- a/src/main/java/group/goforward/battlbuilder/services/admin/UsersService.java +++ b/src/main/java/group/goforward/battlbuilder/service/admin/UsersService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services.admin; +package group.goforward.battlbuilder.service.admin; import group.goforward.battlbuilder.model.User; diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/admin_services_package_info.java b/src/main/java/group/goforward/battlbuilder/service/admin/admin_services_package_info.java similarity index 59% rename from src/main/java/group/goforward/battlbuilder/services/admin/admin_services_package_info.java rename to src/main/java/group/goforward/battlbuilder/service/admin/admin_services_package_info.java index 69c9271..ac2e07d 100644 --- a/src/main/java/group/goforward/battlbuilder/services/admin/admin_services_package_info.java +++ b/src/main/java/group/goforward/battlbuilder/service/admin/admin_services_package_info.java @@ -1,5 +1,5 @@ /** - * Admin services package for the BattlBuilder application. + * Admin service package for the BattlBuilder application. *

* Contains service classes for administrative business logic * and operations. @@ -8,4 +8,4 @@ * @version 1.0 * @since 2025-12-10 */ -package group.goforward.battlbuilder.services.admin; +package group.goforward.battlbuilder.service.admin; diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/impl/AdminDashboardService.java b/src/main/java/group/goforward/battlbuilder/service/admin/impl/AdminDashboardService.java similarity index 85% rename from src/main/java/group/goforward/battlbuilder/services/admin/impl/AdminDashboardService.java rename to src/main/java/group/goforward/battlbuilder/service/admin/impl/AdminDashboardService.java index 7cf2632..6b97dab 100644 --- a/src/main/java/group/goforward/battlbuilder/services/admin/impl/AdminDashboardService.java +++ b/src/main/java/group/goforward/battlbuilder/service/admin/impl/AdminDashboardService.java @@ -1,9 +1,9 @@ -package group.goforward.battlbuilder.services.admin.impl; +package group.goforward.battlbuilder.service.admin.impl; import group.goforward.battlbuilder.model.ImportStatus; -import group.goforward.battlbuilder.repos.MerchantCategoryMapRepository; -import group.goforward.battlbuilder.repos.MerchantRepository; -import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.repo.MerchantCategoryMapRepository; +import group.goforward.battlbuilder.repo.MerchantRepository; +import group.goforward.battlbuilder.repo.ProductRepository; import group.goforward.battlbuilder.web.dto.admin.AdminDashboardOverviewDto; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/impl/AdminProductServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/admin/impl/AdminProductServiceImpl.java similarity index 91% rename from src/main/java/group/goforward/battlbuilder/services/admin/impl/AdminProductServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/admin/impl/AdminProductServiceImpl.java index 1f242aa..a34997e 100644 --- a/src/main/java/group/goforward/battlbuilder/services/admin/impl/AdminProductServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/admin/impl/AdminProductServiceImpl.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.services.admin.impl; +package group.goforward.battlbuilder.service.admin.impl; import group.goforward.battlbuilder.model.Product; -import group.goforward.battlbuilder.repos.ProductRepository; -import group.goforward.battlbuilder.services.admin.AdminProductService; +import group.goforward.battlbuilder.repo.ProductRepository; +import group.goforward.battlbuilder.service.admin.AdminProductService; import group.goforward.battlbuilder.specs.ProductSpecifications; import group.goforward.battlbuilder.web.dto.admin.AdminProductSearchRequest; import group.goforward.battlbuilder.web.dto.admin.ProductAdminRowDto; diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/impl/StatesServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/admin/impl/StatesServiceImpl.java similarity index 78% rename from src/main/java/group/goforward/battlbuilder/services/admin/impl/StatesServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/admin/impl/StatesServiceImpl.java index 7b826a1..f8f2173 100644 --- a/src/main/java/group/goforward/battlbuilder/services/admin/impl/StatesServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/admin/impl/StatesServiceImpl.java @@ -1,9 +1,9 @@ -package group.goforward.battlbuilder.services.admin.impl; +package group.goforward.battlbuilder.service.admin.impl; import group.goforward.battlbuilder.model.State; -import group.goforward.battlbuilder.repos.StateRepository; -import group.goforward.battlbuilder.services.admin.StatesService; +import group.goforward.battlbuilder.repo.StateRepository; +import group.goforward.battlbuilder.service.admin.StatesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/impl/UsersServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/admin/impl/UsersServiceImpl.java similarity index 78% rename from src/main/java/group/goforward/battlbuilder/services/admin/impl/UsersServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/admin/impl/UsersServiceImpl.java index ec29803..36c6a0f 100644 --- a/src/main/java/group/goforward/battlbuilder/services/admin/impl/UsersServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/admin/impl/UsersServiceImpl.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.services.admin.impl; +package group.goforward.battlbuilder.service.admin.impl; import group.goforward.battlbuilder.model.User; -import group.goforward.battlbuilder.repos.UserRepository; -import group.goforward.battlbuilder.services.admin.UsersService; +import group.goforward.battlbuilder.repo.UserRepository; +import group.goforward.battlbuilder.service.admin.UsersService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/package-info.java b/src/main/java/group/goforward/battlbuilder/service/admin/package-info.java similarity index 88% rename from src/main/java/group/goforward/battlbuilder/services/admin/package-info.java rename to src/main/java/group/goforward/battlbuilder/service/admin/package-info.java index 5c5f61e..40dd0c3 100644 --- a/src/main/java/group/goforward/battlbuilder/services/admin/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/service/admin/package-info.java @@ -10,4 +10,4 @@ * @author Don Strawsburg * @version 1.1 */ -package group.goforward.battlbuilder.services.admin; \ No newline at end of file +package group.goforward.battlbuilder.service.admin; \ No newline at end of file diff --git a/src/main/java/group/goforward/battlbuilder/services/auth/BetaAuthService.java b/src/main/java/group/goforward/battlbuilder/service/auth/BetaAuthService.java similarity index 94% rename from src/main/java/group/goforward/battlbuilder/services/auth/BetaAuthService.java rename to src/main/java/group/goforward/battlbuilder/service/auth/BetaAuthService.java index 8e71f8a..7bc85cc 100644 --- a/src/main/java/group/goforward/battlbuilder/services/auth/BetaAuthService.java +++ b/src/main/java/group/goforward/battlbuilder/service/auth/BetaAuthService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services.auth; +package group.goforward.battlbuilder.service.auth; import group.goforward.battlbuilder.web.dto.auth.AuthResponse; diff --git a/src/main/java/group/goforward/battlbuilder/services/auth/impl/BetaAuthServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/auth/impl/BetaAuthServiceImpl.java similarity index 97% rename from src/main/java/group/goforward/battlbuilder/services/auth/impl/BetaAuthServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/auth/impl/BetaAuthServiceImpl.java index b005e71..ccd8a29 100644 --- a/src/main/java/group/goforward/battlbuilder/services/auth/impl/BetaAuthServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/auth/impl/BetaAuthServiceImpl.java @@ -1,12 +1,12 @@ -package group.goforward.battlbuilder.services.auth.impl; +package group.goforward.battlbuilder.service.auth.impl; import group.goforward.battlbuilder.model.AuthToken; import group.goforward.battlbuilder.model.User; -import group.goforward.battlbuilder.repos.AuthTokenRepository; -import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.repo.AuthTokenRepository; +import group.goforward.battlbuilder.repo.UserRepository; import group.goforward.battlbuilder.security.JwtService; -import group.goforward.battlbuilder.services.auth.BetaAuthService; -import group.goforward.battlbuilder.services.utils.EmailService; +import group.goforward.battlbuilder.service.auth.BetaAuthService; +import group.goforward.battlbuilder.service.utils.EmailService; import group.goforward.battlbuilder.web.dto.auth.AuthResponse; import org.springframework.beans.factory.annotation.Value; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/group/goforward/battlbuilder/services/auth/impl/BetaInviteService.java b/src/main/java/group/goforward/battlbuilder/service/auth/impl/BetaInviteService.java similarity index 96% rename from src/main/java/group/goforward/battlbuilder/services/auth/impl/BetaInviteService.java rename to src/main/java/group/goforward/battlbuilder/service/auth/impl/BetaInviteService.java index 0ca9f0b..c91cbf0 100644 --- a/src/main/java/group/goforward/battlbuilder/services/auth/impl/BetaInviteService.java +++ b/src/main/java/group/goforward/battlbuilder/service/auth/impl/BetaInviteService.java @@ -1,10 +1,10 @@ -package group.goforward.battlbuilder.services.auth.impl; +package group.goforward.battlbuilder.service.auth.impl; import group.goforward.battlbuilder.model.AuthToken; import group.goforward.battlbuilder.model.User; -import group.goforward.battlbuilder.repos.AuthTokenRepository; -import group.goforward.battlbuilder.repos.UserRepository; -import group.goforward.battlbuilder.services.utils.TemplatedEmailService; +import group.goforward.battlbuilder.repo.AuthTokenRepository; +import group.goforward.battlbuilder.repo.UserRepository; +import group.goforward.battlbuilder.service.utils.TemplatedEmailService; import group.goforward.battlbuilder.web.dto.admin.AdminBetaRequestDto; import group.goforward.battlbuilder.web.dto.admin.AdminInviteResponse; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/BrandServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/impl/BrandServiceImpl.java similarity index 80% rename from src/main/java/group/goforward/battlbuilder/services/impl/BrandServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/impl/BrandServiceImpl.java index a67fe8a..cc69b30 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/BrandServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/impl/BrandServiceImpl.java @@ -1,9 +1,9 @@ -package group.goforward.battlbuilder.services.impl; +package group.goforward.battlbuilder.service.impl; import group.goforward.battlbuilder.model.Brand; -import group.goforward.battlbuilder.repos.BrandRepository; -import group.goforward.battlbuilder.services.BrandService; +import group.goforward.battlbuilder.repo.BrandRepository; +import group.goforward.battlbuilder.service.BrandService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/BuildServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/impl/BuildServiceImpl.java similarity index 96% rename from src/main/java/group/goforward/battlbuilder/services/impl/BuildServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/impl/BuildServiceImpl.java index 07e80ed..f3a98ca 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/BuildServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/impl/BuildServiceImpl.java @@ -1,29 +1,27 @@ -package group.goforward.battlbuilder.services.impl; +package group.goforward.battlbuilder.service.impl; import group.goforward.battlbuilder.model.Build; import group.goforward.battlbuilder.model.BuildItem; import group.goforward.battlbuilder.model.BuildProfile; import group.goforward.battlbuilder.model.ProductOffer; -import group.goforward.battlbuilder.repos.BuildItemRepository; -import group.goforward.battlbuilder.repos.BuildProfileRepository; -import group.goforward.battlbuilder.repos.BuildRepository; -import group.goforward.battlbuilder.repos.ProductOfferRepository; -import group.goforward.battlbuilder.services.CurrentUserService; -import group.goforward.battlbuilder.services.BuildService; +import group.goforward.battlbuilder.repo.BuildItemRepository; +import group.goforward.battlbuilder.repo.BuildProfileRepository; +import group.goforward.battlbuilder.repo.BuildRepository; +import group.goforward.battlbuilder.repo.ProductOfferRepository; +import group.goforward.battlbuilder.service.CurrentUserService; +import group.goforward.battlbuilder.service.BuildService; import group.goforward.battlbuilder.web.dto.BuildDto; import group.goforward.battlbuilder.web.dto.BuildFeedCardDto; import group.goforward.battlbuilder.web.dto.BuildItemDto; import group.goforward.battlbuilder.web.dto.BuildSummaryDto; import group.goforward.battlbuilder.web.dto.UpdateBuildRequest; -import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.repo.ProductRepository; import org.springframework.data.domain.PageRequest; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.http.HttpStatus; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import org.springframework.web.server.ResponseStatusException; import java.time.OffsetDateTime; diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/CatalogQueryServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/impl/CatalogQueryServiceImpl.java similarity index 96% rename from src/main/java/group/goforward/battlbuilder/services/impl/CatalogQueryServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/impl/CatalogQueryServiceImpl.java index 6b24e4d..4574053 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/CatalogQueryServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/impl/CatalogQueryServiceImpl.java @@ -1,11 +1,11 @@ -package group.goforward.battlbuilder.services.impl; +package group.goforward.battlbuilder.service.impl; import group.goforward.battlbuilder.model.Product; import group.goforward.battlbuilder.model.ProductOffer; -import group.goforward.battlbuilder.repos.ProductOfferRepository; -import group.goforward.battlbuilder.repos.ProductRepository; -import group.goforward.battlbuilder.repos.catalog.spec.CatalogProductSpecifications; -import group.goforward.battlbuilder.services.CatalogQueryService; +import group.goforward.battlbuilder.repo.ProductOfferRepository; +import group.goforward.battlbuilder.repo.ProductRepository; +import group.goforward.battlbuilder.repo.catalog.spec.CatalogProductSpecifications; +import group.goforward.battlbuilder.service.CatalogQueryService; import group.goforward.battlbuilder.web.dto.ProductSummaryDto; import group.goforward.battlbuilder.web.dto.catalog.CatalogProductIdsRequest; import group.goforward.battlbuilder.web.mapper.ProductMapper; diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/CategoryClassificationServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/impl/CategoryClassificationServiceImpl.java similarity index 97% rename from src/main/java/group/goforward/battlbuilder/services/impl/CategoryClassificationServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/impl/CategoryClassificationServiceImpl.java index 1a5fbaf..38beb3d 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/CategoryClassificationServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/impl/CategoryClassificationServiceImpl.java @@ -1,10 +1,10 @@ -package group.goforward.battlbuilder.services.impl; +package group.goforward.battlbuilder.service.impl; import group.goforward.battlbuilder.catalog.classification.PartRoleResolver; import group.goforward.battlbuilder.imports.MerchantFeedRow; import group.goforward.battlbuilder.model.Merchant; import group.goforward.battlbuilder.model.PartRoleSource; -import group.goforward.battlbuilder.services.CategoryClassificationService; +import group.goforward.battlbuilder.service.CategoryClassificationService; import org.springframework.stereotype.Service; import java.util.Locale; diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/ImageService.java b/src/main/java/group/goforward/battlbuilder/service/impl/ImageService.java similarity index 93% rename from src/main/java/group/goforward/battlbuilder/services/impl/ImageService.java rename to src/main/java/group/goforward/battlbuilder/service/impl/ImageService.java index 3f81a16..21986e3 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/ImageService.java +++ b/src/main/java/group/goforward/battlbuilder/service/impl/ImageService.java @@ -1,9 +1,9 @@ -package group.goforward.battlbuilder.services.impl; +package group.goforward.battlbuilder.service.impl; import group.goforward.battlbuilder.model.ImageBlob; import group.goforward.battlbuilder.model.ImageMeta; -import group.goforward.battlbuilder.repos.ImageBlobRepository; -import group.goforward.battlbuilder.repos.ImageMetaRepository; +import group.goforward.battlbuilder.repo.ImageBlobRepository; +import group.goforward.battlbuilder.repo.ImageMetaRepository; import group.goforward.battlbuilder.security.UserPrincipal; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/MerchantCategoryMappingService.java b/src/main/java/group/goforward/battlbuilder/service/impl/MerchantCategoryMappingService.java similarity index 89% rename from src/main/java/group/goforward/battlbuilder/services/impl/MerchantCategoryMappingService.java rename to src/main/java/group/goforward/battlbuilder/service/impl/MerchantCategoryMappingService.java index 3e2ad19..4ba5679 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/MerchantCategoryMappingService.java +++ b/src/main/java/group/goforward/battlbuilder/service/impl/MerchantCategoryMappingService.java @@ -1,6 +1,6 @@ -package group.goforward.battlbuilder.services.impl; +package group.goforward.battlbuilder.service.impl; -import group.goforward.battlbuilder.repos.MerchantCategoryMapRepository; +import group.goforward.battlbuilder.repo.MerchantCategoryMapRepository; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/impl/MerchantFeedImportServiceImpl.java similarity index 98% rename from src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/impl/MerchantFeedImportServiceImpl.java index 8cfa159..a54f0dd 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/impl/MerchantFeedImportServiceImpl.java @@ -4,7 +4,7 @@ * - PartRoleResolver rules * - ImportStatus.PENDING_MAPPING for anything unresolved */ -package group.goforward.battlbuilder.services.impl; +package group.goforward.battlbuilder.service.impl; import group.goforward.battlbuilder.imports.MerchantFeedRow; import group.goforward.battlbuilder.model.Brand; @@ -12,13 +12,13 @@ import group.goforward.battlbuilder.model.ImportStatus; import group.goforward.battlbuilder.model.Merchant; import group.goforward.battlbuilder.model.Product; import group.goforward.battlbuilder.model.ProductOffer; -import group.goforward.battlbuilder.repos.BrandRepository; -import group.goforward.battlbuilder.repos.MerchantRepository; -import group.goforward.battlbuilder.repos.ProductOfferRepository; -import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.repo.BrandRepository; +import group.goforward.battlbuilder.repo.MerchantRepository; +import group.goforward.battlbuilder.repo.ProductOfferRepository; +import group.goforward.battlbuilder.repo.ProductRepository; import group.goforward.battlbuilder.catalog.classification.PlatformResolver; -import group.goforward.battlbuilder.services.MerchantFeedImportService; -import group.goforward.battlbuilder.services.CategoryClassificationService; +import group.goforward.battlbuilder.service.MerchantFeedImportService; +import group.goforward.battlbuilder.service.CategoryClassificationService; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cache.annotation.CacheEvict; import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; import java.io.InputStreamReader; import java.io.Reader; diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/ProductQueryServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/impl/ProductQueryServiceImpl.java similarity index 95% rename from src/main/java/group/goforward/battlbuilder/services/impl/ProductQueryServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/impl/ProductQueryServiceImpl.java index 49f75ca..59f18d6 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/ProductQueryServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/impl/ProductQueryServiceImpl.java @@ -1,10 +1,10 @@ -package group.goforward.battlbuilder.services.impl; +package group.goforward.battlbuilder.service.impl; import group.goforward.battlbuilder.model.Product; import group.goforward.battlbuilder.model.ProductOffer; -import group.goforward.battlbuilder.repos.ProductOfferRepository; -import group.goforward.battlbuilder.repos.ProductRepository; -import group.goforward.battlbuilder.services.ProductQueryService; +import group.goforward.battlbuilder.repo.ProductOfferRepository; +import group.goforward.battlbuilder.repo.ProductRepository; +import group.goforward.battlbuilder.service.ProductQueryService; import group.goforward.battlbuilder.web.dto.ProductOfferDto; import group.goforward.battlbuilder.web.dto.ProductSummaryDto; import group.goforward.battlbuilder.web.mapper.ProductMapper; @@ -17,11 +17,9 @@ import org.springframework.data.domain.Page; import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.Pageable; -import java.util.stream.Collectors; import java.util.Collections; import java.util.Map; import java.util.List; -import java.util.ArrayList; @Service public class ProductQueryServiceImpl implements ProductQueryService { diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/ReclassificationServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/impl/ReclassificationServiceImpl.java similarity index 97% rename from src/main/java/group/goforward/battlbuilder/services/impl/ReclassificationServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/impl/ReclassificationServiceImpl.java index 3d937fe..d389efb 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/ReclassificationServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/impl/ReclassificationServiceImpl.java @@ -1,10 +1,10 @@ -package group.goforward.battlbuilder.services.impl; +package group.goforward.battlbuilder.service.impl; import group.goforward.battlbuilder.model.ImportStatus; import group.goforward.battlbuilder.model.PartRoleSource; import group.goforward.battlbuilder.model.Product; -import group.goforward.battlbuilder.repos.ProductRepository; -import group.goforward.battlbuilder.services.ReclassificationService; +import group.goforward.battlbuilder.repo.ProductRepository; +import group.goforward.battlbuilder.service.ReclassificationService; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/group/goforward/battlbuilder/services/impl/package-info.java b/src/main/java/group/goforward/battlbuilder/service/impl/package-info.java similarity index 78% rename from src/main/java/group/goforward/battlbuilder/services/impl/package-info.java rename to src/main/java/group/goforward/battlbuilder/service/impl/package-info.java index 9447347..a136c08 100644 --- a/src/main/java/group/goforward/battlbuilder/services/impl/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/service/impl/package-info.java @@ -7,4 +7,4 @@ * @version 1.0 * @since 2025-12-10 */ -package group.goforward.battlbuilder.services.impl; \ No newline at end of file +package group.goforward.battlbuilder.service.impl; \ No newline at end of file diff --git a/src/main/java/group/goforward/battlbuilder/services/package-info.java b/src/main/java/group/goforward/battlbuilder/service/package-info.java similarity index 85% rename from src/main/java/group/goforward/battlbuilder/services/package-info.java rename to src/main/java/group/goforward/battlbuilder/service/package-info.java index b10910c..c91c9ec 100644 --- a/src/main/java/group/goforward/battlbuilder/services/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/service/package-info.java @@ -9,4 +9,4 @@ * @version 1.0 * @since 2025-12-10 */ -package group.goforward.battlbuilder.services; +package group.goforward.battlbuilder.service; diff --git a/src/main/java/group/goforward/battlbuilder/services/utils/EmailService.java b/src/main/java/group/goforward/battlbuilder/service/utils/EmailService.java similarity index 90% rename from src/main/java/group/goforward/battlbuilder/services/utils/EmailService.java rename to src/main/java/group/goforward/battlbuilder/service/utils/EmailService.java index 4c6bb8a..1d587f3 100644 --- a/src/main/java/group/goforward/battlbuilder/services/utils/EmailService.java +++ b/src/main/java/group/goforward/battlbuilder/service/utils/EmailService.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services.utils; +package group.goforward.battlbuilder.service.utils; import group.goforward.battlbuilder.model.EmailRequest; diff --git a/src/main/java/group/goforward/battlbuilder/services/utils/ImageUrlToMinioMigrator.java b/src/main/java/group/goforward/battlbuilder/service/utils/ImageUrlToMinioMigrator.java similarity index 98% rename from src/main/java/group/goforward/battlbuilder/services/utils/ImageUrlToMinioMigrator.java rename to src/main/java/group/goforward/battlbuilder/service/utils/ImageUrlToMinioMigrator.java index b50b098..2dc1307 100644 --- a/src/main/java/group/goforward/battlbuilder/services/utils/ImageUrlToMinioMigrator.java +++ b/src/main/java/group/goforward/battlbuilder/service/utils/ImageUrlToMinioMigrator.java @@ -1,7 +1,7 @@ -package group.goforward.battlbuilder.services.utils; +package group.goforward.battlbuilder.service.utils; import group.goforward.battlbuilder.model.Product; -import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.repo.ProductRepository; import io.minio.BucketExistsArgs; import io.minio.MakeBucketArgs; import io.minio.MinioClient; diff --git a/src/main/java/group/goforward/battlbuilder/services/utils/MigrateProductImagesToMinioRunner.java b/src/main/java/group/goforward/battlbuilder/service/utils/MigrateProductImagesToMinioRunner.java similarity index 94% rename from src/main/java/group/goforward/battlbuilder/services/utils/MigrateProductImagesToMinioRunner.java rename to src/main/java/group/goforward/battlbuilder/service/utils/MigrateProductImagesToMinioRunner.java index 8779e4d..0e13645 100644 --- a/src/main/java/group/goforward/battlbuilder/services/utils/MigrateProductImagesToMinioRunner.java +++ b/src/main/java/group/goforward/battlbuilder/service/utils/MigrateProductImagesToMinioRunner.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services.utils; +package group.goforward.battlbuilder.service.utils; import org.springframework.boot.CommandLineRunner; import org.springframework.context.annotation.Profile; diff --git a/src/main/java/group/goforward/battlbuilder/services/utils/TemplateRenderer.java b/src/main/java/group/goforward/battlbuilder/service/utils/TemplateRenderer.java similarity index 87% rename from src/main/java/group/goforward/battlbuilder/services/utils/TemplateRenderer.java rename to src/main/java/group/goforward/battlbuilder/service/utils/TemplateRenderer.java index 3b63737..0732a56 100644 --- a/src/main/java/group/goforward/battlbuilder/services/utils/TemplateRenderer.java +++ b/src/main/java/group/goforward/battlbuilder/service/utils/TemplateRenderer.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.services.utils; +package group.goforward.battlbuilder.service.utils; import java.util.Map; diff --git a/src/main/java/group/goforward/battlbuilder/services/utils/TemplatedEmailService.java b/src/main/java/group/goforward/battlbuilder/service/utils/TemplatedEmailService.java similarity index 90% rename from src/main/java/group/goforward/battlbuilder/services/utils/TemplatedEmailService.java rename to src/main/java/group/goforward/battlbuilder/service/utils/TemplatedEmailService.java index 2cc6e5b..52c70f2 100644 --- a/src/main/java/group/goforward/battlbuilder/services/utils/TemplatedEmailService.java +++ b/src/main/java/group/goforward/battlbuilder/service/utils/TemplatedEmailService.java @@ -1,8 +1,8 @@ -package group.goforward.battlbuilder.services.utils; +package group.goforward.battlbuilder.service.utils; import group.goforward.battlbuilder.model.EmailRequest; import group.goforward.battlbuilder.model.EmailTemplate; -import group.goforward.battlbuilder.repos.EmailTemplateRepository; +import group.goforward.battlbuilder.repo.EmailTemplateRepository; import org.springframework.stereotype.Service; import java.util.Map; diff --git a/src/main/java/group/goforward/battlbuilder/services/utils/impl/EmailServiceImpl.java b/src/main/java/group/goforward/battlbuilder/service/utils/impl/EmailServiceImpl.java similarity index 95% rename from src/main/java/group/goforward/battlbuilder/services/utils/impl/EmailServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/service/utils/impl/EmailServiceImpl.java index 27ac0e9..a955cff 100644 --- a/src/main/java/group/goforward/battlbuilder/services/utils/impl/EmailServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/service/utils/impl/EmailServiceImpl.java @@ -1,9 +1,9 @@ -package group.goforward.battlbuilder.services.utils.impl; +package group.goforward.battlbuilder.service.utils.impl; import group.goforward.battlbuilder.model.EmailRequest; import group.goforward.battlbuilder.model.EmailStatus; -import group.goforward.battlbuilder.repos.EmailRequestRepository; -import group.goforward.battlbuilder.services.utils.EmailService; +import group.goforward.battlbuilder.repo.EmailRequestRepository; +import group.goforward.battlbuilder.service.utils.EmailService; import jakarta.mail.internet.MimeMessage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; diff --git a/src/main/java/group/goforward/battlbuilder/services/utils/impl/package-info.java b/src/main/java/group/goforward/battlbuilder/service/utils/impl/package-info.java similarity index 79% rename from src/main/java/group/goforward/battlbuilder/services/utils/impl/package-info.java rename to src/main/java/group/goforward/battlbuilder/service/utils/impl/package-info.java index 751196b..c6e08a4 100644 --- a/src/main/java/group/goforward/battlbuilder/services/utils/impl/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/service/utils/impl/package-info.java @@ -7,4 +7,4 @@ * @version 1.0 * @since 2025-12-10 */ -package group.goforward.battlbuilder.services.utils.impl; +package group.goforward.battlbuilder.service.utils.impl; diff --git a/src/main/java/group/goforward/battlbuilder/utils/package-info.java b/src/main/java/group/goforward/battlbuilder/utils/package-info.java deleted file mode 100644 index 07c58d3..0000000 --- a/src/main/java/group/goforward/battlbuilder/utils/package-info.java +++ /dev/null @@ -1,11 +0,0 @@ -/** - * Utilities package for the BattlBuilder application. - *

- * Contains utility classes and helper functions used throughout - * the application. - * - * @author Forward Group, LLC - * @version 1.0 - * @since 2025-12-10 - */ -package group.goforward.battlbuilder.utils; diff --git a/src/main/java/group/goforward/battlbuilder/web/admin/AdminImportStatusController.java b/src/main/java/group/goforward/battlbuilder/web/admin/AdminImportStatusController.java index f960a38..4c6424e 100644 --- a/src/main/java/group/goforward/battlbuilder/web/admin/AdminImportStatusController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/AdminImportStatusController.java @@ -1,7 +1,7 @@ package group.goforward.battlbuilder.web.admin; import group.goforward.battlbuilder.model.ImportStatus; -import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.repo.ProductRepository; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/group/goforward/battlbuilder/web/admin/AdminMappingController.java b/src/main/java/group/goforward/battlbuilder/web/admin/AdminMappingController.java index e617f93..5f6bf5b 100644 --- a/src/main/java/group/goforward/battlbuilder/web/admin/AdminMappingController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/AdminMappingController.java @@ -1,6 +1,6 @@ package group.goforward.battlbuilder.web.admin; -import group.goforward.battlbuilder.services.MappingAdminService; +import group.goforward.battlbuilder.service.MappingAdminService; import group.goforward.battlbuilder.web.dto.PendingMappingBucketDto; import group.goforward.battlbuilder.web.dto.MappingOptionsDto; import group.goforward.battlbuilder.web.dto.RawCategoryMappingRowDto; diff --git a/src/main/java/group/goforward/battlbuilder/web/admin/AdminMerchantController.java b/src/main/java/group/goforward/battlbuilder/web/admin/AdminMerchantController.java index 93c1537..01c0020 100644 --- a/src/main/java/group/goforward/battlbuilder/web/admin/AdminMerchantController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/AdminMerchantController.java @@ -1,6 +1,6 @@ package group.goforward.battlbuilder.web.admin; -import group.goforward.battlbuilder.services.MerchantFeedImportService; +import group.goforward.battlbuilder.service.MerchantFeedImportService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/web/admin/AdminProductController.java b/src/main/java/group/goforward/battlbuilder/web/admin/AdminProductController.java index df5e539..abb4f0d 100644 --- a/src/main/java/group/goforward/battlbuilder/web/admin/AdminProductController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/AdminProductController.java @@ -1,6 +1,6 @@ package group.goforward.battlbuilder.web.admin; -import group.goforward.battlbuilder.services.admin.AdminProductService; +import group.goforward.battlbuilder.service.admin.AdminProductService; import group.goforward.battlbuilder.web.dto.admin.AdminProductSearchRequest; import group.goforward.battlbuilder.web.dto.admin.ProductBulkUpdateRequest; import group.goforward.battlbuilder.web.dto.admin.ProductAdminRowDto; diff --git a/src/main/java/group/goforward/battlbuilder/web/admin/AdminUserController.java b/src/main/java/group/goforward/battlbuilder/web/admin/AdminUserController.java index 3eece07..2ba62da 100644 --- a/src/main/java/group/goforward/battlbuilder/web/admin/AdminUserController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/AdminUserController.java @@ -1,6 +1,6 @@ package group.goforward.battlbuilder.web.admin; -import group.goforward.battlbuilder.services.admin.AdminUserService; +import group.goforward.battlbuilder.service.admin.AdminUserService; import group.goforward.battlbuilder.web.dto.admin.AdminUserDto; import group.goforward.battlbuilder.web.dto.admin.UpdateUserRoleRequest; import org.springframework.security.access.prepost.PreAuthorize; diff --git a/src/main/java/group/goforward/battlbuilder/web/admin/CategoryMappingAdminController.java b/src/main/java/group/goforward/battlbuilder/web/admin/CategoryMappingAdminController.java index 61681f1..53d67a6 100644 --- a/src/main/java/group/goforward/battlbuilder/web/admin/CategoryMappingAdminController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/CategoryMappingAdminController.java @@ -1,7 +1,7 @@ package group.goforward.battlbuilder.web.admin; import group.goforward.battlbuilder.web.dto.PendingMappingBucketDto; -import group.goforward.battlbuilder.services.MappingAdminService; +import group.goforward.battlbuilder.service.MappingAdminService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/battlbuilder/web/admin/package-info.java b/src/main/java/group/goforward/battlbuilder/web/admin/package-info.java index babce08..1e2f357 100644 --- a/src/main/java/group/goforward/battlbuilder/web/admin/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/package-info.java @@ -2,7 +2,7 @@ /** * Web admin package for the BattlBuilder application. *

- * Contains web controllers for administrative interface operations + * Contains web controller for administrative interface operations * including user management, merchant administration, and import status. * * @author Forward Group, LLC diff --git a/src/main/java/group/goforward/battlbuilder/web/package-info.java b/src/main/java/group/goforward/battlbuilder/web/package-info.java index f3614bf..abd4034 100644 --- a/src/main/java/group/goforward/battlbuilder/web/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/web/package-info.java @@ -1,7 +1,7 @@ /** * Web package for the BattlBuilder application. *

- * Contains web-related classes including controllers and DTOs + * Contains web-related classes including controller and DTOs * for the web layer. * * @author Forward Group, LLC