From 66d45a111387796b8caa27e0d35bf4a3d683ba26 Mon Sep 17 00:00:00 2001
From: Don Strawsburg <don@goforward.group>
Date: Mon, 1 Dec 2025 15:41:55 -0500
Subject: [PATCH] adding package-info files and move a controller to the
 package with tthe res of them

---
 .../ballistic/BallisticApplication.java       |  4 +-
 .../ballistic/configuration/package-info.java | 12 +++
 .../controllers/ImportController.java         |  2 +-
 .../MerchantCategoryMappingController.java    |  2 +-
 .../ballistic/controllers/PsaController.java  |  2 +-
 .../controllers/StateController.java          |  2 +-
 .../ballistic/controllers/package-info.java   |  1 +
 .../ballistic/imports/dto/package-info.java   |  1 +
 .../ballistic/model/package-info.java         |  1 +
 .../ballistic/repos/package-info.java         | 13 ++++
 .../MerchantCategoryMappingService.java       |  2 +-
 .../MerchantFeedImportService.java            |  2 +-
 .../{service => services}/PsaService.java     | 76 ++++++++++---------
 .../{service => services}/StatesService.java  | 32 ++++----
 .../impl}/MerchantFeedImportServiceImpl.java  |  7 +-
 .../ballistic/services/impl/PsaService.java   | 17 +++++
 .../impl/StatesServiceImpl.java               | 76 +++++++++----------
 .../ballistic/services/impl/package-info.java |  1 +
 .../ballistic/services/package-info.java      |  1 +
 19 files changed, 154 insertions(+), 100 deletions(-)
 create mode 100644 src/main/java/group/goforward/ballistic/controllers/package-info.java
 create mode 100644 src/main/java/group/goforward/ballistic/imports/dto/package-info.java
 create mode 100644 src/main/java/group/goforward/ballistic/model/package-info.java
 create mode 100644 src/main/java/group/goforward/ballistic/repos/package-info.java
 rename src/main/java/group/goforward/ballistic/{service => services}/MerchantCategoryMappingService.java (98%)
 rename src/main/java/group/goforward/ballistic/{imports => services}/MerchantFeedImportService.java (78%)
 rename src/main/java/group/goforward/ballistic/{service => services}/PsaService.java (80%)
 rename src/main/java/group/goforward/ballistic/{service => services}/StatesService.java (81%)
 rename src/main/java/group/goforward/ballistic/{imports => services/impl}/MerchantFeedImportServiceImpl.java (98%)
 create mode 100644 src/main/java/group/goforward/ballistic/services/impl/PsaService.java
 rename src/main/java/group/goforward/ballistic/{service => services}/impl/StatesServiceImpl.java (83%)
 create mode 100644 src/main/java/group/goforward/ballistic/services/impl/package-info.java
 create mode 100644 src/main/java/group/goforward/ballistic/services/package-info.java

diff --git a/src/main/java/group/goforward/ballistic/BallisticApplication.java b/src/main/java/group/goforward/ballistic/BallisticApplication.java
index ea5fc0f..611f7dc 100644
--- a/src/main/java/group/goforward/ballistic/BallisticApplication.java
+++ b/src/main/java/group/goforward/ballistic/BallisticApplication.java
@@ -7,7 +7,9 @@ import org.springframework.context.annotation.ComponentScan;
 import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @SpringBootApplication
