package name change

src/main/java/group/goforward/ballistic/configuration/PasswordConfig.java

@@ -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();
-//     }
-// }

src/main/java/group/goforward/ballistic/model/package-info.java

@@ -1 +0,0 @@
-package group.goforward.ballistic.model;

src/main/java/group/goforward/ballistic/services/package-info.java

@@ -1 +0,0 @@
-package group.goforward.ballistic.services;

src/main/java/group/goforward/battlbuilder/ApiResponse.java

@@ -1,4 +1,4 @@
-package group.goforward.ballistic;
+package group.goforward.battlbuilder;
 
 import java.time.LocalDateTime;
 

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) {

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;

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;

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;

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();
+//     }
+// }

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;

src/main/java/group/goforward/battlbuilder/configuration/package-info.java

@@ -4,10 +4,10 @@
  *
  *
  * <p>The main entry point for managing the inventory is the
- * {@link group.goforward.ballistic.BattlBuilderApplication} class.</p>
+ * {@link group.goforward.battlbuilder.BattlBuilderApplication} class.</p>
  *
  * @since 1.0
  * @author Don Strawsburg
  * @version 1.1
  */
-package group.goforward.ballistic.configuration;
+package group.goforward.battlbuilder.configuration;

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;

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;

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;

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.*;
 

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

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.*;

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;
 

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;

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.*;
 

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.*;

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.*;

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;

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;

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;

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;

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;

src/main/java/group/goforward/battlbuilder/controllers/package-info.java

@@ -4,10 +4,10 @@
  *
  *
  * <p>The main entry point for managing the inventory is the
- * {@link group.goforward.ballistic.BattlBuilderApplication} class.</p>
+ * {@link group.goforward.battlbuilder.BattlBuilderApplication} class.</p>
  *
  * @since 1.0
  * @author Don Strawsburg
  * @version 1.1
  */
-package group.goforward.ballistic.controllers;
+package group.goforward.battlbuilder.controllers;

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;
 

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;
 

src/main/java/group/goforward/battlbuilder/imports/dto/package-info.java

@@ -4,10 +4,10 @@
  *
  *
  * <p>The main entry point for managing the inventory is the
- * {@link group.goforward.ballistic.BattlBuilderApplication} class.</p>
+ * {@link group.goforward.battlbuilder.BattlBuilderApplication} class.</p>
  *
  * @since 1.0
  * @author Sean Strawsburg
  * @version 1.1
  */
-package group.goforward.ballistic.imports.dto;
+package group.goforward.battlbuilder.imports.dto;

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;

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.*;
 

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;

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;

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;

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;

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;

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;

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.*;
 

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

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;

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;

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",

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;

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;

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;

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;

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.*;
 

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;

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

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;

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;

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;

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;

src/main/java/group/goforward/battlbuilder/model/package-info.java

@@ -0,0 +1 @@
+package group.goforward.battlbuilder.model;

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;

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;
 

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;

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;

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;
 

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<FeedImport, Long> {

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;

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;

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;

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;

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;

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<PriceHistory, Long> {

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;
 

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<Product, Integer> {
             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

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;

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;

src/main/java/group/goforward/battlbuilder/repos/package-info.java

@@ -4,10 +4,10 @@
  *
  *
  * <p>The main entry point for managing the inventory is the
- * {@link group.goforward.ballistic.BattlBuilderApplication} class.</p>
+ * {@link group.goforward.battlbuilder.BattlBuilderApplication} class.</p>
  *
  * @since 1.0
  * @author Sean Strawsburg
  * @version 1.1
  */
-package group.goforward.ballistic.repos;
+package group.goforward.battlbuilder.repos;

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;

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;

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;

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;

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;

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;
 

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;

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;

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;
 
 

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;

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;
 

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;

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 {
 

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;

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;

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;

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;

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;

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;
 

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;

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;
 

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;
 

src/main/java/group/goforward/battlbuilder/services/impl/package-info.java

@@ -4,10 +4,10 @@
  *
  *
  * <p>The main entry point for managing the inventory is the
- * {@link group.goforward.ballistic.BattlBuilderApplication} class.</p>
+ * {@link group.goforward.battlbuilder.BattlBuilderApplication} class.</p>
  *
  * @since 1.0
  * @author Don Strawsburg
  * @version 1.1
  */
-package group.goforward.ballistic.services.impl;
+package group.goforward.battlbuilder.services.impl;

src/main/java/group/goforward/battlbuilder/services/package-info.java

@@ -0,0 +1 @@
+package group.goforward.battlbuilder.services;

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;
 

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;

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;