From c7003c1d0258f3ff59f78f22a7e0bfa8f2ab13c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beatrice=20Dellac=C3=A0?= <hello@beatrice.wtf>
Date: Wed, 7 Aug 2024 00:46:27 +0200
Subject: [PATCH] refactor code structure

---
 pom.xml                                                |  2 +-
 src/main/java/wtf/beatrice/releasehive/Main.java       |  2 ++
 .../releasehive/{ => db}/HibernateManager.java         |  2 +-
 .../wtf/beatrice/releasehive/{ => model}/User.java     | 10 ++++------
 .../releasehive/{ => resource}/AccountResource.java    | 10 ++++------
 .../releasehive/{ => service}/AccountService.java      |  4 +++-
 .../wtf/beatrice/releasehive/{ => util}/JsonUtil.java  |  7 ++++++-
 src/main/resources/hibernate.cfg.xml                   |  2 +-
 8 files changed, 22 insertions(+), 17 deletions(-)
 rename src/main/java/wtf/beatrice/releasehive/{ => db}/HibernateManager.java (96%)
 rename src/main/java/wtf/beatrice/releasehive/{ => model}/User.java (78%)
 rename src/main/java/wtf/beatrice/releasehive/{ => resource}/AccountResource.java (69%)
 rename src/main/java/wtf/beatrice/releasehive/{ => service}/AccountService.java (69%)
 rename src/main/java/wtf/beatrice/releasehive/{ => util}/JsonUtil.java (83%)

diff --git a/pom.xml b/pom.xml
index 1862777..4583e96 100644
--- a/pom.xml
+++ b/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>org.hibernate</groupId>
             <artifactId>hibernate-core</artifactId>
-            <version>5.6.15.Final</version>
+            <version>6.6.0.CR1</version>
         </dependency>
 
         <dependency>
diff --git a/src/main/java/wtf/beatrice/releasehive/Main.java b/src/main/java/wtf/beatrice/releasehive/Main.java
index c497416..1d91f90 100644
--- a/src/main/java/wtf/beatrice/releasehive/Main.java
+++ b/src/main/java/wtf/beatrice/releasehive/Main.java
@@ -6,6 +6,8 @@ import org.hibernate.Session;
 import org.hibernate.Transaction;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import wtf.beatrice.releasehive.db.HibernateManager;
+import wtf.beatrice.releasehive.model.User;
 
 import java.util.List;
 
diff --git a/src/main/java/wtf/beatrice/releasehive/HibernateManager.java b/src/main/java/wtf/beatrice/releasehive/db/HibernateManager.java
similarity index 96%
rename from src/main/java/wtf/beatrice/releasehive/HibernateManager.java
rename to src/main/java/wtf/beatrice/releasehive/db/HibernateManager.java
index a9bfe28..c418abe 100644
--- a/src/main/java/wtf/beatrice/releasehive/HibernateManager.java
+++ b/src/main/java/wtf/beatrice/releasehive/db/HibernateManager.java
@@ -1,4 +1,4 @@
-package wtf.beatrice.releasehive;
+package wtf.beatrice.releasehive.db;
 
 import org.hibernate.Session;
 import org.hibernate.SessionFactory;
diff --git a/src/main/java/wtf/beatrice/releasehive/User.java b/src/main/java/wtf/beatrice/releasehive/model/User.java
similarity index 78%
rename from src/main/java/wtf/beatrice/releasehive/User.java
rename to src/main/java/wtf/beatrice/releasehive/model/User.java
index d0c3a05..b55467a 100644
--- a/src/main/java/wtf/beatrice/releasehive/User.java
+++ b/src/main/java/wtf/beatrice/releasehive/model/User.java
@@ -1,10 +1,8 @@
-package wtf.beatrice.releasehive;
+package wtf.beatrice.releasehive.model;
 
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
+import jakarta.persistence.*;
+
 import java.util.UUID;
 
 @Entity
