From 3fbd89309bd070d8edb6d5e9b34977db8ec794b5 Mon Sep 17 00:00:00 2001 From: Don Strawsburg Date: Mon, 8 Dec 2025 13:04:16 -0500 Subject: [PATCH] fixes and clean up --- .../GunbuilderProductController.java | 2 +- .../PartRoleMappingController.java | 2 +- .../{ => utils}/PingController.java | 2 +- .../battlbuilder/model/BuildsComponent.java | 96 ------------------- .../battlbuilder/model/ComponentType.java | 85 ---------------- .../repos/BuildItemRepository.java | 8 +- .../services/admin/package-info.java | 13 +++ .../goforward/battlbuilder/utils/Counter.java | 20 ++++ 8 files changed, 40 insertions(+), 188 deletions(-) rename src/main/java/group/goforward/battlbuilder/{web => controllers}/GunbuilderProductController.java (98%) rename src/main/java/group/goforward/battlbuilder/{web => controllers}/PartRoleMappingController.java (95%) rename src/main/java/group/goforward/battlbuilder/controllers/{ => utils}/PingController.java (78%) delete mode 100644 src/main/java/group/goforward/battlbuilder/model/BuildsComponent.java delete mode 100644 src/main/java/group/goforward/battlbuilder/model/ComponentType.java create mode 100644 src/main/java/group/goforward/battlbuilder/services/admin/package-info.java create mode 100644 src/main/java/group/goforward/battlbuilder/utils/Counter.java diff --git a/src/main/java/group/goforward/battlbuilder/web/GunbuilderProductController.java b/src/main/java/group/goforward/battlbuilder/controllers/GunbuilderProductController.java similarity index 98% rename from src/main/java/group/goforward/battlbuilder/web/GunbuilderProductController.java rename to src/main/java/group/goforward/battlbuilder/controllers/GunbuilderProductController.java index c945bb5..ca04f88 100644 --- a/src/main/java/group/goforward/battlbuilder/web/GunbuilderProductController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/GunbuilderProductController.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.web; +package group.goforward.battlbuilder.controllers; import group.goforward.battlbuilder.services.GunbuilderProductService; import group.goforward.battlbuilder.web.dto.GunbuilderProductDto; diff --git a/src/main/java/group/goforward/battlbuilder/web/PartRoleMappingController.java b/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java similarity index 95% rename from src/main/java/group/goforward/battlbuilder/web/PartRoleMappingController.java rename to src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java index 4df445d..9630dd2 100644 --- a/src/main/java/group/goforward/battlbuilder/web/PartRoleMappingController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/PartRoleMappingController.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.web; +package group.goforward.battlbuilder.controllers; import group.goforward.battlbuilder.services.PartRoleMappingService; import group.goforward.battlbuilder.web.dto.admin.PartRoleMappingDto; diff --git a/src/main/java/group/goforward/battlbuilder/controllers/PingController.java b/src/main/java/group/goforward/battlbuilder/controllers/utils/PingController.java similarity index 78% rename from src/main/java/group/goforward/battlbuilder/controllers/PingController.java rename to src/main/java/group/goforward/battlbuilder/controllers/utils/PingController.java index 65bec57..19806ce 100644 --- a/src/main/java/group/goforward/battlbuilder/controllers/PingController.java +++ b/src/main/java/group/goforward/battlbuilder/controllers/utils/PingController.java @@ -1,4 +1,4 @@ -package group.goforward.battlbuilder.controllers; +package group.goforward.battlbuilder.controllers.utils; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.RestController; diff --git a/src/main/java/group/goforward/battlbuilder/model/BuildsComponent.java b/src/main/java/group/goforward/battlbuilder/model/BuildsComponent.java deleted file mode 100644 index 0c6dfeb..0000000 --- a/src/main/java/group/goforward/battlbuilder/model/BuildsComponent.java +++ /dev/null @@ -1,96 +0,0 @@ -package group.goforward.battlbuilder.model; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import org.hibernate.annotations.ColumnDefault; - -import java.time.Instant; -import java.util.UUID; - -@Entity -@Table(name = "builds_components") -public class BuildsComponent { - @Id - @Column(name = "id", nullable = false) - private Integer id; - - @Column(name = "build_id", nullable = false) - private Integer buildId; - - @Column(name = "product_id", nullable = false) - private Integer productId; - - @ColumnDefault("now()") - @Column(name = "updated_at", nullable = false) - private Instant updatedAt; - - @ColumnDefault("now()") - @Column(name = "created_at", nullable = false) - private Instant createdAt; - - @Column(name = "deleted_at") - private Instant deletedAt; - - @ColumnDefault("gen_random_uuid()") - @Column(name = "uuid") - private UUID uuid; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public Integer getBuildId() { - return buildId; - } - - public void setBuildId(Integer buildId) { - this.buildId = buildId; - } - - public Integer getProductId() { - return productId; - } - - public void setProductId(Integer productId) { - this.productId = productId; - } - - public Instant getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Instant updatedAt) { - this.updatedAt = updatedAt; - } - - public Instant getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Instant createdAt) { - this.createdAt = createdAt; - } - - public Instant getDeletedAt() { - return deletedAt; - } - - public void setDeletedAt(Instant deletedAt) { - this.deletedAt = deletedAt; - } - - public UUID getUuid() { - return uuid; - } - - public void setUuid(UUID uuid) { - this.uuid = uuid; - } - -} \ No newline at end of file diff --git a/src/main/java/group/goforward/battlbuilder/model/ComponentType.java b/src/main/java/group/goforward/battlbuilder/model/ComponentType.java deleted file mode 100644 index 0272b86..0000000 --- a/src/main/java/group/goforward/battlbuilder/model/ComponentType.java +++ /dev/null @@ -1,85 +0,0 @@ -package group.goforward.battlbuilder.model; - -import jakarta.persistence.Column; -import jakarta.persistence.Entity; -import jakarta.persistence.Id; -import jakarta.persistence.Table; -import org.hibernate.annotations.ColumnDefault; - -import java.time.Instant; -import java.util.UUID; - -@Entity -@Table(name = "component_type") -public class ComponentType { - @Id - @Column(name = "id", nullable = false) - private Integer id; - - @Column(name = "name", nullable = false, length = 100) - private String name; - - @ColumnDefault("now()") - @Column(name = "updated_at", nullable = false) - private Instant updatedAt; - - @ColumnDefault("now()") - @Column(name = "created_at", nullable = false) - private Instant createdAt; - - @Column(name = "deleted_at") - private Instant deletedAt; - - @ColumnDefault("gen_random_uuid()") - @Column(name = "uuid") - private UUID uuid; - - public Integer getId() { - return id; - } - - public void setId(Integer id) { - this.id = id; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public Instant getUpdatedAt() { - return updatedAt; - } - - public void setUpdatedAt(Instant updatedAt) { - this.updatedAt = updatedAt; - } - - public Instant getCreatedAt() { - return createdAt; - } - - public void setCreatedAt(Instant createdAt) { - this.createdAt = createdAt; - } - - public Instant getDeletedAt() { - return deletedAt; - } - - public void setDeletedAt(Instant deletedAt) { - this.deletedAt = deletedAt; - } - - public UUID getUuid() { - return uuid; - } - - public void setUuid(UUID uuid) { - this.uuid = uuid; - } - -} \ No newline at end of file diff --git a/src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java b/src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java index babcc92..38b4a58 100644 --- a/src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java +++ b/src/main/java/group/goforward/battlbuilder/repos/BuildItemRepository.java @@ -1,12 +1,12 @@ package group.goforward.battlbuilder.repos; -import group.goforward.battlbuilder.model.BuildsComponent; +import group.goforward.battlbuilder.model.BuildItem; import org.springframework.data.jpa.repository.JpaRepository; import java.util.List; import java.util.Optional; import java.util.UUID; -public interface BuildItemRepository extends JpaRepository { - List findByBuildId(Integer buildId); - Optional findByUuid(UUID uuid); +public interface BuildItemRepository extends JpaRepository { + List findByBuildId(Integer buildId); + Optional findByUuid(UUID uuid); } \ No newline at end of file diff --git a/src/main/java/group/goforward/battlbuilder/services/admin/package-info.java b/src/main/java/group/goforward/battlbuilder/services/admin/package-info.java new file mode 100644 index 0000000..208a223 --- /dev/null +++ b/src/main/java/group/goforward/battlbuilder/services/admin/package-info.java @@ -0,0 +1,13 @@ +/** + * Provides the classes necessary for the Spring Services implementations for the ballistic -Builder application. + * This package includes Services implementations for Spring-Boot application + * + * + *

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

+ * + * @since 1.0 + * @author Don Strawsburg + * @version 1.1 + */ +package group.goforward.battlbuilder.services.admin; \ No newline at end of file diff --git a/src/main/java/group/goforward/battlbuilder/utils/Counter.java b/src/main/java/group/goforward/battlbuilder/utils/Counter.java new file mode 100644 index 0000000..6836ed8 --- /dev/null +++ b/src/main/java/group/goforward/battlbuilder/utils/Counter.java @@ -0,0 +1,20 @@ +package group.goforward.battlbuilder.utils; + +import org.springframework.context.annotation.Bean; + +public class Counter { + + Integer count = 0; + public void addOne() { + count +=1; + } + + public Integer getCount() { + return count; + } + + private void setCount(Integer count) { + this.count = count; + } + +}