- //@ComponentScan(basePackages = "group.goforward.ballistic")
+@ComponentScan("group.goforward.ballistic.controllers")
+@ComponentScan("group.goforward.ballistic.repos")
+@ComponentScan("group.goforward.ballistic.services")
 @EntityScan(basePackages = "group.goforward.ballistic.model")
 @EnableJpaRepositories(basePackages = "group.goforward.ballistic.repos")
 public class BallisticApplication {
diff --git a/src/main/java/group/goforward/ballistic/configuration/package-info.java b/src/main/java/group/goforward/ballistic/configuration/package-info.java
index cd2627a..abe5a7c 100644
--- a/src/main/java/group/goforward/ballistic/configuration/package-info.java
+++ b/src/main/java/group/goforward/ballistic/configuration/package-info.java
@@ -1 +1,13 @@
+/**
+ * Provides the classes necessary for the Spring Configurations for the ballistic -Builder application.
+ * This package includes Configurations for Spring-Boot application
+ *
+ *
+ * <p>The main entry point for managing the inventory is the
+ * {@link group.goforward.ballistic.BallisticApplication} class.</p>
+ *
+ * @since 1.0
+ * @author Don Strawsburg
+ * @version 1.1
+ */
 package group.goforward.ballistic.configuration;
\ No newline at end of file
diff --git a/src/main/java/group/goforward/ballistic/controllers/ImportController.java b/src/main/java/group/goforward/ballistic/controllers/ImportController.java
index da7bcec..b1ea350 100644
--- a/src/main/java/group/goforward/ballistic/controllers/ImportController.java
+++ b/src/main/java/group/goforward/ballistic/controllers/ImportController.java
@@ -1,6 +1,6 @@
 package group.goforward.ballistic.controllers;
 
-import group.goforward.ballistic.imports.MerchantFeedImportService;
+import group.goforward.ballistic.services.MerchantFeedImportService;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
diff --git a/src/main/java/group/goforward/ballistic/controllers/MerchantCategoryMappingController.java b/src/main/java/group/goforward/ballistic/controllers/MerchantCategoryMappingController.java
index 681eabf..e2cc758 100644
--- a/src/main/java/group/goforward/ballistic/controllers/MerchantCategoryMappingController.java
+++ b/src/main/java/group/goforward/ballistic/controllers/MerchantCategoryMappingController.java
@@ -3,7 +3,7 @@ package group.goforward.ballistic.controllers;
 import group.goforward.ballistic.model.Merchant;
 import group.goforward.ballistic.model.MerchantCategoryMapping;
 import group.goforward.ballistic.repos.MerchantRepository;
-import group.goforward.ballistic.service.MerchantCategoryMappingService;
+import group.goforward.ballistic.services.MerchantCategoryMappingService;
 import group.goforward.ballistic.web.dto.MerchantCategoryMappingDto;
 import group.goforward.ballistic.web.dto.UpsertMerchantCategoryMappingRequest;
 import java.util.List;
diff --git a/src/main/java/group/goforward/ballistic/controllers/PsaController.java b/src/main/java/group/goforward/ballistic/controllers/PsaController.java
index bb394e9..8efec1b 100644
--- a/src/main/java/group/goforward/ballistic/controllers/PsaController.java
+++ b/src/main/java/group/goforward/ballistic/controllers/PsaController.java
@@ -1,7 +1,7 @@
 package group.goforward.ballistic.controllers;
 
 import group.goforward.ballistic.model.Psa;
-import group.goforward.ballistic.service.PsaService;
+import group.goforward.ballistic.services.PsaService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
diff --git a/src/main/java/group/goforward/ballistic/controllers/StateController.java b/src/main/java/group/goforward/ballistic/controllers/StateController.java
index 76fef10..59d0c78 100644
--- a/src/main/java/group/goforward/ballistic/controllers/StateController.java
+++ b/src/main/java/group/goforward/ballistic/controllers/StateController.java
@@ -3,7 +3,7 @@ package group.goforward.ballistic.controllers;
 import group.goforward.ballistic.ApiResponse;
 import group.goforward.ballistic.model.State;
 import group.goforward.ballistic.repos.StateRepository;
-import group.goforward.ballistic.service.StatesService;
+import group.goforward.ballistic.services.StatesService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
diff --git a/src/main/java/group/goforward/ballistic/controllers/package-info.java b/src/main/java/group/goforward/ballistic/controllers/package-info.java
new file mode 100644
index 0000000..e61736b
--- /dev/null
+++ b/src/main/java/group/goforward/ballistic/controllers/package-info.java
@@ -0,0 +1 @@
+package group.goforward.ballistic.controllers;
\ No newline at end of file
diff --git a/src/main/java/group/goforward/ballistic/imports/dto/package-info.java b/src/main/java/group/goforward/ballistic/imports/dto/package-info.java
new file mode 100644
index 0000000..686bebd
--- /dev/null
+++ b/src/main/java/group/goforward/ballistic/imports/dto/package-info.java
@@ -0,0 +1 @@
+package group.goforward.ballistic.imports.dto;
\ 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
new file mode 100644
index 0000000..002a39a
--- /dev/null
+++ b/src/main/java/group/goforward/ballistic/model/package-info.java
@@ -0,0 +1 @@
+package group.goforward.ballistic.model;
\ No newline at end of file
diff --git a/src/main/java/group/goforward/ballistic/repos/package-info.java b/src/main/java/group/goforward/ballistic/repos/package-info.java
new file mode 100644
index 0000000..570163b
--- /dev/null
+++ b/src/main/java/group/goforward/ballistic/repos/package-info.java
@@ -0,0 +1,13 @@
+/**
+ * Provides the classes necessary for the Spring Repository for the ballistic -Builder application.
+ * This package includes Repository for Spring-Boot application
+ *
+ *
+ * <p>The main entry point for managing the inventory is the
+ * {@link group.goforward.ballistic.BallisticApplication} class.</p>
+ *
+ * @since 1.0
+ * @author Sean Strawsburg
+ * @version 1.1
+ */
+package group.goforward.ballistic.repos;
\ No newline at end of file
diff --git a/src/main/java/group/goforward/ballistic/service/MerchantCategoryMappingService.java b/src/main/java/group/goforward/ballistic/services/MerchantCategoryMappingService.java
similarity index 98%
rename from src/main/java/group/goforward/ballistic/service/MerchantCategoryMappingService.java
rename to src/main/java/group/goforward/ballistic/services/MerchantCategoryMappingService.java
index 89df3f0..c93d162 100644
--- a/src/main/java/group/goforward/ballistic/service/MerchantCategoryMappingService.java
+++ b/src/main/java/group/goforward/ballistic/services/MerchantCategoryMappingService.java
@@ -1,4 +1,4 @@
-package group.goforward.ballistic.service;
+package group.goforward.ballistic.services;
 
 import group.goforward.ballistic.model.Merchant;
 import group.goforward.ballistic.model.MerchantCategoryMapping;
diff --git a/src/main/java/group/goforward/ballistic/imports/MerchantFeedImportService.java b/src/main/java/group/goforward/ballistic/services/MerchantFeedImportService.java
similarity index 78%
rename from src/main/java/group/goforward/ballistic/imports/MerchantFeedImportService.java
rename to src/main/java/group/goforward/ballistic/services/MerchantFeedImportService.java
index d3aae5d..33cd776 100644
--- a/src/main/java/group/goforward/ballistic/imports/MerchantFeedImportService.java
+++ b/src/main/java/group/goforward/ballistic/services/MerchantFeedImportService.java
@@ -1,4 +1,4 @@
-package group.goforward.ballistic.imports;
+package group.goforward.ballistic.services;
 
 public interface MerchantFeedImportService {
 
diff --git a/src/main/java/group/goforward/ballistic/service/PsaService.java b/src/main/java/group/goforward/ballistic/services/PsaService.java
similarity index 80%
rename from src/main/java/group/goforward/ballistic/service/PsaService.java
rename to src/main/java/group/goforward/ballistic/services/PsaService.java
index 939477b..29cb6f3 100644
--- a/src/main/java/group/goforward/ballistic/service/PsaService.java
+++ b/src/main/java/group/goforward/ballistic/services/PsaService.java
@@ -1,36 +1,40 @@
-package group.goforward.ballistic.service;
-import group.goforward.ballistic.model.Psa;
-import group.goforward.ballistic.repos.PsaRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-import java.util.UUID;
-
-@Service
-public class PsaService {
-
-    private final PsaRepository psaRepository;
-
-    @Autowired
-    public PsaService(PsaRepository psaRepository) {
-        this.psaRepository = psaRepository;
-    }
-
-    public List<Psa> findAll() {
-        return psaRepository.findAll();
-    }
-
-    public Optional<Psa> findById(UUID id) {
-        return psaRepository.findById(id);
-    }
-
-    public Psa save(Psa psa) {
-        return psaRepository.save(psa);
-    }
-
-    public void deleteById(UUID id) {
-        psaRepository.deleteById(id);
-    }
-}
+package group.goforward.ballistic.services;
+import group.goforward.ballistic.model.Psa;
+import group.goforward.ballistic.repos.PsaRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+@Service
+public class PsaService implements group.goforward.ballistic.services.impl.PsaService {
+
+    private final PsaRepository psaRepository;
+
+    @Autowired
+    public PsaService(PsaRepository psaRepository) {
+        this.psaRepository = psaRepository;
+    }
+
+    @Override
+    public List<Psa> findAll() {
+        return psaRepository.findAll();
+    }
+
+    @Override
+    public Optional<Psa> findById(UUID id) {
+        return psaRepository.findById(id);
+    }
+
+    @Override
+    public Psa save(Psa psa) {
+        return psaRepository.save(psa);
+    }
+
+    @Override
+    public void deleteById(UUID id) {
+        psaRepository.deleteById(id);
+    }
+}
diff --git a/src/main/java/group/goforward/ballistic/service/StatesService.java b/src/main/java/group/goforward/ballistic/services/StatesService.java
similarity index 81%
rename from src/main/java/group/goforward/ballistic/service/StatesService.java
rename to src/main/java/group/goforward/ballistic/services/StatesService.java
index f3a290a..a8d74c1 100644
--- a/src/main/java/group/goforward/ballistic/service/StatesService.java
+++ b/src/main/java/group/goforward/ballistic/services/StatesService.java
@@ -1,16 +1,16 @@
-package group.goforward.ballistic.service;
-
-import group.goforward.ballistic.model.State;
-
-import java.util.List;
-import java.util.Optional;
-
-public interface StatesService {
-
-    List<State> findAll();
-
-    Optional<State> findById(Integer id);
-
-    State save(State item);
-    void deleteById(Integer id);
-}
+package group.goforward.ballistic.services;
+
+import group.goforward.ballistic.model.State;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface StatesService {
+
+    List<State> findAll();
+
+    Optional<State> findById(Integer id);
+
+    State save(State item);
+    void deleteById(Integer id);
+}
diff --git a/src/main/java/group/goforward/ballistic/imports/MerchantFeedImportServiceImpl.java b/src/main/java/group/goforward/ballistic/services/impl/MerchantFeedImportServiceImpl.java
similarity index 98%
rename from src/main/java/group/goforward/ballistic/imports/MerchantFeedImportServiceImpl.java
rename to src/main/java/group/goforward/ballistic/services/impl/MerchantFeedImportServiceImpl.java
index 4e9b97c..5c34c2f 100644
--- a/src/main/java/group/goforward/ballistic/imports/MerchantFeedImportServiceImpl.java
+++ b/src/main/java/group/goforward/ballistic/services/impl/MerchantFeedImportServiceImpl.java
@@ -1,4 +1,4 @@
-package group.goforward.ballistic.imports;
+package group.goforward.ballistic.services.impl;
 
 import java.math.BigDecimal;
 import java.util.ArrayList;
@@ -9,6 +9,8 @@ import java.io.InputStreamReader;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
 
+import group.goforward.ballistic.imports.MerchantFeedRow;
+import group.goforward.ballistic.services.MerchantFeedImportService;
 import org.apache.commons.csv.CSVFormat;
 import org.apache.commons.csv.CSVParser;
 import org.apache.commons.csv.CSVRecord;
@@ -19,8 +21,7 @@ import group.goforward.ballistic.model.Product;
 import group.goforward.ballistic.repos.BrandRepository;
 import group.goforward.ballistic.repos.MerchantRepository;
 import group.goforward.ballistic.repos.ProductRepository;
-import group.goforward.ballistic.service.MerchantCategoryMappingService;
-import group.goforward.ballistic.service.MerchantCategoryMappingService;
+import group.goforward.ballistic.services.MerchantCategoryMappingService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import group.goforward.ballistic.repos.ProductOfferRepository;
diff --git a/src/main/java/group/goforward/ballistic/services/impl/PsaService.java b/src/main/java/group/goforward/ballistic/services/impl/PsaService.java
new file mode 100644
index 0000000..e84f141
--- /dev/null
+++ b/src/main/java/group/goforward/ballistic/services/impl/PsaService.java
@@ -0,0 +1,17 @@
+package group.goforward.ballistic.services.impl;
+
+import group.goforward.ballistic.model.Psa;
+
+import java.util.List;
+import java.util.Optional;
+import java.util.UUID;
+
+public interface PsaService {
+    List<Psa> findAll();
+
+    Optional<Psa> findById(UUID id);
+
+    Psa save(Psa psa);
+
+    void deleteById(UUID id);
+}
diff --git a/src/main/java/group/goforward/ballistic/service/impl/StatesServiceImpl.java b/src/main/java/group/goforward/ballistic/services/impl/StatesServiceImpl.java
similarity index 83%
rename from src/main/java/group/goforward/ballistic/service/impl/StatesServiceImpl.java
rename to src/main/java/group/goforward/ballistic/services/impl/StatesServiceImpl.java
index b1fdb4d..8d3d44a 100644
--- a/src/main/java/group/goforward/ballistic/service/impl/StatesServiceImpl.java
+++ b/src/main/java/group/goforward/ballistic/services/impl/StatesServiceImpl.java
@@ -1,38 +1,38 @@
-package group.goforward.ballistic.service.impl;
-
-
-import group.goforward.ballistic.model.State;
-import group.goforward.ballistic.repos.StateRepository;
-import group.goforward.ballistic.service.StatesService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-import java.util.Optional;
-
-@Service
-public class StatesServiceImpl implements StatesService {
-
-    @Autowired
-    private StateRepository repo;
-
-    @Override
-    public List<State> findAll() {
-        return repo.findAll();
-    }
-
-    @Override
-    public Optional<State> findById(Integer id) {
-        return repo.findById(id);
-    }
-
-    @Override
-    public State save(State item) {
-        return null;
-    }
-
-    @Override
-    public void deleteById(Integer id) {
-        deleteById(id);
-    }
-}
+package group.goforward.ballistic.services.impl;
+
+
+import group.goforward.ballistic.model.State;
+import group.goforward.ballistic.repos.StateRepository;
+import group.goforward.ballistic.services.StatesService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Optional;
+
+@Service
+public class StatesServiceImpl implements StatesService {
+
+    @Autowired
+    private StateRepository repo;
+
+    @Override
+    public List<State> findAll() {
+        return repo.findAll();
+    }
+
+    @Override
+    public Optional<State> findById(Integer id) {
+        return repo.findById(id);
+    }
+
+    @Override
+    public State save(State item) {
+        return null;
+    }
+
+    @Override
+    public void deleteById(Integer id) {
+        deleteById(id);
+    }
+}
diff --git a/src/main/java/group/goforward/ballistic/services/impl/package-info.java b/src/main/java/group/goforward/ballistic/services/impl/package-info.java
new file mode 100644
index 0000000..a5d264b
--- /dev/null
+++ b/src/main/java/group/goforward/ballistic/services/impl/package-info.java
@@ -0,0 +1 @@
+package group.goforward.ballistic.services.impl;
\ 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
new file mode 100644
index 0000000..1bfc5e3
--- /dev/null
+++ b/src/main/java/group/goforward/ballistic/services/package-info.java
@@ -0,0 +1 @@
+package group.goforward.ballistic.services;
\ No newline at end of file