From b4f6000f529ee1fe54131748edc69a31937a4e4f Mon Sep 17 00:00:00 2001 From: Don Strawsburg Date: Mon, 8 Dec 2025 11:45:28 -0500 Subject: [PATCH] package name change --- .../configuration/PasswordConfig.java | 16 ----------- .../ballistic/model/package-info.java | 1 - .../ballistic/services/package-info.java | 1 - .../ApiResponse.java | 2 +- .../BattlBuilderApplication.java | 6 ++-- .../configuration/CacheConfig.java | 2 +- .../configuration/CorsConfig.java | 2 +- .../configuration/JpaConfig.java | 2 +- .../configuration/PasswordConfig.java | 11 ++++++++ .../configuration/SecurityConfig.java | 2 +- .../configuration/package-info.java | 4 +-- .../controllers/AuthController.java | 14 +++++----- .../controllers/BrandController.java | 9 +++--- .../controllers/CategoryController.java | 6 ++-- .../controllers/ImportController.java | 4 +-- .../controllers/MerchantAdminController.java | 10 +++---- .../MerchantCategoryMappingController.java | 14 +++++----- .../controllers/MerchantDebugController.java | 6 ++-- .../controllers/PingController.java | 2 +- .../controllers/ProductController.java | 16 +++++------ .../controllers/StateController.java | 10 +++---- .../controllers/UserController.java | 9 +++--- .../admin/AdminCategoryController.java | 8 +++--- .../admin/AdminCategoryMappingController.java | 20 ++++++------- .../admin/AdminDashboardController.java | 6 ++-- .../admin/AdminPartRoleMappingController.java | 16 +++++------ .../admin/PartCategoryAdminController.java | 7 ++--- .../controllers/package-info.java | 4 +-- .../imports/MerchantFeedRow.java | 2 +- .../imports/dto/MerchantFeedRow.java | 2 +- .../imports/dto/package-info.java | 4 +-- .../model/Account.java | 2 +- .../model/AffiliateCategoryMap.java | 2 +- .../model/Brand.java | 2 +- .../model/Build.java | 2 +- .../model/BuildItem.java | 2 +- .../model/BuildsComponent.java | 2 +- .../model/CategoryMapping.java | 2 +- .../model/ComponentType.java | 2 +- .../model/FeedImport.java | 2 +- .../model/ImportStatus.java | 2 +- .../model/Merchant.java | 2 +- .../model/MerchantCategoryMap.java | 2 +- .../model/MerchantCategoryMapping.java | 4 +-- .../model/PartCategory.java | 2 +- .../model/PartRoleCategoryMapping.java | 2 +- .../model/PartRoleMapping.java | 2 +- .../model/Platform.java | 2 +- .../model/PriceHistory.java | 2 +- .../model/Product.java | 2 +- .../model/ProductConfiguration.java | 2 +- .../model/ProductOffer.java | 2 +- .../model/State.java | 2 +- .../model/User.java | 2 +- .../model/UserActivityLog.java | 2 +- .../battlbuilder/model/package-info.java | 1 + .../repos/AccountRepository.java | 4 +-- .../repos/BrandRepository.java | 4 +-- .../repos/BuildItemRepository.java | 4 +-- .../repos/BuildRepository.java | 4 +-- .../repos/CategoryMappingRepository.java | 6 ++-- .../repos/FeedImportRepository.java | 4 +-- .../MerchantCategoryMappingRepository.java | 6 ++-- .../repos/MerchantRepository.java | 4 +-- .../repos/PartCategoryRepository.java | 4 +-- .../PartRoleCategoryMappingRepository.java | 4 +-- .../repos/PartRoleMappingRepository.java | 4 +-- .../repos/PriceHistoryRepository.java | 4 +-- .../repos/ProductOfferRepository.java | 4 +-- .../repos/ProductRepository.java | 12 ++++---- .../repos/StateRepository.java | 4 +-- .../repos/UserRepository.java | 4 +-- .../repos/package-info.java | 4 +-- .../security/CustomUserDetails.java | 4 +-- .../security/CustomUserDetailsService.java | 6 ++-- .../security/JwtAuthenticationEntryPoint.java | 2 +- .../security/JwtAuthenticationFilter.java | 6 ++-- .../security/JwtService.java | 4 +-- .../services/AdminDashboardService.java | 12 ++++---- .../services/BrandService.java | 4 +-- .../CategoryMappingRecommendationService.java | 8 +++--- .../services/GunbuilderProductService.java | 17 ++++++----- .../services/ImportStatusAdminService.java | 10 +++---- .../services/MappingAdminService.java | 16 +++++------ .../MerchantCategoryMappingService.java | 10 +++---- .../services/MerchantFeedImportService.java | 2 +- .../services/PartCategoryResolverService.java | 8 +++--- .../services/PartRoleMappingService.java | 10 +++---- .../services/StatesService.java | 4 +-- .../services/UsersService.java | 4 +-- .../services/admin/AdminUserService.java | 8 +++--- .../services/impl/BrandServiceImpl.java | 8 +++--- .../impl/MerchantFeedImportServiceImpl.java | 28 +++++++++---------- .../services/impl/StatesServiceImpl.java | 8 +++--- .../services/impl/UsersServiceImpl.java | 8 +++--- .../services/impl/package-info.java | 4 +-- .../battlbuilder/services/package-info.java | 1 + .../web/GunbuilderProductController.java | 7 ++--- .../web/PartRoleMappingController.java | 8 +++--- .../admin/AdminImportStatusController.java | 6 ++-- .../web/admin/AdminMappingController.java | 6 ++-- .../web/admin/AdminMerchantController.java | 4 +-- .../web/admin/AdminUserController.java | 8 +++--- .../admin/CategoryMappingAdminController.java | 7 ++--- .../dto/CategoryMappingRecommendationDto.java | 2 +- .../web/dto/GunbuilderProductDto.java | 2 +- .../web/dto/ImportStatusByMerchantDto.java | 4 +-- .../web/dto/ImportStatusSummaryDto.java | 4 +-- .../web/dto/MerchantAdminDto.java | 2 +- .../web/dto/MerchantCategoryMappingDto.java | 2 +- .../web/dto/PartRoleToCategoryDto.java | 2 +- .../web/dto/PendingMappingBucketDto.java | 2 +- .../web/dto/ProductOfferDto.java | 2 +- .../web/dto/ProductSummaryDto.java | 2 +- .../UpsertMerchantCategoryMappingRequest.java | 2 +- .../dto/admin/AdminDashboardOverviewDto.java | 2 +- .../dto/admin/AdminPartRoleMappingDto.java | 2 +- .../web/dto/admin/AdminUserDto.java | 4 +-- .../admin/CreatePartRoleMappingRequest.java | 2 +- .../dto/admin/MerchantCategoryMappingDto.java | 2 +- .../web/dto/admin/PartCategoryDto.java | 2 +- .../web/dto/admin/PartRoleMappingDto.java | 2 +- .../web/dto/admin/PartRoleMappingRequest.java | 2 +- .../web/dto/admin/SimpleMerchantDto.java | 2 +- .../UpdateMerchantCategoryMappingRequest.java | 2 +- .../admin/UpdatePartRoleMappingRequest.java | 2 +- .../web/dto/admin/UpdateUserRoleRequest.java | 2 +- .../web/dto/auth/AuthResponse.java | 2 +- .../web/dto/auth/LoginRequest.java | 2 +- .../web/dto/auth/RegisterRequest.java | 2 +- .../web/mapper/PartRoleMappingMapper.java | 10 +++---- .../web/mapper/ProductMapper.java | 6 ++-- .../BallisticApplicationTests.java | 3 +- 133 files changed, 322 insertions(+), 342 deletions(-) delete mode 100644 src/main/java/group/goforward/ballistic/configuration/PasswordConfig.java delete mode 100644 src/main/java/group/goforward/ballistic/model/package-info.java delete mode 100644 src/main/java/group/goforward/ballistic/services/package-info.java rename src/main/java/group/goforward/{ballistic => battlbuilder}/ApiResponse.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/BattlBuilderApplication.java (72%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/configuration/CacheConfig.java (87%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/configuration/CorsConfig.java (95%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/configuration/JpaConfig.java (79%) create mode 100644 src/main/java/group/goforward/battlbuilder/configuration/PasswordConfig.java rename src/main/java/group/goforward/{ballistic => battlbuilder}/configuration/SecurityConfig.java (97%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/configuration/package-info.java (68%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/AuthController.java (88%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/BrandController.java (82%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/CategoryController.java (83%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/ImportController.java (88%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/MerchantAdminController.java (85%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/MerchantCategoryMappingController.java (79%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/MerchantDebugController.java (74%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/PingController.java (80%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/ProductController.java (89%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/StateController.java (83%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/UserController.java (82%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/admin/AdminCategoryController.java (79%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/admin/AdminCategoryMappingController.java (86%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/admin/AdminDashboardController.java (80%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/admin/AdminPartRoleMappingController.java (88%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/admin/PartCategoryAdminController.java (80%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/controllers/package-info.java (68%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/imports/MerchantFeedRow.java (91%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/imports/dto/MerchantFeedRow.java (84%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/imports/dto/package-info.java (69%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/Account.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/AffiliateCategoryMap.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/Brand.java (93%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/Build.java (93%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/BuildItem.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/BuildsComponent.java (93%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/CategoryMapping.java (98%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/ComponentType.java (93%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/FeedImport.java (93%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/ImportStatus.java (83%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/Merchant.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/MerchantCategoryMap.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/MerchantCategoryMapping.java (92%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/PartCategory.java (93%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/PartRoleCategoryMapping.java (97%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/PartRoleMapping.java (98%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/Platform.java (93%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/PriceHistory.java (92%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/Product.java (96%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/ProductConfiguration.java (86%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/ProductOffer.java (95%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/State.java (90%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/User.java (99%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/model/UserActivityLog.java (92%) create mode 100644 src/main/java/group/goforward/battlbuilder/model/package-info.java rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/AccountRepository.java (61%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/BrandRepository.java (68%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/BuildItemRepository.java (74%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/BuildRepository.java (69%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/CategoryMappingRepository.java (80%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/FeedImportRepository.java (58%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/MerchantCategoryMappingRepository.java (80%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/MerchantRepository.java (68%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/PartCategoryRepository.java (76%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/PartRoleCategoryMappingRepository.java (78%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/PartRoleMappingRepository.java (89%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/PriceHistoryRepository.java (58%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/ProductOfferRepository.java (88%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/ProductRepository.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/StateRepository.java (68%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/UserRepository.java (81%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/repos/package-info.java (69%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/security/CustomUserDetails.java (93%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/security/CustomUserDetailsService.java (83%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/security/JwtAuthenticationEntryPoint.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/security/JwtAuthenticationFilter.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/security/JwtService.java (95%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/AdminDashboardService.java (79%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/BrandService.java (69%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/CategoryMappingRecommendationService.java (92%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/GunbuilderProductService.java (91%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/ImportStatusAdminService.java (80%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/MappingAdminService.java (87%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/MerchantCategoryMappingService.java (91%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/MerchantFeedImportService.java (86%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/PartCategoryResolverService.java (82%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/PartRoleMappingService.java (73%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/StatesService.java (69%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/UsersService.java (69%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/admin/AdminUserService.java (88%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/impl/BrandServiceImpl.java (74%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/impl/MerchantFeedImportServiceImpl.java (96%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/impl/StatesServiceImpl.java (74%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/impl/UsersServiceImpl.java (74%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/services/impl/package-info.java (72%) create mode 100644 src/main/java/group/goforward/battlbuilder/services/package-info.java rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/GunbuilderProductController.java (93%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/PartRoleMappingController.java (75%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/admin/AdminImportStatusController.java (92%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/admin/AdminMappingController.java (86%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/admin/AdminMerchantController.java (89%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/admin/AdminUserController.java (78%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/admin/CategoryMappingAdminController.java (91%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/CategoryMappingRecommendationDto.java (86%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/GunbuilderProductDto.java (97%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/ImportStatusByMerchantDto.java (69%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/ImportStatusSummaryDto.java (62%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/MerchantAdminDto.java (92%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/MerchantCategoryMappingDto.java (91%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/PartRoleToCategoryDto.java (77%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/PendingMappingBucketDto.java (80%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/ProductOfferDto.java (92%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/ProductSummaryDto.java (92%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/UpsertMerchantCategoryMappingRequest.java (90%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/AdminDashboardOverviewDto.java (95%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/AdminPartRoleMappingDto.java (78%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/AdminUserDto.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/CreatePartRoleMappingRequest.java (74%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/MerchantCategoryMappingDto.java (85%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/PartCategoryDto.java (77%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/PartRoleMappingDto.java (81%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/PartRoleMappingRequest.java (73%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/SimpleMerchantDto.java (60%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/UpdateMerchantCategoryMappingRequest.java (62%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/UpdatePartRoleMappingRequest.java (74%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/admin/UpdateUserRoleRequest.java (86%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/auth/AuthResponse.java (94%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/auth/LoginRequest.java (88%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/dto/auth/RegisterRequest.java (91%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/mapper/PartRoleMappingMapper.java (75%) rename src/main/java/group/goforward/{ballistic => battlbuilder}/web/mapper/ProductMapper.java (79%) rename src/test/java/group/goforward/{ballistic => battlbuilder}/BallisticApplicationTests.java (53%) diff --git a/src/main/java/group/goforward/ballistic/configuration/PasswordConfig.java b/src/main/java/group/goforward/ballistic/configuration/PasswordConfig.java deleted file mode 100644 index 662156b..0000000 --- a/src/main/java/group/goforward/ballistic/configuration/PasswordConfig.java +++ /dev/null @@ -1,16 +0,0 @@ -package group.goforward.ballistic.configuration; - -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; -import org.springframework.security.crypto.password.PasswordEncoder; - -// @Configuration -// public class PasswordConfig { - -// @Bean -// public PasswordEncoder passwordEncoder() { -// // BCrypt default password -// return new BCryptPasswordEncoder(); -// } -// } \ No newline at end of file diff --git a/src/main/java/group/goforward/ballistic/model/package-info.java b/src/main/java/group/goforward/ballistic/model/package-info.java deleted file mode 100644 index 002a39a..0000000 --- a/src/main/java/group/goforward/ballistic/model/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package group.goforward.ballistic.model; \ No newline at end of file diff --git a/src/main/java/group/goforward/ballistic/services/package-info.java b/src/main/java/group/goforward/ballistic/services/package-info.java deleted file mode 100644 index 1bfc5e3..0000000 --- a/src/main/java/group/goforward/ballistic/services/package-info.java +++ /dev/null @@ -1 +0,0 @@ -package group.goforward.ballistic.services; \ No newline at end of file diff --git a/src/main/java/group/goforward/ballistic/ApiResponse.java b/src/main/java/group/goforward/battlbuilder/ApiResponse.java similarity index 94% rename from src/main/java/group/goforward/ballistic/ApiResponse.java rename to src/main/java/group/goforward/battlbuilder/ApiResponse.java index 3dd23a6..d23af40 100644 --- a/src/main/java/group/goforward/ballistic/ApiResponse.java +++ b/src/main/java/group/goforward/battlbuilder/ApiResponse.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic; +package group.goforward.battlbuilder; import java.time.LocalDateTime; diff --git a/src/main/java/group/goforward/ballistic/BattlBuilderApplication.java b/src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java similarity index 72% rename from src/main/java/group/goforward/ballistic/BattlBuilderApplication.java rename to src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java index e7ed88e..ea5b5f3 100644 --- a/src/main/java/group/goforward/ballistic/BattlBuilderApplication.java +++ b/src/main/java/group/goforward/battlbuilder/BattlBuilderApplication.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic; +package group.goforward.battlbuilder; import org.springframework.boot.SpringApplication; import org.springframework.boot.autoconfigure.SpringBootApplication; @@ -8,8 +8,8 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @SpringBootApplication @EnableCaching -@EntityScan(basePackages = "group.goforward.ballistic.model") -@EnableJpaRepositories(basePackages = "group.goforward.ballistic.repos") +@EntityScan(basePackages = "group.goforward.battlbuilder.model") +@EnableJpaRepositories(basePackages = "group.goforward.battlbuilder.repos") public class BattlBuilderApplication { public static void main(String[] args) { diff --git a/src/main/java/group/goforward/ballistic/configuration/CacheConfig.java b/src/main/java/group/goforward/battlbuilder/configuration/CacheConfig.java similarity index 87% rename from src/main/java/group/goforward/ballistic/configuration/CacheConfig.java rename to src/main/java/group/goforward/battlbuilder/configuration/CacheConfig.java index f48d7b3..fdf13fd 100644 --- a/src/main/java/group/goforward/ballistic/configuration/CacheConfig.java +++ b/src/main/java/group/goforward/battlbuilder/configuration/CacheConfig.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.configuration; +package group.goforward.battlbuilder.configuration; import org.springframework.cache.CacheManager; import org.springframework.cache.concurrent.ConcurrentMapCacheManager; diff --git a/src/main/java/group/goforward/ballistic/configuration/CorsConfig.java b/src/main/java/group/goforward/battlbuilder/configuration/CorsConfig.java similarity index 95% rename from src/main/java/group/goforward/ballistic/configuration/CorsConfig.java rename to src/main/java/group/goforward/battlbuilder/configuration/CorsConfig.java index f578c77..20ff722 100644 --- a/src/main/java/group/goforward/ballistic/configuration/CorsConfig.java +++ b/src/main/java/group/goforward/battlbuilder/configuration/CorsConfig.java @@ -1,5 +1,5 @@ // src/main/java/com/example/config/CorsConfig.java -package group.goforward.ballistic.configuration; +package group.goforward.battlbuilder.configuration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/group/goforward/ballistic/configuration/JpaConfig.java b/src/main/java/group/goforward/battlbuilder/configuration/JpaConfig.java similarity index 79% rename from src/main/java/group/goforward/ballistic/configuration/JpaConfig.java rename to src/main/java/group/goforward/battlbuilder/configuration/JpaConfig.java index 49b0e90..eca843f 100644 --- a/src/main/java/group/goforward/ballistic/configuration/JpaConfig.java +++ b/src/main/java/group/goforward/battlbuilder/configuration/JpaConfig.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.configuration; +package group.goforward.battlbuilder.configuration; import org.springframework.context.annotation.Configuration; //import org.springframework.data.jpa.repository.config.EnableJpaAuditing; diff --git a/src/main/java/group/goforward/battlbuilder/configuration/PasswordConfig.java b/src/main/java/group/goforward/battlbuilder/configuration/PasswordConfig.java new file mode 100644 index 0000000..1d7374a --- /dev/null +++ b/src/main/java/group/goforward/battlbuilder/configuration/PasswordConfig.java @@ -0,0 +1,11 @@ +package group.goforward.battlbuilder.configuration; + +// @Configuration +// public class PasswordConfig { + +// @Bean +// public PasswordEncoder passwordEncoder() { +// // BCrypt default password +// return new BCryptPasswordEncoder(); +// } +// } \ No newline at end of file diff --git a/src/main/java/group/goforward/ballistic/configuration/SecurityConfig.java b/src/main/java/group/goforward/battlbuilder/configuration/SecurityConfig.java similarity index 97% rename from src/main/java/group/goforward/ballistic/configuration/SecurityConfig.java rename to src/main/java/group/goforward/battlbuilder/configuration/SecurityConfig.java index 2b3f98d..7e8eed6 100644 --- a/src/main/java/group/goforward/ballistic/configuration/SecurityConfig.java +++ b/src/main/java/group/goforward/battlbuilder/configuration/SecurityConfig.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.configuration; +package group.goforward.battlbuilder.configuration; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/src/main/java/group/goforward/ballistic/configuration/package-info.java b/src/main/java/group/goforward/battlbuilder/configuration/package-info.java similarity index 68% rename from src/main/java/group/goforward/ballistic/configuration/package-info.java rename to src/main/java/group/goforward/battlbuilder/configuration/package-info.java index 304c520..c5fadd9 100644 --- a/src/main/java/group/goforward/ballistic/configuration/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/configuration/package-info.java @@ -4,10 +4,10 @@ * * *

The main entry point for managing the inventory is the - * {@link group.goforward.ballistic.BattlBuilderApplication} class.

+ * {@link group.goforward.battlbuilder.BattlBuilderApplication} class.

* * @since 1.0 * @author Don Strawsburg * @version 1.1 */ -package group.goforward.ballistic.configuration; \ No newline at end of file +package group.goforward.battlbuilder.configuration; \ No newline at end of file diff --git a/src/main/java/group/goforward/ballistic/controllers/AuthController.java b/src/main/java/group/goforward/battlbuilder/controllers/AuthController.java similarity index 88% rename from src/main/java/group/goforward/ballistic/controllers/AuthController.java rename to src/main/java/group/goforward/battlbuilder/controllers/AuthController.java index 4456e1f..b7e8962 100644 --- a/src/main/java/group/goforward/ballistic/controllers/AuthController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/AuthController.java @@ -1,11 +1,11 @@ -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; -import group.goforward.ballistic.model.User; -import group.goforward.ballistic.repos.UserRepository; -import group.goforward.ballistic.security.JwtService; -import group.goforward.ballistic.web.dto.auth.AuthResponse; -import group.goforward.ballistic.web.dto.auth.LoginRequest; -import group.goforward.ballistic.web.dto.auth.RegisterRequest; +import group.goforward.battlbuilder.model.User; +import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.security.JwtService; +import group.goforward.battlbuilder.web.dto.auth.AuthResponse; +import group.goforward.battlbuilder.web.dto.auth.LoginRequest; +import group.goforward.battlbuilder.web.dto.auth.RegisterRequest; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.security.crypto.password.PasswordEncoder; diff --git a/src/main/java/group/goforward/ballistic/controllers/BrandController.java b/src/main/java/group/goforward/battlbuilder/controllers/BrandController.java similarity index 82% rename from src/main/java/group/goforward/ballistic/controllers/BrandController.java rename to src/main/java/group/goforward/battlbuilder/controllers/BrandController.java index bc94044..edcceee 100644 --- a/src/main/java/group/goforward/ballistic/controllers/BrandController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/BrandController.java @@ -1,9 +1,8 @@ -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; -import group.goforward.ballistic.model.Brand; -import group.goforward.ballistic.model.State; -import group.goforward.ballistic.repos.BrandRepository; -import group.goforward.ballistic.services.BrandService; +import group.goforward.battlbuilder.model.Brand; +import group.goforward.battlbuilder.repos.BrandRepository; +import group.goforward.battlbuilder.services.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/ballistic/controllers/CategoryController.java b/src/main/java/group/goforward/battlbuilder/controllers/CategoryController.java similarity index 83% rename from src/main/java/group/goforward/ballistic/controllers/CategoryController.java rename to src/main/java/group/goforward/battlbuilder/controllers/CategoryController.java index 4787170..9faf1d8 100644 --- a/src/main/java/group/goforward/ballistic/controllers/CategoryController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/CategoryController.java @@ -1,7 +1,7 @@ -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; -import group.goforward.ballistic.repos.PartCategoryRepository; -import group.goforward.ballistic.web.dto.admin.PartCategoryDto; +import group.goforward.battlbuilder.repos.PartCategoryRepository; +import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/controllers/ImportController.java b/src/main/java/group/goforward/battlbuilder/controllers/ImportController.java similarity index 88% rename from src/main/java/group/goforward/ballistic/controllers/ImportController.java rename to src/main/java/group/goforward/battlbuilder/controllers/ImportController.java index d251b01..44dc3d9 100644 --- a/src/main/java/group/goforward/ballistic/controllers/ImportController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/ImportController.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; -import group.goforward.ballistic.services.MerchantFeedImportService; +import group.goforward.battlbuilder.services.MerchantFeedImportService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/ballistic/controllers/MerchantAdminController.java b/src/main/java/group/goforward/battlbuilder/controllers/MerchantAdminController.java similarity index 85% rename from src/main/java/group/goforward/ballistic/controllers/MerchantAdminController.java rename to src/main/java/group/goforward/battlbuilder/controllers/MerchantAdminController.java index 7aeb3ce..dec23a5 100644 --- a/src/main/java/group/goforward/ballistic/controllers/MerchantAdminController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/MerchantAdminController.java @@ -1,5 +1,5 @@ // MerchantAdminController.java -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; import org.springframework.web.bind.annotation.CrossOrigin; import org.springframework.web.bind.annotation.GetMapping; @@ -8,12 +8,10 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import group.goforward.ballistic.model.Merchant; -import group.goforward.ballistic.repos.MerchantRepository; -import group.goforward.ballistic.web.dto.MerchantAdminDto; -import org.springframework.web.bind.annotation.*; +import group.goforward.battlbuilder.model.Merchant; +import group.goforward.battlbuilder.repos.MerchantRepository; +import group.goforward.battlbuilder.web.dto.MerchantAdminDto; -import java.time.OffsetDateTime; import java.util.List; @RestController diff --git a/src/main/java/group/goforward/ballistic/controllers/MerchantCategoryMappingController.java b/src/main/java/group/goforward/battlbuilder/controllers/MerchantCategoryMappingController.java similarity index 79% rename from src/main/java/group/goforward/ballistic/controllers/MerchantCategoryMappingController.java rename to src/main/java/group/goforward/battlbuilder/controllers/MerchantCategoryMappingController.java index e801bb0..fb97d20 100644 --- a/src/main/java/group/goforward/ballistic/controllers/MerchantCategoryMappingController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/MerchantCategoryMappingController.java @@ -1,11 +1,11 @@ -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; -import group.goforward.ballistic.model.Merchant; -import group.goforward.ballistic.model.MerchantCategoryMapping; -import group.goforward.ballistic.repos.MerchantRepository; -import group.goforward.ballistic.services.MerchantCategoryMappingService; -import group.goforward.ballistic.web.dto.MerchantCategoryMappingDto; -import group.goforward.ballistic.web.dto.UpsertMerchantCategoryMappingRequest; +import group.goforward.battlbuilder.model.Merchant; +import group.goforward.battlbuilder.model.MerchantCategoryMapping; +import group.goforward.battlbuilder.repos.MerchantRepository; +import group.goforward.battlbuilder.services.MerchantCategoryMappingService; +import group.goforward.battlbuilder.web.dto.MerchantCategoryMappingDto; +import group.goforward.battlbuilder.web.dto.UpsertMerchantCategoryMappingRequest; import java.util.List; import java.util.stream.Collectors; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/ballistic/controllers/MerchantDebugController.java b/src/main/java/group/goforward/battlbuilder/controllers/MerchantDebugController.java similarity index 74% rename from src/main/java/group/goforward/ballistic/controllers/MerchantDebugController.java rename to src/main/java/group/goforward/battlbuilder/controllers/MerchantDebugController.java index cd632ab..bf3c41c 100644 --- a/src/main/java/group/goforward/ballistic/controllers/MerchantDebugController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/MerchantDebugController.java @@ -1,7 +1,7 @@ -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; -import group.goforward.ballistic.model.Merchant; -import group.goforward.ballistic.repos.MerchantRepository; +import group.goforward.battlbuilder.model.Merchant; +import group.goforward.battlbuilder.repos.MerchantRepository; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/group/goforward/ballistic/controllers/PingController.java b/src/main/java/group/goforward/battlbuilder/controllers/PingController.java similarity index 80% rename from src/main/java/group/goforward/ballistic/controllers/PingController.java rename to src/main/java/group/goforward/battlbuilder/controllers/PingController.java index 224fc94..65bec57 100644 --- a/src/main/java/group/goforward/ballistic/controllers/PingController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/PingController.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/group/goforward/ballistic/controllers/ProductController.java b/src/main/java/group/goforward/battlbuilder/controllers/ProductController.java similarity index 89% rename from src/main/java/group/goforward/ballistic/controllers/ProductController.java rename to src/main/java/group/goforward/battlbuilder/controllers/ProductController.java index bca4876..d41d0ef 100644 --- a/src/main/java/group/goforward/ballistic/controllers/ProductController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/ProductController.java @@ -1,12 +1,12 @@ -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; -import group.goforward.ballistic.model.Product; -import group.goforward.ballistic.model.ProductOffer; -import group.goforward.ballistic.repos.ProductOfferRepository; -import group.goforward.ballistic.web.dto.ProductOfferDto; -import group.goforward.ballistic.repos.ProductRepository; -import group.goforward.ballistic.web.dto.ProductSummaryDto; -import group.goforward.ballistic.web.mapper.ProductMapper; +import group.goforward.battlbuilder.model.Product; +import group.goforward.battlbuilder.model.ProductOffer; +import group.goforward.battlbuilder.repos.ProductOfferRepository; +import group.goforward.battlbuilder.web.dto.ProductOfferDto; +import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.web.dto.ProductSummaryDto; +import group.goforward.battlbuilder.web.mapper.ProductMapper; import org.springframework.cache.annotation.Cacheable; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/ballistic/controllers/StateController.java b/src/main/java/group/goforward/battlbuilder/controllers/StateController.java similarity index 83% rename from src/main/java/group/goforward/ballistic/controllers/StateController.java rename to src/main/java/group/goforward/battlbuilder/controllers/StateController.java index e6c7ace..b7ddc31 100644 --- a/src/main/java/group/goforward/ballistic/controllers/StateController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/StateController.java @@ -1,11 +1,9 @@ -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; -import group.goforward.ballistic.ApiResponse; -import group.goforward.ballistic.model.State; -import group.goforward.ballistic.repos.StateRepository; -import group.goforward.ballistic.services.StatesService; +import group.goforward.battlbuilder.model.State; +import group.goforward.battlbuilder.repos.StateRepository; +import group.goforward.battlbuilder.services.StatesService; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.cache.annotation.Cacheable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/ballistic/controllers/UserController.java b/src/main/java/group/goforward/battlbuilder/controllers/UserController.java similarity index 82% rename from src/main/java/group/goforward/ballistic/controllers/UserController.java rename to src/main/java/group/goforward/battlbuilder/controllers/UserController.java index 1931a37..8c657ec 100644 --- a/src/main/java/group/goforward/ballistic/controllers/UserController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/UserController.java @@ -1,9 +1,8 @@ -package group.goforward.ballistic.controllers; +package group.goforward.battlbuilder.controllers; -import group.goforward.ballistic.model.User; -import group.goforward.ballistic.repos.UserRepository; -import group.goforward.ballistic.services.UsersService; -import org.springframework.beans.factory.annotation.Autowired; +import group.goforward.battlbuilder.model.User; +import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.services.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/ballistic/controllers/admin/AdminCategoryController.java b/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminCategoryController.java similarity index 79% rename from src/main/java/group/goforward/ballistic/controllers/admin/AdminCategoryController.java rename to src/main/java/group/goforward/battlbuilder/controllers/admin/AdminCategoryController.java index 3f9be99..993ffa3 100644 --- a/src/main/java/group/goforward/ballistic/controllers/admin/AdminCategoryController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminCategoryController.java @@ -1,8 +1,8 @@ -package group.goforward.ballistic.controllers.admin; +package group.goforward.battlbuilder.controllers.admin; -import group.goforward.ballistic.model.PartCategory; -import group.goforward.ballistic.repos.PartCategoryRepository; -import group.goforward.ballistic.web.dto.admin.PartCategoryDto; +import group.goforward.battlbuilder.model.PartCategory; +import group.goforward.battlbuilder.repos.PartCategoryRepository; +import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/controllers/admin/AdminCategoryMappingController.java b/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminCategoryMappingController.java similarity index 86% rename from src/main/java/group/goforward/ballistic/controllers/admin/AdminCategoryMappingController.java rename to src/main/java/group/goforward/battlbuilder/controllers/admin/AdminCategoryMappingController.java index 6a9e5e1..36abf28 100644 --- a/src/main/java/group/goforward/ballistic/controllers/admin/AdminCategoryMappingController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminCategoryMappingController.java @@ -1,14 +1,14 @@ -package group.goforward.ballistic.controllers.admin; +package group.goforward.battlbuilder.controllers.admin; -import group.goforward.ballistic.model.CategoryMapping; -import group.goforward.ballistic.model.Merchant; -import group.goforward.ballistic.model.PartCategory; -import group.goforward.ballistic.repos.CategoryMappingRepository; -import group.goforward.ballistic.repos.MerchantRepository; -import group.goforward.ballistic.repos.PartCategoryRepository; -import group.goforward.ballistic.web.dto.admin.MerchantCategoryMappingDto; -import group.goforward.ballistic.web.dto.admin.SimpleMerchantDto; -import group.goforward.ballistic.web.dto.admin.UpdateMerchantCategoryMappingRequest; +import group.goforward.battlbuilder.model.CategoryMapping; +import group.goforward.battlbuilder.model.Merchant; +import group.goforward.battlbuilder.model.PartCategory; +import group.goforward.battlbuilder.repos.CategoryMappingRepository; +import group.goforward.battlbuilder.repos.MerchantRepository; +import group.goforward.battlbuilder.repos.PartCategoryRepository; +import group.goforward.battlbuilder.web.dto.admin.MerchantCategoryMappingDto; +import group.goforward.battlbuilder.web.dto.admin.SimpleMerchantDto; +import group.goforward.battlbuilder.web.dto.admin.UpdateMerchantCategoryMappingRequest; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; diff --git a/src/main/java/group/goforward/ballistic/controllers/admin/AdminDashboardController.java b/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminDashboardController.java similarity index 80% rename from src/main/java/group/goforward/ballistic/controllers/admin/AdminDashboardController.java rename to src/main/java/group/goforward/battlbuilder/controllers/admin/AdminDashboardController.java index 0b35b39..b85ca3c 100644 --- a/src/main/java/group/goforward/ballistic/controllers/admin/AdminDashboardController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminDashboardController.java @@ -1,7 +1,7 @@ -package group.goforward.ballistic.web; +package group.goforward.battlbuilder.web; -import group.goforward.ballistic.services.AdminDashboardService; -import group.goforward.ballistic.web.dto.AdminDashboardOverviewDto; +import group.goforward.battlbuilder.services.AdminDashboardService; +import group.goforward.battlbuilder.web.dto.AdminDashboardOverviewDto; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; diff --git a/src/main/java/group/goforward/ballistic/controllers/admin/AdminPartRoleMappingController.java b/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPartRoleMappingController.java similarity index 88% rename from src/main/java/group/goforward/ballistic/controllers/admin/AdminPartRoleMappingController.java rename to src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPartRoleMappingController.java index 5b79c38..1d3d961 100644 --- a/src/main/java/group/goforward/ballistic/controllers/admin/AdminPartRoleMappingController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/admin/AdminPartRoleMappingController.java @@ -1,12 +1,12 @@ -package group.goforward.ballistic.controllers.admin; +package group.goforward.battlbuilder.controllers.admin; -import group.goforward.ballistic.model.PartCategory; -import group.goforward.ballistic.model.PartRoleMapping; -import group.goforward.ballistic.repos.PartCategoryRepository; -import group.goforward.ballistic.repos.PartRoleMappingRepository; -import group.goforward.ballistic.web.dto.admin.AdminPartRoleMappingDto; -import group.goforward.ballistic.web.dto.admin.CreatePartRoleMappingRequest; -import group.goforward.ballistic.web.dto.admin.UpdatePartRoleMappingRequest; +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.web.dto.admin.AdminPartRoleMappingDto; +import group.goforward.battlbuilder.web.dto.admin.CreatePartRoleMappingRequest; +import group.goforward.battlbuilder.web.dto.admin.UpdatePartRoleMappingRequest; import org.springframework.http.HttpStatus; import org.springframework.web.bind.annotation.*; import org.springframework.web.server.ResponseStatusException; diff --git a/src/main/java/group/goforward/ballistic/controllers/admin/PartCategoryAdminController.java b/src/main/java/group/goforward/battlbuilder/controllers/admin/PartCategoryAdminController.java similarity index 80% rename from src/main/java/group/goforward/ballistic/controllers/admin/PartCategoryAdminController.java rename to src/main/java/group/goforward/battlbuilder/controllers/admin/PartCategoryAdminController.java index 511a56f..130b9c4 100644 --- a/src/main/java/group/goforward/ballistic/controllers/admin/PartCategoryAdminController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/admin/PartCategoryAdminController.java @@ -1,8 +1,7 @@ -package group.goforward.ballistic.controllers.admin; +package group.goforward.battlbuilder.controllers.admin; -import group.goforward.ballistic.model.PartCategory; -import group.goforward.ballistic.repos.PartCategoryRepository; -import group.goforward.ballistic.web.dto.admin.PartCategoryDto; +import group.goforward.battlbuilder.repos.PartCategoryRepository; +import group.goforward.battlbuilder.web.dto.admin.PartCategoryDto; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/controllers/package-info.java b/src/main/java/group/goforward/battlbuilder/controllers/package-info.java similarity index 68% rename from src/main/java/group/goforward/ballistic/controllers/package-info.java rename to src/main/java/group/goforward/battlbuilder/controllers/package-info.java index dda4a80..0b3c3d5 100644 --- a/src/main/java/group/goforward/ballistic/controllers/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/package-info.java @@ -4,10 +4,10 @@ * * *

The main entry point for managing the inventory is the - * {@link group.goforward.ballistic.BattlBuilderApplication} class.

+ * {@link group.goforward.battlbuilder.BattlBuilderApplication} class.

* * @since 1.0 * @author Don Strawsburg * @version 1.1 */ -package group.goforward.ballistic.controllers; \ No newline at end of file +package group.goforward.battlbuilder.controllers; \ No newline at end of file diff --git a/src/main/java/group/goforward/ballistic/imports/MerchantFeedRow.java b/src/main/java/group/goforward/battlbuilder/imports/MerchantFeedRow.java similarity index 91% rename from src/main/java/group/goforward/ballistic/imports/MerchantFeedRow.java rename to src/main/java/group/goforward/battlbuilder/imports/MerchantFeedRow.java index 4ed5dab..f6377ee 100644 --- a/src/main/java/group/goforward/ballistic/imports/MerchantFeedRow.java +++ b/src/main/java/group/goforward/battlbuilder/imports/MerchantFeedRow.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.imports; +package group.goforward.battlbuilder.imports; import java.math.BigDecimal; diff --git a/src/main/java/group/goforward/ballistic/imports/dto/MerchantFeedRow.java b/src/main/java/group/goforward/battlbuilder/imports/dto/MerchantFeedRow.java similarity index 84% rename from src/main/java/group/goforward/ballistic/imports/dto/MerchantFeedRow.java rename to src/main/java/group/goforward/battlbuilder/imports/dto/MerchantFeedRow.java index dfa6eb1..6fd50fd 100644 --- a/src/main/java/group/goforward/ballistic/imports/dto/MerchantFeedRow.java +++ b/src/main/java/group/goforward/battlbuilder/imports/dto/MerchantFeedRow.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.imports.dto; +package group.goforward.battlbuilder.imports.dto; import java.math.BigDecimal; diff --git a/src/main/java/group/goforward/ballistic/imports/dto/package-info.java b/src/main/java/group/goforward/battlbuilder/imports/dto/package-info.java similarity index 69% rename from src/main/java/group/goforward/ballistic/imports/dto/package-info.java rename to src/main/java/group/goforward/battlbuilder/imports/dto/package-info.java index b3a6e59..84694ef 100644 --- a/src/main/java/group/goforward/ballistic/imports/dto/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/imports/dto/package-info.java @@ -4,10 +4,10 @@ * * *

The main entry point for managing the inventory is the - * {@link group.goforward.ballistic.BattlBuilderApplication} class.

+ * {@link group.goforward.battlbuilder.BattlBuilderApplication} class.

* * @since 1.0 * @author Sean Strawsburg * @version 1.1 */ -package group.goforward.ballistic.imports.dto; \ No newline at end of file +package group.goforward.battlbuilder.imports.dto; \ No newline at end of file diff --git a/src/main/java/group/goforward/ballistic/model/Account.java b/src/main/java/group/goforward/battlbuilder/model/Account.java similarity index 94% rename from src/main/java/group/goforward/ballistic/model/Account.java rename to src/main/java/group/goforward/battlbuilder/model/Account.java index 08a1562..f898479 100644 --- a/src/main/java/group/goforward/ballistic/model/Account.java +++ b/src/main/java/group/goforward/battlbuilder/model/Account.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/group/goforward/ballistic/model/AffiliateCategoryMap.java b/src/main/java/group/goforward/battlbuilder/model/AffiliateCategoryMap.java similarity index 94% rename from src/main/java/group/goforward/ballistic/model/AffiliateCategoryMap.java rename to src/main/java/group/goforward/battlbuilder/model/AffiliateCategoryMap.java index 7d6fe26..fe99ee9 100644 --- a/src/main/java/group/goforward/ballistic/model/AffiliateCategoryMap.java +++ b/src/main/java/group/goforward/battlbuilder/model/AffiliateCategoryMap.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; diff --git a/src/main/java/group/goforward/ballistic/model/Brand.java b/src/main/java/group/goforward/battlbuilder/model/Brand.java similarity index 93% rename from src/main/java/group/goforward/ballistic/model/Brand.java rename to src/main/java/group/goforward/battlbuilder/model/Brand.java index f022d90..ffdab93 100644 --- a/src/main/java/group/goforward/ballistic/model/Brand.java +++ b/src/main/java/group/goforward/battlbuilder/model/Brand.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import org.hibernate.annotations.CreationTimestamp; diff --git a/src/main/java/group/goforward/ballistic/model/Build.java b/src/main/java/group/goforward/battlbuilder/model/Build.java similarity index 93% rename from src/main/java/group/goforward/ballistic/model/Build.java rename to src/main/java/group/goforward/battlbuilder/model/Build.java index f2abcd9..bf2fa77 100644 --- a/src/main/java/group/goforward/ballistic/model/Build.java +++ b/src/main/java/group/goforward/battlbuilder/model/Build.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/group/goforward/ballistic/model/BuildItem.java b/src/main/java/group/goforward/battlbuilder/model/BuildItem.java similarity index 94% rename from src/main/java/group/goforward/ballistic/model/BuildItem.java rename to src/main/java/group/goforward/battlbuilder/model/BuildItem.java index 7f35568..0294bc2 100644 --- a/src/main/java/group/goforward/ballistic/model/BuildItem.java +++ b/src/main/java/group/goforward/battlbuilder/model/BuildItem.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/group/goforward/ballistic/model/BuildsComponent.java b/src/main/java/group/goforward/battlbuilder/model/BuildsComponent.java similarity index 93% rename from src/main/java/group/goforward/ballistic/model/BuildsComponent.java rename to src/main/java/group/goforward/battlbuilder/model/BuildsComponent.java index 1dcc0c8..0c6dfeb 100644 --- a/src/main/java/group/goforward/ballistic/model/BuildsComponent.java +++ b/src/main/java/group/goforward/battlbuilder/model/BuildsComponent.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/group/goforward/ballistic/model/CategoryMapping.java b/src/main/java/group/goforward/battlbuilder/model/CategoryMapping.java similarity index 98% rename from src/main/java/group/goforward/ballistic/model/CategoryMapping.java rename to src/main/java/group/goforward/battlbuilder/model/CategoryMapping.java index 303fd85..319433e 100644 --- a/src/main/java/group/goforward/ballistic/model/CategoryMapping.java +++ b/src/main/java/group/goforward/battlbuilder/model/CategoryMapping.java @@ -1,5 +1,5 @@ // src/main/java/group/goforward/ballistic/model/CategoryMapping.java -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import java.time.OffsetDateTime; diff --git a/src/main/java/group/goforward/ballistic/model/ComponentType.java b/src/main/java/group/goforward/battlbuilder/model/ComponentType.java similarity index 93% rename from src/main/java/group/goforward/ballistic/model/ComponentType.java rename to src/main/java/group/goforward/battlbuilder/model/ComponentType.java index 6106eae..0272b86 100644 --- a/src/main/java/group/goforward/ballistic/model/ComponentType.java +++ b/src/main/java/group/goforward/battlbuilder/model/ComponentType.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/group/goforward/ballistic/model/FeedImport.java b/src/main/java/group/goforward/battlbuilder/model/FeedImport.java similarity index 93% rename from src/main/java/group/goforward/ballistic/model/FeedImport.java rename to src/main/java/group/goforward/battlbuilder/model/FeedImport.java index 3b84d22..5b258b4 100644 --- a/src/main/java/group/goforward/ballistic/model/FeedImport.java +++ b/src/main/java/group/goforward/battlbuilder/model/FeedImport.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; diff --git a/src/main/java/group/goforward/ballistic/model/ImportStatus.java b/src/main/java/group/goforward/battlbuilder/model/ImportStatus.java similarity index 83% rename from src/main/java/group/goforward/ballistic/model/ImportStatus.java rename to src/main/java/group/goforward/battlbuilder/model/ImportStatus.java index d4a6b64..bd0047c 100644 --- a/src/main/java/group/goforward/ballistic/model/ImportStatus.java +++ b/src/main/java/group/goforward/battlbuilder/model/ImportStatus.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; public enum ImportStatus { PENDING_MAPPING, // Ingested but not fully mapped / trusted diff --git a/src/main/java/group/goforward/ballistic/model/Merchant.java b/src/main/java/group/goforward/battlbuilder/model/Merchant.java similarity index 94% rename from src/main/java/group/goforward/ballistic/model/Merchant.java rename to src/main/java/group/goforward/battlbuilder/model/Merchant.java index a8fb407..f757e47 100644 --- a/src/main/java/group/goforward/ballistic/model/Merchant.java +++ b/src/main/java/group/goforward/battlbuilder/model/Merchant.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import org.hibernate.annotations.ColumnDefault; diff --git a/src/main/java/group/goforward/ballistic/model/MerchantCategoryMap.java b/src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMap.java similarity index 94% rename from src/main/java/group/goforward/ballistic/model/MerchantCategoryMap.java rename to src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMap.java index d319ab5..92889ad 100644 --- a/src/main/java/group/goforward/ballistic/model/MerchantCategoryMap.java +++ b/src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMap.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/group/goforward/ballistic/model/MerchantCategoryMapping.java b/src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMapping.java similarity index 92% rename from src/main/java/group/goforward/ballistic/model/MerchantCategoryMapping.java rename to src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMapping.java index 3b2338a..86d4b44 100644 --- a/src/main/java/group/goforward/ballistic/model/MerchantCategoryMapping.java +++ b/src/main/java/group/goforward/battlbuilder/model/MerchantCategoryMapping.java @@ -1,10 +1,8 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import java.time.OffsetDateTime; -import group.goforward.ballistic.model.ProductConfiguration; - @Entity @Table( name = "merchant_category_mappings", diff --git a/src/main/java/group/goforward/ballistic/model/PartCategory.java b/src/main/java/group/goforward/battlbuilder/model/PartCategory.java similarity index 93% rename from src/main/java/group/goforward/ballistic/model/PartCategory.java rename to src/main/java/group/goforward/battlbuilder/model/PartCategory.java index a129b37..fd3871a 100644 --- a/src/main/java/group/goforward/ballistic/model/PartCategory.java +++ b/src/main/java/group/goforward/battlbuilder/model/PartCategory.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import org.hibernate.annotations.ColumnDefault; diff --git a/src/main/java/group/goforward/ballistic/model/PartRoleCategoryMapping.java b/src/main/java/group/goforward/battlbuilder/model/PartRoleCategoryMapping.java similarity index 97% rename from src/main/java/group/goforward/ballistic/model/PartRoleCategoryMapping.java rename to src/main/java/group/goforward/battlbuilder/model/PartRoleCategoryMapping.java index 07bdea8..65d5bc4 100644 --- a/src/main/java/group/goforward/ballistic/model/PartRoleCategoryMapping.java +++ b/src/main/java/group/goforward/battlbuilder/model/PartRoleCategoryMapping.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import java.time.OffsetDateTime; diff --git a/src/main/java/group/goforward/ballistic/model/PartRoleMapping.java b/src/main/java/group/goforward/battlbuilder/model/PartRoleMapping.java similarity index 98% rename from src/main/java/group/goforward/ballistic/model/PartRoleMapping.java rename to src/main/java/group/goforward/battlbuilder/model/PartRoleMapping.java index 4d23d7e..b469efe 100644 --- a/src/main/java/group/goforward/ballistic/model/PartRoleMapping.java +++ b/src/main/java/group/goforward/battlbuilder/model/PartRoleMapping.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import java.time.OffsetDateTime; diff --git a/src/main/java/group/goforward/ballistic/model/Platform.java b/src/main/java/group/goforward/battlbuilder/model/Platform.java similarity index 93% rename from src/main/java/group/goforward/ballistic/model/Platform.java rename to src/main/java/group/goforward/battlbuilder/model/Platform.java index f2d826b..2f47fb0 100644 --- a/src/main/java/group/goforward/ballistic/model/Platform.java +++ b/src/main/java/group/goforward/battlbuilder/model/Platform.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/group/goforward/ballistic/model/PriceHistory.java b/src/main/java/group/goforward/battlbuilder/model/PriceHistory.java similarity index 92% rename from src/main/java/group/goforward/ballistic/model/PriceHistory.java rename to src/main/java/group/goforward/battlbuilder/model/PriceHistory.java index 2266b26..2ddb0ab 100644 --- a/src/main/java/group/goforward/ballistic/model/PriceHistory.java +++ b/src/main/java/group/goforward/battlbuilder/model/PriceHistory.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; diff --git a/src/main/java/group/goforward/ballistic/model/Product.java b/src/main/java/group/goforward/battlbuilder/model/Product.java similarity index 96% rename from src/main/java/group/goforward/ballistic/model/Product.java rename to src/main/java/group/goforward/battlbuilder/model/Product.java index 8e482ae..63208e6 100644 --- a/src/main/java/group/goforward/ballistic/model/Product.java +++ b/src/main/java/group/goforward/battlbuilder/model/Product.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import java.time.Instant; diff --git a/src/main/java/group/goforward/ballistic/model/ProductConfiguration.java b/src/main/java/group/goforward/battlbuilder/model/ProductConfiguration.java similarity index 86% rename from src/main/java/group/goforward/ballistic/model/ProductConfiguration.java rename to src/main/java/group/goforward/battlbuilder/model/ProductConfiguration.java index 2c8c7d8..b069df6 100644 --- a/src/main/java/group/goforward/ballistic/model/ProductConfiguration.java +++ b/src/main/java/group/goforward/battlbuilder/model/ProductConfiguration.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; public enum ProductConfiguration { STRIPPED, // bare receiver / component diff --git a/src/main/java/group/goforward/ballistic/model/ProductOffer.java b/src/main/java/group/goforward/battlbuilder/model/ProductOffer.java similarity index 95% rename from src/main/java/group/goforward/ballistic/model/ProductOffer.java rename to src/main/java/group/goforward/battlbuilder/model/ProductOffer.java index dace70a..7219cce 100644 --- a/src/main/java/group/goforward/ballistic/model/ProductOffer.java +++ b/src/main/java/group/goforward/battlbuilder/model/ProductOffer.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import org.hibernate.annotations.ColumnDefault; diff --git a/src/main/java/group/goforward/ballistic/model/State.java b/src/main/java/group/goforward/battlbuilder/model/State.java similarity index 90% rename from src/main/java/group/goforward/ballistic/model/State.java rename to src/main/java/group/goforward/battlbuilder/model/State.java index 881f130..5e540e4 100644 --- a/src/main/java/group/goforward/ballistic/model/State.java +++ b/src/main/java/group/goforward/battlbuilder/model/State.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/group/goforward/ballistic/model/User.java b/src/main/java/group/goforward/battlbuilder/model/User.java similarity index 99% rename from src/main/java/group/goforward/ballistic/model/User.java rename to src/main/java/group/goforward/battlbuilder/model/User.java index fa3661a..3b8f15d 100644 --- a/src/main/java/group/goforward/ballistic/model/User.java +++ b/src/main/java/group/goforward/battlbuilder/model/User.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.*; import jakarta.validation.constraints.NotNull; diff --git a/src/main/java/group/goforward/ballistic/model/UserActivityLog.java b/src/main/java/group/goforward/battlbuilder/model/UserActivityLog.java similarity index 92% rename from src/main/java/group/goforward/ballistic/model/UserActivityLog.java rename to src/main/java/group/goforward/battlbuilder/model/UserActivityLog.java index 75804ec..cb361dd 100644 --- a/src/main/java/group/goforward/ballistic/model/UserActivityLog.java +++ b/src/main/java/group/goforward/battlbuilder/model/UserActivityLog.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.model; +package group.goforward.battlbuilder.model; import jakarta.persistence.Column; import jakarta.persistence.Entity; diff --git a/src/main/java/group/goforward/battlbuilder/model/package-info.java b/src/main/java/group/goforward/battlbuilder/model/package-info.java new file mode 100644 index 0000000..cd9db33 --- /dev/null +++ b/src/main/java/group/goforward/battlbuilder/model/package-info.java @@ -0,0 +1 @@ +package group.goforward.battlbuilder.model; \ No newline at end of file diff --git a/src/main/java/group/goforward/ballistic/repos/AccountRepository.java b/src/main/java/group/goforward/battlbuilder/repos/AccountRepository.java similarity index 61% rename from src/main/java/group/goforward/ballistic/repos/AccountRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/AccountRepository.java index dcf38ae..c9e73cd 100644 --- a/src/main/java/group/goforward/ballistic/repos/AccountRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/AccountRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.Account; +import group.goforward.battlbuilder.model.Account; import org.springframework.data.jpa.repository.JpaRepository; import java.util.UUID; diff --git a/src/main/java/group/goforward/ballistic/repos/BrandRepository.java b/src/main/java/group/goforward/battlbuilder/repos/BrandRepository.java similarity index 68% rename from src/main/java/group/goforward/ballistic/repos/BrandRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/BrandRepository.java index 58b63cc..836bec7 100644 --- a/src/main/java/group/goforward/ballistic/repos/BrandRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/BrandRepository.java @@ -1,5 +1,5 @@ -package group.goforward.ballistic.repos; -import group.goforward.ballistic.model.Brand; +package group.goforward.battlbuilder.repos; +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/ballistic/repos/BuildItemRepository.java b/src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java similarity index 74% rename from src/main/java/group/goforward/ballistic/repos/BuildItemRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java index bd9c97f..babcc92 100644 --- a/src/main/java/group/goforward/ballistic/repos/BuildItemRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.BuildsComponent; +import group.goforward.battlbuilder.model.BuildsComponent; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; import java.util.Optional; diff --git a/src/main/java/group/goforward/ballistic/repos/BuildRepository.java b/src/main/java/group/goforward/battlbuilder/repos/BuildRepository.java similarity index 69% rename from src/main/java/group/goforward/ballistic/repos/BuildRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/BuildRepository.java index a849ed8..622b1d3 100644 --- a/src/main/java/group/goforward/ballistic/repos/BuildRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/BuildRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.Build; +import group.goforward.battlbuilder.model.Build; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; import java.util.UUID; diff --git a/src/main/java/group/goforward/ballistic/repos/CategoryMappingRepository.java b/src/main/java/group/goforward/battlbuilder/repos/CategoryMappingRepository.java similarity index 80% rename from src/main/java/group/goforward/ballistic/repos/CategoryMappingRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/CategoryMappingRepository.java index b6132c0..4b1f281 100644 --- a/src/main/java/group/goforward/ballistic/repos/CategoryMappingRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/CategoryMappingRepository.java @@ -1,7 +1,7 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.CategoryMapping; -import group.goforward.ballistic.model.Merchant; +import group.goforward.battlbuilder.model.CategoryMapping; +import group.goforward.battlbuilder.model.Merchant; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/group/goforward/ballistic/repos/FeedImportRepository.java b/src/main/java/group/goforward/battlbuilder/repos/FeedImportRepository.java similarity index 58% rename from src/main/java/group/goforward/ballistic/repos/FeedImportRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/FeedImportRepository.java index 90adae7..5b8769c 100644 --- a/src/main/java/group/goforward/ballistic/repos/FeedImportRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/FeedImportRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.FeedImport; +import group.goforward.battlbuilder.model.FeedImport; import org.springframework.data.jpa.repository.JpaRepository; public interface FeedImportRepository extends JpaRepository { diff --git a/src/main/java/group/goforward/ballistic/repos/MerchantCategoryMappingRepository.java b/src/main/java/group/goforward/battlbuilder/repos/MerchantCategoryMappingRepository.java similarity index 80% rename from src/main/java/group/goforward/ballistic/repos/MerchantCategoryMappingRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/MerchantCategoryMappingRepository.java index 6a4de92..27ec803 100644 --- a/src/main/java/group/goforward/ballistic/repos/MerchantCategoryMappingRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/MerchantCategoryMappingRepository.java @@ -1,7 +1,7 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.Merchant; -import group.goforward.ballistic.model.MerchantCategoryMapping; +import group.goforward.battlbuilder.model.Merchant; +import group.goforward.battlbuilder.model.MerchantCategoryMapping; import java.util.List; import java.util.Optional; import org.springframework.data.jpa.repository.JpaRepository; diff --git a/src/main/java/group/goforward/ballistic/repos/MerchantRepository.java b/src/main/java/group/goforward/battlbuilder/repos/MerchantRepository.java similarity index 68% rename from src/main/java/group/goforward/ballistic/repos/MerchantRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/MerchantRepository.java index 853687f..49cb4aa 100644 --- a/src/main/java/group/goforward/ballistic/repos/MerchantRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/MerchantRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.Merchant; +import group.goforward.battlbuilder.model.Merchant; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/group/goforward/ballistic/repos/PartCategoryRepository.java b/src/main/java/group/goforward/battlbuilder/repos/PartCategoryRepository.java similarity index 76% rename from src/main/java/group/goforward/ballistic/repos/PartCategoryRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/PartCategoryRepository.java index aff326e..20d32c2 100644 --- a/src/main/java/group/goforward/ballistic/repos/PartCategoryRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/PartCategoryRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.PartCategory; +import group.goforward.battlbuilder.model.PartCategory; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/repos/PartRoleCategoryMappingRepository.java b/src/main/java/group/goforward/battlbuilder/repos/PartRoleCategoryMappingRepository.java similarity index 78% rename from src/main/java/group/goforward/ballistic/repos/PartRoleCategoryMappingRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/PartRoleCategoryMappingRepository.java index eef8305..09c36af 100644 --- a/src/main/java/group/goforward/ballistic/repos/PartRoleCategoryMappingRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/PartRoleCategoryMappingRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.PartRoleCategoryMapping; +import group.goforward.battlbuilder.model.PartRoleCategoryMapping; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/repos/PartRoleMappingRepository.java b/src/main/java/group/goforward/battlbuilder/repos/PartRoleMappingRepository.java similarity index 89% rename from src/main/java/group/goforward/ballistic/repos/PartRoleMappingRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/PartRoleMappingRepository.java index 91b7eb9..4759f01 100644 --- a/src/main/java/group/goforward/ballistic/repos/PartRoleMappingRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/PartRoleMappingRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.PartRoleMapping; +import group.goforward.battlbuilder.model.PartRoleMapping; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/repos/PriceHistoryRepository.java b/src/main/java/group/goforward/battlbuilder/repos/PriceHistoryRepository.java similarity index 58% rename from src/main/java/group/goforward/ballistic/repos/PriceHistoryRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/PriceHistoryRepository.java index 2a8423b..7e32dd3 100644 --- a/src/main/java/group/goforward/ballistic/repos/PriceHistoryRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/PriceHistoryRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.PriceHistory; +import group.goforward.battlbuilder.model.PriceHistory; import org.springframework.data.jpa.repository.JpaRepository; public interface PriceHistoryRepository extends JpaRepository { diff --git a/src/main/java/group/goforward/ballistic/repos/ProductOfferRepository.java b/src/main/java/group/goforward/battlbuilder/repos/ProductOfferRepository.java similarity index 88% rename from src/main/java/group/goforward/ballistic/repos/ProductOfferRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/ProductOfferRepository.java index bf59f18..428a1b1 100644 --- a/src/main/java/group/goforward/ballistic/repos/ProductOfferRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/ProductOfferRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.ProductOffer; +import group.goforward.battlbuilder.model.ProductOffer; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; diff --git a/src/main/java/group/goforward/ballistic/repos/ProductRepository.java b/src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java similarity index 94% rename from src/main/java/group/goforward/ballistic/repos/ProductRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java index 8886663..7049fec 100644 --- a/src/main/java/group/goforward/ballistic/repos/ProductRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/ProductRepository.java @@ -1,10 +1,8 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.ImportStatus; -import group.goforward.ballistic.model.Merchant; -import group.goforward.ballistic.model.MerchantCategoryMapping; -import group.goforward.ballistic.model.Brand; -import group.goforward.ballistic.model.Product; +import group.goforward.battlbuilder.model.ImportStatus; +import group.goforward.battlbuilder.model.Brand; +import group.goforward.battlbuilder.model.Product; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.query.Param; @@ -132,7 +130,7 @@ public interface ProductRepository extends JpaRepository { JOIN p.offers o JOIN o.merchant m WHERE p.deletedAt IS NULL - AND (p.importStatus = group.goforward.ballistic.model.ImportStatus.PENDING_MAPPING + AND (p.importStatus = group.goforward.battlbuilder.model.ImportStatus.PENDING_MAPPING OR p.partRole IS NULL OR LOWER(p.partRole) = 'unknown') AND p.rawCategoryKey IS NOT NULL diff --git a/src/main/java/group/goforward/ballistic/repos/StateRepository.java b/src/main/java/group/goforward/battlbuilder/repos/StateRepository.java similarity index 68% rename from src/main/java/group/goforward/ballistic/repos/StateRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/StateRepository.java index b808e98..3cc98c9 100644 --- a/src/main/java/group/goforward/ballistic/repos/StateRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/StateRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.State; +import group.goforward.battlbuilder.model.State; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/group/goforward/ballistic/repos/UserRepository.java b/src/main/java/group/goforward/battlbuilder/repos/UserRepository.java similarity index 81% rename from src/main/java/group/goforward/ballistic/repos/UserRepository.java rename to src/main/java/group/goforward/battlbuilder/repos/UserRepository.java index f77d7ed..b20f7f3 100644 --- a/src/main/java/group/goforward/ballistic/repos/UserRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/UserRepository.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.repos; +package group.goforward.battlbuilder.repos; -import group.goforward.ballistic.model.User; +import group.goforward.battlbuilder.model.User; import org.springframework.data.jpa.repository.JpaRepository; import java.util.Optional; diff --git a/src/main/java/group/goforward/ballistic/repos/package-info.java b/src/main/java/group/goforward/battlbuilder/repos/package-info.java similarity index 69% rename from src/main/java/group/goforward/ballistic/repos/package-info.java rename to src/main/java/group/goforward/battlbuilder/repos/package-info.java index e068668..a7d124f 100644 --- a/src/main/java/group/goforward/ballistic/repos/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/repos/package-info.java @@ -4,10 +4,10 @@ * * *

The main entry point for managing the inventory is the - * {@link group.goforward.ballistic.BattlBuilderApplication} class.

+ * {@link group.goforward.battlbuilder.BattlBuilderApplication} class.

* * @since 1.0 * @author Sean Strawsburg * @version 1.1 */ -package group.goforward.ballistic.repos; \ No newline at end of file +package group.goforward.battlbuilder.repos; \ No newline at end of file diff --git a/src/main/java/group/goforward/ballistic/security/CustomUserDetails.java b/src/main/java/group/goforward/battlbuilder/security/CustomUserDetails.java similarity index 93% rename from src/main/java/group/goforward/ballistic/security/CustomUserDetails.java rename to src/main/java/group/goforward/battlbuilder/security/CustomUserDetails.java index 94604ff..a229009 100644 --- a/src/main/java/group/goforward/ballistic/security/CustomUserDetails.java +++ b/src/main/java/group/goforward/battlbuilder/security/CustomUserDetails.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.security; +package group.goforward.battlbuilder.security; -import group.goforward.ballistic.model.User; +import group.goforward.battlbuilder.model.User; import org.springframework.security.core.GrantedAuthority; import org.springframework.security.core.authority.SimpleGrantedAuthority; import org.springframework.security.core.userdetails.UserDetails; diff --git a/src/main/java/group/goforward/ballistic/security/CustomUserDetailsService.java b/src/main/java/group/goforward/battlbuilder/security/CustomUserDetailsService.java similarity index 83% rename from src/main/java/group/goforward/ballistic/security/CustomUserDetailsService.java rename to src/main/java/group/goforward/battlbuilder/security/CustomUserDetailsService.java index 93efe9f..f22cf41 100644 --- a/src/main/java/group/goforward/ballistic/security/CustomUserDetailsService.java +++ b/src/main/java/group/goforward/battlbuilder/security/CustomUserDetailsService.java @@ -1,7 +1,7 @@ -package group.goforward.ballistic.security; +package group.goforward.battlbuilder.security; -import group.goforward.ballistic.model.User; -import group.goforward.ballistic.repos.UserRepository; +import group.goforward.battlbuilder.model.User; +import group.goforward.battlbuilder.repos.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/ballistic/security/JwtAuthenticationEntryPoint.java b/src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationEntryPoint.java similarity index 94% rename from src/main/java/group/goforward/ballistic/security/JwtAuthenticationEntryPoint.java rename to src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationEntryPoint.java index f9ff76b..4fb310d 100644 --- a/src/main/java/group/goforward/ballistic/security/JwtAuthenticationEntryPoint.java +++ b/src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationEntryPoint.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.security; +package group.goforward.battlbuilder.security; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/group/goforward/ballistic/security/JwtAuthenticationFilter.java b/src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationFilter.java similarity index 94% rename from src/main/java/group/goforward/ballistic/security/JwtAuthenticationFilter.java rename to src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationFilter.java index 6a8d70b..8c3090f 100644 --- a/src/main/java/group/goforward/ballistic/security/JwtAuthenticationFilter.java +++ b/src/main/java/group/goforward/battlbuilder/security/JwtAuthenticationFilter.java @@ -1,7 +1,7 @@ -package group.goforward.ballistic.security; +package group.goforward.battlbuilder.security; -import group.goforward.ballistic.model.User; -import group.goforward.ballistic.repos.UserRepository; +import group.goforward.battlbuilder.model.User; +import group.goforward.battlbuilder.repos.UserRepository; import jakarta.servlet.FilterChain; import jakarta.servlet.ServletException; import jakarta.servlet.http.HttpServletRequest; diff --git a/src/main/java/group/goforward/ballistic/security/JwtService.java b/src/main/java/group/goforward/battlbuilder/security/JwtService.java similarity index 95% rename from src/main/java/group/goforward/ballistic/security/JwtService.java rename to src/main/java/group/goforward/battlbuilder/security/JwtService.java index 9cef8d0..7d21137 100644 --- a/src/main/java/group/goforward/ballistic/security/JwtService.java +++ b/src/main/java/group/goforward/battlbuilder/security/JwtService.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.security; +package group.goforward.battlbuilder.security; -import group.goforward.ballistic.model.User; +import group.goforward.battlbuilder.model.User; import io.jsonwebtoken.Claims; import io.jsonwebtoken.Jwts; import io.jsonwebtoken.JwtException; diff --git a/src/main/java/group/goforward/ballistic/services/AdminDashboardService.java b/src/main/java/group/goforward/battlbuilder/services/AdminDashboardService.java similarity index 79% rename from src/main/java/group/goforward/ballistic/services/AdminDashboardService.java rename to src/main/java/group/goforward/battlbuilder/services/AdminDashboardService.java index f84238a..66c494b 100644 --- a/src/main/java/group/goforward/ballistic/services/AdminDashboardService.java +++ b/src/main/java/group/goforward/battlbuilder/services/AdminDashboardService.java @@ -1,10 +1,10 @@ -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.model.ImportStatus; -import group.goforward.ballistic.repos.MerchantCategoryMappingRepository; -import group.goforward.ballistic.repos.MerchantRepository; -import group.goforward.ballistic.repos.ProductRepository; -import group.goforward.ballistic.web.dto.AdminDashboardOverviewDto; +import group.goforward.battlbuilder.model.ImportStatus; +import group.goforward.battlbuilder.repos.MerchantCategoryMappingRepository; +import group.goforward.battlbuilder.repos.MerchantRepository; +import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.web.dto.AdminDashboardOverviewDto; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/group/goforward/ballistic/services/BrandService.java b/src/main/java/group/goforward/battlbuilder/services/BrandService.java similarity index 69% rename from src/main/java/group/goforward/ballistic/services/BrandService.java rename to src/main/java/group/goforward/battlbuilder/services/BrandService.java index ddf640d..dd99689 100644 --- a/src/main/java/group/goforward/ballistic/services/BrandService.java +++ b/src/main/java/group/goforward/battlbuilder/services/BrandService.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.model.Brand; +import group.goforward.battlbuilder.model.Brand; import java.util.List; import java.util.Optional; diff --git a/src/main/java/group/goforward/ballistic/services/CategoryMappingRecommendationService.java b/src/main/java/group/goforward/battlbuilder/services/CategoryMappingRecommendationService.java similarity index 92% rename from src/main/java/group/goforward/ballistic/services/CategoryMappingRecommendationService.java rename to src/main/java/group/goforward/battlbuilder/services/CategoryMappingRecommendationService.java index 92b1713..9e4ac94 100644 --- a/src/main/java/group/goforward/ballistic/services/CategoryMappingRecommendationService.java +++ b/src/main/java/group/goforward/battlbuilder/services/CategoryMappingRecommendationService.java @@ -1,9 +1,9 @@ // src/main/java/group/goforward/ballistic/services/CategoryMappingRecommendationService.java -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.model.Product; -import group.goforward.ballistic.repos.ProductRepository; -import group.goforward.ballistic.web.dto.CategoryMappingRecommendationDto; +import group.goforward.battlbuilder.model.Product; +import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.web.dto.CategoryMappingRecommendationDto; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/services/GunbuilderProductService.java b/src/main/java/group/goforward/battlbuilder/services/GunbuilderProductService.java similarity index 91% rename from src/main/java/group/goforward/ballistic/services/GunbuilderProductService.java rename to src/main/java/group/goforward/battlbuilder/services/GunbuilderProductService.java index 5733487..2838667 100644 --- a/src/main/java/group/goforward/ballistic/services/GunbuilderProductService.java +++ b/src/main/java/group/goforward/battlbuilder/services/GunbuilderProductService.java @@ -1,17 +1,16 @@ -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.model.PartCategory; -import group.goforward.ballistic.model.Product; -import group.goforward.ballistic.repos.ProductRepository; -import group.goforward.ballistic.web.dto.GunbuilderProductDto; +import group.goforward.battlbuilder.model.PartCategory; +import group.goforward.battlbuilder.model.Product; +import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.web.dto.GunbuilderProductDto; import org.springframework.stereotype.Service; -import group.goforward.ballistic.model.PartRoleMapping; -import group.goforward.ballistic.repos.PartRoleMappingRepository; -import group.goforward.ballistic.model.ImportStatus; +import group.goforward.battlbuilder.model.PartRoleMapping; +import group.goforward.battlbuilder.repos.PartRoleMappingRepository; +import group.goforward.battlbuilder.model.ImportStatus; import java.util.HashMap; import java.util.Map; -import java.util.Objects; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/services/ImportStatusAdminService.java b/src/main/java/group/goforward/battlbuilder/services/ImportStatusAdminService.java similarity index 80% rename from src/main/java/group/goforward/ballistic/services/ImportStatusAdminService.java rename to src/main/java/group/goforward/battlbuilder/services/ImportStatusAdminService.java index 896a493..7eb229d 100644 --- a/src/main/java/group/goforward/ballistic/services/ImportStatusAdminService.java +++ b/src/main/java/group/goforward/battlbuilder/services/ImportStatusAdminService.java @@ -1,10 +1,10 @@ // src/main/java/group/goforward/ballistic/services/ImportStatusAdminService.java -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.model.ImportStatus; -import group.goforward.ballistic.repos.ProductRepository; -import group.goforward.ballistic.web.dto.ImportStatusByMerchantDto; -import group.goforward.ballistic.web.dto.ImportStatusSummaryDto; +import group.goforward.battlbuilder.model.ImportStatus; +import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.web.dto.ImportStatusByMerchantDto; +import group.goforward.battlbuilder.web.dto.ImportStatusSummaryDto; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/services/MappingAdminService.java b/src/main/java/group/goforward/battlbuilder/services/MappingAdminService.java similarity index 87% rename from src/main/java/group/goforward/ballistic/services/MappingAdminService.java rename to src/main/java/group/goforward/battlbuilder/services/MappingAdminService.java index 90af277..6c07a3b 100644 --- a/src/main/java/group/goforward/ballistic/services/MappingAdminService.java +++ b/src/main/java/group/goforward/battlbuilder/services/MappingAdminService.java @@ -1,12 +1,12 @@ -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.model.ImportStatus; -import group.goforward.ballistic.model.Merchant; -import group.goforward.ballistic.model.MerchantCategoryMapping; -import group.goforward.ballistic.repos.MerchantCategoryMappingRepository; -import group.goforward.ballistic.repos.MerchantRepository; -import group.goforward.ballistic.repos.ProductRepository; -import group.goforward.ballistic.web.dto.PendingMappingBucketDto; +import group.goforward.battlbuilder.model.ImportStatus; +import group.goforward.battlbuilder.model.Merchant; +import group.goforward.battlbuilder.model.MerchantCategoryMapping; +import group.goforward.battlbuilder.repos.MerchantCategoryMappingRepository; +import group.goforward.battlbuilder.repos.MerchantRepository; +import group.goforward.battlbuilder.repos.ProductRepository; +import group.goforward.battlbuilder.web.dto.PendingMappingBucketDto; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/group/goforward/ballistic/services/MerchantCategoryMappingService.java b/src/main/java/group/goforward/battlbuilder/services/MerchantCategoryMappingService.java similarity index 91% rename from src/main/java/group/goforward/ballistic/services/MerchantCategoryMappingService.java rename to src/main/java/group/goforward/battlbuilder/services/MerchantCategoryMappingService.java index 35faaea..5c6d570 100644 --- a/src/main/java/group/goforward/ballistic/services/MerchantCategoryMappingService.java +++ b/src/main/java/group/goforward/battlbuilder/services/MerchantCategoryMappingService.java @@ -1,9 +1,9 @@ -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.model.Merchant; -import group.goforward.ballistic.model.MerchantCategoryMapping; -import group.goforward.ballistic.model.ProductConfiguration; -import group.goforward.ballistic.repos.MerchantCategoryMappingRepository; +import group.goforward.battlbuilder.model.Merchant; +import group.goforward.battlbuilder.model.MerchantCategoryMapping; +import group.goforward.battlbuilder.model.ProductConfiguration; +import group.goforward.battlbuilder.repos.MerchantCategoryMappingRepository; import jakarta.transaction.Transactional; import java.util.List; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/ballistic/services/MerchantFeedImportService.java b/src/main/java/group/goforward/battlbuilder/services/MerchantFeedImportService.java similarity index 86% rename from src/main/java/group/goforward/ballistic/services/MerchantFeedImportService.java rename to src/main/java/group/goforward/battlbuilder/services/MerchantFeedImportService.java index 5fea407..ac5d93c 100644 --- a/src/main/java/group/goforward/ballistic/services/MerchantFeedImportService.java +++ b/src/main/java/group/goforward/battlbuilder/services/MerchantFeedImportService.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; public interface MerchantFeedImportService { diff --git a/src/main/java/group/goforward/ballistic/services/PartCategoryResolverService.java b/src/main/java/group/goforward/battlbuilder/services/PartCategoryResolverService.java similarity index 82% rename from src/main/java/group/goforward/ballistic/services/PartCategoryResolverService.java rename to src/main/java/group/goforward/battlbuilder/services/PartCategoryResolverService.java index 12e0f52..62fbee7 100644 --- a/src/main/java/group/goforward/ballistic/services/PartCategoryResolverService.java +++ b/src/main/java/group/goforward/battlbuilder/services/PartCategoryResolverService.java @@ -1,8 +1,8 @@ -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.model.PartCategory; -import group.goforward.ballistic.model.PartRoleMapping; -import group.goforward.ballistic.repos.PartRoleMappingRepository; +import group.goforward.battlbuilder.model.PartCategory; +import group.goforward.battlbuilder.model.PartRoleMapping; +import group.goforward.battlbuilder.repos.PartRoleMappingRepository; import org.springframework.stereotype.Service; import java.util.Optional; diff --git a/src/main/java/group/goforward/ballistic/services/PartRoleMappingService.java b/src/main/java/group/goforward/battlbuilder/services/PartRoleMappingService.java similarity index 73% rename from src/main/java/group/goforward/ballistic/services/PartRoleMappingService.java rename to src/main/java/group/goforward/battlbuilder/services/PartRoleMappingService.java index cd9f507..5e0b52b 100644 --- a/src/main/java/group/goforward/ballistic/services/PartRoleMappingService.java +++ b/src/main/java/group/goforward/battlbuilder/services/PartRoleMappingService.java @@ -1,9 +1,9 @@ -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.repos.PartRoleMappingRepository; -import group.goforward.ballistic.web.dto.admin.PartRoleMappingDto; -import group.goforward.ballistic.web.dto.PartRoleToCategoryDto; -import group.goforward.ballistic.web.mapper.PartRoleMappingMapper; +import group.goforward.battlbuilder.repos.PartRoleMappingRepository; +import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto; +import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto; +import group.goforward.battlbuilder.web.mapper.PartRoleMappingMapper; import org.springframework.stereotype.Service; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/services/StatesService.java b/src/main/java/group/goforward/battlbuilder/services/StatesService.java similarity index 69% rename from src/main/java/group/goforward/ballistic/services/StatesService.java rename to src/main/java/group/goforward/battlbuilder/services/StatesService.java index a8d74c1..8d6241c 100644 --- a/src/main/java/group/goforward/ballistic/services/StatesService.java +++ b/src/main/java/group/goforward/battlbuilder/services/StatesService.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.model.State; +import group.goforward.battlbuilder.model.State; import java.util.List; import java.util.Optional; diff --git a/src/main/java/group/goforward/ballistic/services/UsersService.java b/src/main/java/group/goforward/battlbuilder/services/UsersService.java similarity index 69% rename from src/main/java/group/goforward/ballistic/services/UsersService.java rename to src/main/java/group/goforward/battlbuilder/services/UsersService.java index 59ebe13..58c34a8 100644 --- a/src/main/java/group/goforward/ballistic/services/UsersService.java +++ b/src/main/java/group/goforward/battlbuilder/services/UsersService.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.services; +package group.goforward.battlbuilder.services; -import group.goforward.ballistic.model.User; +import group.goforward.battlbuilder.model.User; import java.util.List; import java.util.Optional; diff --git a/src/main/java/group/goforward/ballistic/services/admin/AdminUserService.java b/src/main/java/group/goforward/battlbuilder/services/admin/AdminUserService.java similarity index 88% rename from src/main/java/group/goforward/ballistic/services/admin/AdminUserService.java rename to src/main/java/group/goforward/battlbuilder/services/admin/AdminUserService.java index de6c0f0..f330866 100644 --- a/src/main/java/group/goforward/ballistic/services/admin/AdminUserService.java +++ b/src/main/java/group/goforward/battlbuilder/services/admin/AdminUserService.java @@ -1,8 +1,8 @@ -package group.goforward.ballistic.services.admin; +package group.goforward.battlbuilder.services.admin; -import group.goforward.ballistic.model.User; -import group.goforward.ballistic.repos.UserRepository; -import group.goforward.ballistic.web.dto.admin.AdminUserDto; +import group.goforward.battlbuilder.model.User; +import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.web.dto.admin.AdminUserDto; import org.springframework.security.core.Authentication; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; diff --git a/src/main/java/group/goforward/ballistic/services/impl/BrandServiceImpl.java b/src/main/java/group/goforward/battlbuilder/services/impl/BrandServiceImpl.java similarity index 74% rename from src/main/java/group/goforward/ballistic/services/impl/BrandServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/services/impl/BrandServiceImpl.java index 65c63e5..5dd357d 100644 --- a/src/main/java/group/goforward/ballistic/services/impl/BrandServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/services/impl/BrandServiceImpl.java @@ -1,9 +1,9 @@ -package group.goforward.ballistic.services.impl; +package group.goforward.battlbuilder.services.impl; -import group.goforward.ballistic.model.Brand; -import group.goforward.ballistic.repos.BrandRepository; -import group.goforward.ballistic.services.BrandService; +import group.goforward.battlbuilder.model.Brand; +import group.goforward.battlbuilder.repos.BrandRepository; +import group.goforward.battlbuilder.services.BrandService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/ballistic/services/impl/MerchantFeedImportServiceImpl.java b/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java similarity index 96% rename from src/main/java/group/goforward/ballistic/services/impl/MerchantFeedImportServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java index 9370132..b983b37 100644 --- a/src/main/java/group/goforward/ballistic/services/impl/MerchantFeedImportServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/services/impl/MerchantFeedImportServiceImpl.java @@ -1,18 +1,18 @@ -package group.goforward.ballistic.services.impl; +package group.goforward.battlbuilder.services.impl; -import group.goforward.ballistic.imports.MerchantFeedRow; -import group.goforward.ballistic.model.Brand; -import group.goforward.ballistic.model.ImportStatus; -import group.goforward.ballistic.model.Merchant; -import group.goforward.ballistic.model.MerchantCategoryMapping; -import group.goforward.ballistic.model.Product; -import group.goforward.ballistic.model.ProductOffer; -import group.goforward.ballistic.repos.BrandRepository; -import group.goforward.ballistic.repos.MerchantRepository; -import group.goforward.ballistic.repos.ProductOfferRepository; -import group.goforward.ballistic.repos.ProductRepository; -import group.goforward.ballistic.services.MerchantCategoryMappingService; -import group.goforward.ballistic.services.MerchantFeedImportService; +import group.goforward.battlbuilder.imports.MerchantFeedRow; +import group.goforward.battlbuilder.model.Brand; +import group.goforward.battlbuilder.model.ImportStatus; +import group.goforward.battlbuilder.model.Merchant; +import group.goforward.battlbuilder.model.MerchantCategoryMapping; +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.services.MerchantCategoryMappingService; +import group.goforward.battlbuilder.services.MerchantFeedImportService; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVParser; import org.apache.commons.csv.CSVRecord; diff --git a/src/main/java/group/goforward/ballistic/services/impl/StatesServiceImpl.java b/src/main/java/group/goforward/battlbuilder/services/impl/StatesServiceImpl.java similarity index 74% rename from src/main/java/group/goforward/ballistic/services/impl/StatesServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/services/impl/StatesServiceImpl.java index 8d3d44a..19c20d4 100644 --- a/src/main/java/group/goforward/ballistic/services/impl/StatesServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/services/impl/StatesServiceImpl.java @@ -1,9 +1,9 @@ -package group.goforward.ballistic.services.impl; +package group.goforward.battlbuilder.services.impl; -import group.goforward.ballistic.model.State; -import group.goforward.ballistic.repos.StateRepository; -import group.goforward.ballistic.services.StatesService; +import group.goforward.battlbuilder.model.State; +import group.goforward.battlbuilder.repos.StateRepository; +import group.goforward.battlbuilder.services.StatesService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/ballistic/services/impl/UsersServiceImpl.java b/src/main/java/group/goforward/battlbuilder/services/impl/UsersServiceImpl.java similarity index 74% rename from src/main/java/group/goforward/ballistic/services/impl/UsersServiceImpl.java rename to src/main/java/group/goforward/battlbuilder/services/impl/UsersServiceImpl.java index a3b1cf8..a99fa47 100644 --- a/src/main/java/group/goforward/ballistic/services/impl/UsersServiceImpl.java +++ b/src/main/java/group/goforward/battlbuilder/services/impl/UsersServiceImpl.java @@ -1,8 +1,8 @@ -package group.goforward.ballistic.services.impl; +package group.goforward.battlbuilder.services.impl; -import group.goforward.ballistic.model.User; -import group.goforward.ballistic.repos.UserRepository; -import group.goforward.ballistic.services.UsersService; +import group.goforward.battlbuilder.model.User; +import group.goforward.battlbuilder.repos.UserRepository; +import group.goforward.battlbuilder.services.UsersService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; diff --git a/src/main/java/group/goforward/ballistic/services/impl/package-info.java b/src/main/java/group/goforward/battlbuilder/services/impl/package-info.java similarity index 72% rename from src/main/java/group/goforward/ballistic/services/impl/package-info.java rename to src/main/java/group/goforward/battlbuilder/services/impl/package-info.java index 0419b2e..e822f88 100644 --- a/src/main/java/group/goforward/ballistic/services/impl/package-info.java +++ b/src/main/java/group/goforward/battlbuilder/services/impl/package-info.java @@ -4,10 +4,10 @@ * * *

The main entry point for managing the inventory is the - * {@link group.goforward.ballistic.BattlBuilderApplication} class.

+ * {@link group.goforward.battlbuilder.BattlBuilderApplication} class.

* * @since 1.0 * @author Don Strawsburg * @version 1.1 */ -package group.goforward.ballistic.services.impl; \ No newline at end of file +package group.goforward.battlbuilder.services.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/services/package-info.java new file mode 100644 index 0000000..d14c180 --- /dev/null +++ b/src/main/java/group/goforward/battlbuilder/services/package-info.java @@ -0,0 +1 @@ +package group.goforward.battlbuilder.services; \ No newline at end of file diff --git a/src/main/java/group/goforward/ballistic/web/GunbuilderProductController.java b/src/main/java/group/goforward/battlbuilder/web/GunbuilderProductController.java similarity index 93% rename from src/main/java/group/goforward/ballistic/web/GunbuilderProductController.java rename to src/main/java/group/goforward/battlbuilder/web/GunbuilderProductController.java index 4fbd505..c945bb5 100644 --- a/src/main/java/group/goforward/ballistic/web/GunbuilderProductController.java +++ b/src/main/java/group/goforward/battlbuilder/web/GunbuilderProductController.java @@ -1,13 +1,12 @@ -package group.goforward.ballistic.web; +package group.goforward.battlbuilder.web; -import group.goforward.ballistic.services.GunbuilderProductService; -import group.goforward.ballistic.web.dto.GunbuilderProductDto; +import group.goforward.battlbuilder.services.GunbuilderProductService; +import group.goforward.battlbuilder.web.dto.GunbuilderProductDto; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; -import java.io.Serializable; import java.util.List; import java.util.Map; diff --git a/src/main/java/group/goforward/ballistic/web/PartRoleMappingController.java b/src/main/java/group/goforward/battlbuilder/web/PartRoleMappingController.java similarity index 75% rename from src/main/java/group/goforward/ballistic/web/PartRoleMappingController.java rename to src/main/java/group/goforward/battlbuilder/web/PartRoleMappingController.java index d68568c..4df445d 100644 --- a/src/main/java/group/goforward/ballistic/web/PartRoleMappingController.java +++ b/src/main/java/group/goforward/battlbuilder/web/PartRoleMappingController.java @@ -1,8 +1,8 @@ -package group.goforward.ballistic.web; +package group.goforward.battlbuilder.web; -import group.goforward.ballistic.services.PartRoleMappingService; -import group.goforward.ballistic.web.dto.admin.PartRoleMappingDto; -import group.goforward.ballistic.web.dto.PartRoleToCategoryDto; +import group.goforward.battlbuilder.services.PartRoleMappingService; +import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto; +import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto; import org.springframework.web.bind.annotation.*; import java.util.List; diff --git a/src/main/java/group/goforward/ballistic/web/admin/AdminImportStatusController.java b/src/main/java/group/goforward/battlbuilder/web/admin/AdminImportStatusController.java similarity index 92% rename from src/main/java/group/goforward/ballistic/web/admin/AdminImportStatusController.java rename to src/main/java/group/goforward/battlbuilder/web/admin/AdminImportStatusController.java index 962c868..f960a38 100644 --- a/src/main/java/group/goforward/ballistic/web/admin/AdminImportStatusController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/AdminImportStatusController.java @@ -1,7 +1,7 @@ -package group.goforward.ballistic.web.admin; +package group.goforward.battlbuilder.web.admin; -import group.goforward.ballistic.model.ImportStatus; -import group.goforward.ballistic.repos.ProductRepository; +import group.goforward.battlbuilder.model.ImportStatus; +import group.goforward.battlbuilder.repos.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/ballistic/web/admin/AdminMappingController.java b/src/main/java/group/goforward/battlbuilder/web/admin/AdminMappingController.java similarity index 86% rename from src/main/java/group/goforward/ballistic/web/admin/AdminMappingController.java rename to src/main/java/group/goforward/battlbuilder/web/admin/AdminMappingController.java index 0135eec..12454d5 100644 --- a/src/main/java/group/goforward/ballistic/web/admin/AdminMappingController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/AdminMappingController.java @@ -1,7 +1,7 @@ -package group.goforward.ballistic.web.admin; +package group.goforward.battlbuilder.web.admin; -import group.goforward.ballistic.services.MappingAdminService; -import group.goforward.ballistic.web.dto.PendingMappingBucketDto; +import group.goforward.battlbuilder.services.MappingAdminService; +import group.goforward.battlbuilder.web.dto.PendingMappingBucketDto; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/ballistic/web/admin/AdminMerchantController.java b/src/main/java/group/goforward/battlbuilder/web/admin/AdminMerchantController.java similarity index 89% rename from src/main/java/group/goforward/ballistic/web/admin/AdminMerchantController.java rename to src/main/java/group/goforward/battlbuilder/web/admin/AdminMerchantController.java index ca5ee46..93c1537 100644 --- a/src/main/java/group/goforward/ballistic/web/admin/AdminMerchantController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/AdminMerchantController.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.web.admin; +package group.goforward.battlbuilder.web.admin; -import group.goforward.ballistic.services.MerchantFeedImportService; +import group.goforward.battlbuilder.services.MerchantFeedImportService; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/ballistic/web/admin/AdminUserController.java b/src/main/java/group/goforward/battlbuilder/web/admin/AdminUserController.java similarity index 78% rename from src/main/java/group/goforward/ballistic/web/admin/AdminUserController.java rename to src/main/java/group/goforward/battlbuilder/web/admin/AdminUserController.java index e3fe03c..3eece07 100644 --- a/src/main/java/group/goforward/ballistic/web/admin/AdminUserController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/AdminUserController.java @@ -1,8 +1,8 @@ -package group.goforward.ballistic.web.admin; +package group.goforward.battlbuilder.web.admin; -import group.goforward.ballistic.services.admin.AdminUserService; -import group.goforward.ballistic.web.dto.admin.AdminUserDto; -import group.goforward.ballistic.web.dto.admin.UpdateUserRoleRequest; +import group.goforward.battlbuilder.services.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; import org.springframework.security.core.Authentication; import org.springframework.web.bind.annotation.*; diff --git a/src/main/java/group/goforward/ballistic/web/admin/CategoryMappingAdminController.java b/src/main/java/group/goforward/battlbuilder/web/admin/CategoryMappingAdminController.java similarity index 91% rename from src/main/java/group/goforward/ballistic/web/admin/CategoryMappingAdminController.java rename to src/main/java/group/goforward/battlbuilder/web/admin/CategoryMappingAdminController.java index 94d4b35..d5e914f 100644 --- a/src/main/java/group/goforward/ballistic/web/admin/CategoryMappingAdminController.java +++ b/src/main/java/group/goforward/battlbuilder/web/admin/CategoryMappingAdminController.java @@ -1,12 +1,11 @@ -package group.goforward.ballistic.web.admin; +package group.goforward.battlbuilder.web.admin; -import group.goforward.ballistic.services.MappingAdminService; -import group.goforward.ballistic.web.dto.PendingMappingBucketDto; +import group.goforward.battlbuilder.services.MappingAdminService; +import group.goforward.battlbuilder.web.dto.PendingMappingBucketDto; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; import java.util.List; -import java.util.Map; @RestController @RequestMapping("/api/admin/mappings") diff --git a/src/main/java/group/goforward/ballistic/web/dto/CategoryMappingRecommendationDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/CategoryMappingRecommendationDto.java similarity index 86% rename from src/main/java/group/goforward/ballistic/web/dto/CategoryMappingRecommendationDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/CategoryMappingRecommendationDto.java index 04502df..e1bdac7 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/CategoryMappingRecommendationDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/CategoryMappingRecommendationDto.java @@ -1,5 +1,5 @@ // src/main/java/group/goforward/ballistic/web/dto/CategoryMappingRecommendationDto.java -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; public record CategoryMappingRecommendationDto( String merchantName, diff --git a/src/main/java/group/goforward/ballistic/web/dto/GunbuilderProductDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/GunbuilderProductDto.java similarity index 97% rename from src/main/java/group/goforward/ballistic/web/dto/GunbuilderProductDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/GunbuilderProductDto.java index 624f9dc..d28ca13 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/GunbuilderProductDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/GunbuilderProductDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; import java.math.BigDecimal; diff --git a/src/main/java/group/goforward/ballistic/web/dto/ImportStatusByMerchantDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/ImportStatusByMerchantDto.java similarity index 69% rename from src/main/java/group/goforward/ballistic/web/dto/ImportStatusByMerchantDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/ImportStatusByMerchantDto.java index 1bb2f92..5e33ea1 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/ImportStatusByMerchantDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/ImportStatusByMerchantDto.java @@ -1,7 +1,7 @@ // src/main/java/group/goforward/ballistic/web/dto/ImportStatusByMerchantDto.java -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; -import group.goforward.ballistic.model.ImportStatus; +import group.goforward.battlbuilder.model.ImportStatus; public record ImportStatusByMerchantDto( String merchantName, diff --git a/src/main/java/group/goforward/ballistic/web/dto/ImportStatusSummaryDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/ImportStatusSummaryDto.java similarity index 62% rename from src/main/java/group/goforward/ballistic/web/dto/ImportStatusSummaryDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/ImportStatusSummaryDto.java index 6bf8cb5..b86aa7d 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/ImportStatusSummaryDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/ImportStatusSummaryDto.java @@ -1,7 +1,7 @@ // src/main/java/group/goforward/ballistic/web/dto/ImportStatusSummaryDto.java -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; -import group.goforward.ballistic.model.ImportStatus; +import group.goforward.battlbuilder.model.ImportStatus; public record ImportStatusSummaryDto( ImportStatus status, diff --git a/src/main/java/group/goforward/ballistic/web/dto/MerchantAdminDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/MerchantAdminDto.java similarity index 92% rename from src/main/java/group/goforward/ballistic/web/dto/MerchantAdminDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/MerchantAdminDto.java index 56da0ab..c10425e 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/MerchantAdminDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/MerchantAdminDto.java @@ -1,5 +1,5 @@ // MerchantAdminDto.java -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; import java.time.OffsetDateTime; diff --git a/src/main/java/group/goforward/ballistic/web/dto/MerchantCategoryMappingDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/MerchantCategoryMappingDto.java similarity index 91% rename from src/main/java/group/goforward/ballistic/web/dto/MerchantCategoryMappingDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/MerchantCategoryMappingDto.java index 8c8618e..d31b631 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/MerchantCategoryMappingDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/MerchantCategoryMappingDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; public class MerchantCategoryMappingDto { diff --git a/src/main/java/group/goforward/ballistic/web/dto/PartRoleToCategoryDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/PartRoleToCategoryDto.java similarity index 77% rename from src/main/java/group/goforward/ballistic/web/dto/PartRoleToCategoryDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/PartRoleToCategoryDto.java index 1dcd3ba..9aa570a 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/PartRoleToCategoryDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/PartRoleToCategoryDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; public record PartRoleToCategoryDto( String platform, diff --git a/src/main/java/group/goforward/ballistic/web/dto/PendingMappingBucketDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/PendingMappingBucketDto.java similarity index 80% rename from src/main/java/group/goforward/ballistic/web/dto/PendingMappingBucketDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/PendingMappingBucketDto.java index 74c70a8..6316836 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/PendingMappingBucketDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/PendingMappingBucketDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; public record PendingMappingBucketDto( Integer merchantId, diff --git a/src/main/java/group/goforward/ballistic/web/dto/ProductOfferDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/ProductOfferDto.java similarity index 92% rename from src/main/java/group/goforward/ballistic/web/dto/ProductOfferDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/ProductOfferDto.java index 980ecb8..b2c34bd 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/ProductOfferDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/ProductOfferDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; import java.math.BigDecimal; import java.time.OffsetDateTime; diff --git a/src/main/java/group/goforward/ballistic/web/dto/ProductSummaryDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/ProductSummaryDto.java similarity index 92% rename from src/main/java/group/goforward/ballistic/web/dto/ProductSummaryDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/ProductSummaryDto.java index c7f3cdc..9b10d82 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/ProductSummaryDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/ProductSummaryDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; import java.math.BigDecimal; diff --git a/src/main/java/group/goforward/ballistic/web/dto/UpsertMerchantCategoryMappingRequest.java b/src/main/java/group/goforward/battlbuilder/web/dto/UpsertMerchantCategoryMappingRequest.java similarity index 90% rename from src/main/java/group/goforward/ballistic/web/dto/UpsertMerchantCategoryMappingRequest.java rename to src/main/java/group/goforward/battlbuilder/web/dto/UpsertMerchantCategoryMappingRequest.java index d910b77..3824108 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/UpsertMerchantCategoryMappingRequest.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/UpsertMerchantCategoryMappingRequest.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; public class UpsertMerchantCategoryMappingRequest { diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/AdminDashboardOverviewDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/AdminDashboardOverviewDto.java similarity index 95% rename from src/main/java/group/goforward/ballistic/web/dto/admin/AdminDashboardOverviewDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/AdminDashboardOverviewDto.java index ad9316d..130cdd1 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/AdminDashboardOverviewDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/AdminDashboardOverviewDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto; +package group.goforward.battlbuilder.web.dto; public class AdminDashboardOverviewDto { diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/AdminPartRoleMappingDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/AdminPartRoleMappingDto.java similarity index 78% rename from src/main/java/group/goforward/ballistic/web/dto/admin/AdminPartRoleMappingDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/AdminPartRoleMappingDto.java index 1146848..e48e9cb 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/AdminPartRoleMappingDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/AdminPartRoleMappingDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; public record AdminPartRoleMappingDto( Integer id, diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/AdminUserDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/AdminUserDto.java similarity index 94% rename from src/main/java/group/goforward/ballistic/web/dto/admin/AdminUserDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/AdminUserDto.java index 6614211..6f0f06f 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/AdminUserDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/AdminUserDto.java @@ -1,6 +1,6 @@ -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; -import group.goforward.ballistic.model.User; +import group.goforward.battlbuilder.model.User; import java.time.OffsetDateTime; import java.util.UUID; diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/CreatePartRoleMappingRequest.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/CreatePartRoleMappingRequest.java similarity index 74% rename from src/main/java/group/goforward/ballistic/web/dto/admin/CreatePartRoleMappingRequest.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/CreatePartRoleMappingRequest.java index 74445c9..95ceb45 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/CreatePartRoleMappingRequest.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/CreatePartRoleMappingRequest.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; public record CreatePartRoleMappingRequest( String platform, diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/MerchantCategoryMappingDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/MerchantCategoryMappingDto.java similarity index 85% rename from src/main/java/group/goforward/ballistic/web/dto/admin/MerchantCategoryMappingDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/MerchantCategoryMappingDto.java index f8e8f76..d7eb569 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/MerchantCategoryMappingDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/MerchantCategoryMappingDto.java @@ -1,5 +1,5 @@ // src/main/java/group/goforward/ballistic/web/dto/admin/MerchantCategoryMappingDto.java -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; public record MerchantCategoryMappingDto( Integer id, diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/PartCategoryDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/PartCategoryDto.java similarity index 77% rename from src/main/java/group/goforward/ballistic/web/dto/admin/PartCategoryDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/PartCategoryDto.java index 17e5963..77aa200 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/PartCategoryDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/PartCategoryDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; public record PartCategoryDto( Integer id, diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/PartRoleMappingDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/PartRoleMappingDto.java similarity index 81% rename from src/main/java/group/goforward/ballistic/web/dto/admin/PartRoleMappingDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/PartRoleMappingDto.java index 64317e1..32096fe 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/PartRoleMappingDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/PartRoleMappingDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; public record PartRoleMappingDto( Integer id, diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/PartRoleMappingRequest.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/PartRoleMappingRequest.java similarity index 73% rename from src/main/java/group/goforward/ballistic/web/dto/admin/PartRoleMappingRequest.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/PartRoleMappingRequest.java index 45a4074..de438f2 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/PartRoleMappingRequest.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/PartRoleMappingRequest.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; public record PartRoleMappingRequest( String platform, diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/SimpleMerchantDto.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/SimpleMerchantDto.java similarity index 60% rename from src/main/java/group/goforward/ballistic/web/dto/admin/SimpleMerchantDto.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/SimpleMerchantDto.java index 4f7f2a6..132061f 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/SimpleMerchantDto.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/SimpleMerchantDto.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; public record SimpleMerchantDto( Integer id, diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/UpdateMerchantCategoryMappingRequest.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/UpdateMerchantCategoryMappingRequest.java similarity index 62% rename from src/main/java/group/goforward/ballistic/web/dto/admin/UpdateMerchantCategoryMappingRequest.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/UpdateMerchantCategoryMappingRequest.java index 4e55bc4..f713f59 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/UpdateMerchantCategoryMappingRequest.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/UpdateMerchantCategoryMappingRequest.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; public record UpdateMerchantCategoryMappingRequest( Integer partCategoryId diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/UpdatePartRoleMappingRequest.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/UpdatePartRoleMappingRequest.java similarity index 74% rename from src/main/java/group/goforward/ballistic/web/dto/admin/UpdatePartRoleMappingRequest.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/UpdatePartRoleMappingRequest.java index b70b9f6..2a7790d 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/UpdatePartRoleMappingRequest.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/UpdatePartRoleMappingRequest.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; public record UpdatePartRoleMappingRequest( String platform, diff --git a/src/main/java/group/goforward/ballistic/web/dto/admin/UpdateUserRoleRequest.java b/src/main/java/group/goforward/battlbuilder/web/dto/admin/UpdateUserRoleRequest.java similarity index 86% rename from src/main/java/group/goforward/ballistic/web/dto/admin/UpdateUserRoleRequest.java rename to src/main/java/group/goforward/battlbuilder/web/dto/admin/UpdateUserRoleRequest.java index e03bfb9..2058fe6 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/admin/UpdateUserRoleRequest.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/admin/UpdateUserRoleRequest.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.admin; +package group.goforward.battlbuilder.web.dto.admin; public class UpdateUserRoleRequest { diff --git a/src/main/java/group/goforward/ballistic/web/dto/auth/AuthResponse.java b/src/main/java/group/goforward/battlbuilder/web/dto/auth/AuthResponse.java similarity index 94% rename from src/main/java/group/goforward/ballistic/web/dto/auth/AuthResponse.java rename to src/main/java/group/goforward/battlbuilder/web/dto/auth/AuthResponse.java index 9983203..0a39334 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/auth/AuthResponse.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/auth/AuthResponse.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.auth; +package group.goforward.battlbuilder.web.dto.auth; public class AuthResponse { private String token; diff --git a/src/main/java/group/goforward/ballistic/web/dto/auth/LoginRequest.java b/src/main/java/group/goforward/battlbuilder/web/dto/auth/LoginRequest.java similarity index 88% rename from src/main/java/group/goforward/ballistic/web/dto/auth/LoginRequest.java rename to src/main/java/group/goforward/battlbuilder/web/dto/auth/LoginRequest.java index 6e37282..172c64b 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/auth/LoginRequest.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/auth/LoginRequest.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.auth; +package group.goforward.battlbuilder.web.dto.auth; public class LoginRequest { private String email; diff --git a/src/main/java/group/goforward/ballistic/web/dto/auth/RegisterRequest.java b/src/main/java/group/goforward/battlbuilder/web/dto/auth/RegisterRequest.java similarity index 91% rename from src/main/java/group/goforward/ballistic/web/dto/auth/RegisterRequest.java rename to src/main/java/group/goforward/battlbuilder/web/dto/auth/RegisterRequest.java index f1688b8..2b4d8dd 100644 --- a/src/main/java/group/goforward/ballistic/web/dto/auth/RegisterRequest.java +++ b/src/main/java/group/goforward/battlbuilder/web/dto/auth/RegisterRequest.java @@ -1,4 +1,4 @@ -package group.goforward.ballistic.web.dto.auth; +package group.goforward.battlbuilder.web.dto.auth; public class RegisterRequest { private String email; diff --git a/src/main/java/group/goforward/ballistic/web/mapper/PartRoleMappingMapper.java b/src/main/java/group/goforward/battlbuilder/web/mapper/PartRoleMappingMapper.java similarity index 75% rename from src/main/java/group/goforward/ballistic/web/mapper/PartRoleMappingMapper.java rename to src/main/java/group/goforward/battlbuilder/web/mapper/PartRoleMappingMapper.java index ff9a850..d9b6503 100644 --- a/src/main/java/group/goforward/ballistic/web/mapper/PartRoleMappingMapper.java +++ b/src/main/java/group/goforward/battlbuilder/web/mapper/PartRoleMappingMapper.java @@ -1,9 +1,9 @@ -package group.goforward.ballistic.web.mapper; +package group.goforward.battlbuilder.web.mapper; -import group.goforward.ballistic.model.PartCategory; -import group.goforward.ballistic.model.PartRoleMapping; -import group.goforward.ballistic.web.dto.admin.PartRoleMappingDto; -import group.goforward.ballistic.web.dto.PartRoleToCategoryDto; +import group.goforward.battlbuilder.model.PartCategory; +import group.goforward.battlbuilder.model.PartRoleMapping; +import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto; +import group.goforward.battlbuilder.web.dto.PartRoleToCategoryDto; public final class PartRoleMappingMapper { diff --git a/src/main/java/group/goforward/ballistic/web/mapper/ProductMapper.java b/src/main/java/group/goforward/battlbuilder/web/mapper/ProductMapper.java similarity index 79% rename from src/main/java/group/goforward/ballistic/web/mapper/ProductMapper.java rename to src/main/java/group/goforward/battlbuilder/web/mapper/ProductMapper.java index f6025d5..d614bc6 100644 --- a/src/main/java/group/goforward/ballistic/web/mapper/ProductMapper.java +++ b/src/main/java/group/goforward/battlbuilder/web/mapper/ProductMapper.java @@ -1,7 +1,7 @@ -package group.goforward.ballistic.web.mapper; +package group.goforward.battlbuilder.web.mapper; -import group.goforward.ballistic.model.Product; -import group.goforward.ballistic.web.dto.ProductSummaryDto; +import group.goforward.battlbuilder.model.Product; +import group.goforward.battlbuilder.web.dto.ProductSummaryDto; import java.math.BigDecimal; diff --git a/src/test/java/group/goforward/ballistic/BallisticApplicationTests.java b/src/test/java/group/goforward/battlbuilder/BallisticApplicationTests.java similarity index 53% rename from src/test/java/group/goforward/ballistic/BallisticApplicationTests.java rename to src/test/java/group/goforward/battlbuilder/BallisticApplicationTests.java index 5c4543c..8e1536e 100644 --- a/src/test/java/group/goforward/ballistic/BallisticApplicationTests.java +++ b/src/test/java/group/goforward/battlbuilder/BallisticApplicationTests.java @@ -1,7 +1,6 @@ -package group.goforward.ballistic; +package group.goforward.battlbuilder; import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; // @SpringBootTest class BallisticApplicationTests {