@@ -13,7 +11,7 @@ public class User
 {
 
     @Id
-    @Column
+    @GeneratedValue(strategy = GenerationType.UUID)
     private UUID uuid;
 
     @Column
diff --git a/src/main/java/wtf/beatrice/releasehive/AccountResource.java b/src/main/java/wtf/beatrice/releasehive/resource/AccountResource.java
similarity index 69%
rename from src/main/java/wtf/beatrice/releasehive/AccountResource.java
rename to src/main/java/wtf/beatrice/releasehive/resource/AccountResource.java
index 8d634bb..7a7be06 100644
--- a/src/main/java/wtf/beatrice/releasehive/AccountResource.java
+++ b/src/main/java/wtf/beatrice/releasehive/resource/AccountResource.java
@@ -1,8 +1,9 @@
-package wtf.beatrice.releasehive;
+package wtf.beatrice.releasehive.resource;
 
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.web.bind.annotation.*;
+import wtf.beatrice.releasehive.util.JsonUtil;
+import wtf.beatrice.releasehive.model.User;
+import wtf.beatrice.releasehive.service.AccountService;
 
 import java.util.UUID;
 
@@ -18,10 +19,7 @@ public class AccountResource {
             produces="application/json")
     public String register(@RequestBody User user)
     {
-        UUID id = UUID.randomUUID();
-        user.setUuid(id);
         accountService.registerUser(user);
-
         return JsonUtil.convertToJson(user);
     }
 }
diff --git a/src/main/java/wtf/beatrice/releasehive/AccountService.java b/src/main/java/wtf/beatrice/releasehive/service/AccountService.java
similarity index 69%
rename from src/main/java/wtf/beatrice/releasehive/AccountService.java
rename to src/main/java/wtf/beatrice/releasehive/service/AccountService.java
index dcb9f84..62976eb 100644
--- a/src/main/java/wtf/beatrice/releasehive/AccountService.java
+++ b/src/main/java/wtf/beatrice/releasehive/service/AccountService.java
@@ -1,7 +1,9 @@
-package wtf.beatrice.releasehive;
+package wtf.beatrice.releasehive.service;
 
 import org.hibernate.Session;
 import org.hibernate.Transaction;
+import wtf.beatrice.releasehive.db.HibernateManager;
+import wtf.beatrice.releasehive.model.User;
 
 public class AccountService
 {
diff --git a/src/main/java/wtf/beatrice/releasehive/JsonUtil.java b/src/main/java/wtf/beatrice/releasehive/util/JsonUtil.java
similarity index 83%
rename from src/main/java/wtf/beatrice/releasehive/JsonUtil.java
rename to src/main/java/wtf/beatrice/releasehive/util/JsonUtil.java
index efaaf2d..a73e3ce 100644
--- a/src/main/java/wtf/beatrice/releasehive/JsonUtil.java
+++ b/src/main/java/wtf/beatrice/releasehive/util/JsonUtil.java
@@ -1,4 +1,4 @@
-package wtf.beatrice.releasehive;
+package wtf.beatrice.releasehive.util;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -7,6 +7,11 @@ import org.apache.logging.log4j.Logger;
 
 public class JsonUtil
 {
+
+    private JsonUtil() {
+        throw new AssertionError("Utility class");
+    }
+
     private static final Logger LOGGER = LogManager.getLogger(JsonUtil.class);
     private static final ObjectMapper MAPPER = new ObjectMapper();
 
diff --git a/src/main/resources/hibernate.cfg.xml b/src/main/resources/hibernate.cfg.xml
index ce94647..35c55a8 100644
--- a/src/main/resources/hibernate.cfg.xml
+++ b/src/main/resources/hibernate.cfg.xml
@@ -22,7 +22,7 @@
         <property name="hibernate.hbm2ddl.auto">update</property>
 
         <!-- Annotated entity classes -->
-        <mapping class="wtf.beatrice.releasehive.User"/>
+        <mapping class="wtf.beatrice.releasehive.model.User"/>
 
     </session-factory>
 </hibernate-configuration>