Update Tricks to using new DatabaseHandler system...

Author: RealMangorage

build.gradle

@@ -77,7 +77,7 @@ dependencies {
     bootstrap("org.mangorage:mangobotbootstrap:1.0.84")
     launchtarget("org.mangorage:mangobotlaunchtarget:0.1.8")
 
-    plugin('org.mangorage:mangobot:12.0.128')
+    plugin('org.mangorage:mangobot:12.0.130')
 
     library('org.slf4j:slf4j-simple:2.0.13') // Use a recent version)
     library('org.luaj:luaj-jme:3.0.1')
@@ -87,16 +87,6 @@ dependencies {
 
     library("com.google.zxing:core:3.5.4")
     library("com.google.zxing:javase:3.5.4")
-
-    // SQL Stuff
-    library("org.hibernate.orm:hibernate-core:6.4.4.Final")
-    library("jakarta.persistence:jakarta.persistence-api:3.1.0")
-    library("jakarta.interceptor:jakarta.interceptor-api:2.1.0")
-    library('jakarta.enterprise:jakarta.enterprise.cdi-api:4.0.1')
-
-    // SQL Driver
-    library("com.mysql:mysql-connector-j:8.4.0")
-
 }
 
 test {

src/main/java/module-info.java

@@ -9,6 +9,7 @@
     requires com.fasterxml.jackson.databind;
     requires org.slf4j.simple;
 
+    requires org.mangorage.bootstrap;
     requires org.mangorage.mangobotcore;
 
     requires net.dv8tion.jda;
@@ -23,12 +24,7 @@
     requires java.desktop;
     requires luaj.jme;
     requires org.apache.logging.log4j;
-    requires org.mangorage.bootstrap;
-    requires com.google.zxing;
-    requires com.google.zxing.javase;
     requires jakarta.persistence;
-    requires org.hibernate.orm.core;
-    requires opus.java.api;
 
     opens org.mangorage.mangobotplugin;
 

src/main/java/org/mangorage/mangobotplugin/commands/trick/Trick.java

@@ -5,15 +5,15 @@
 import jakarta.persistence.Entity;
 import jakarta.persistence.Id;
 import jakarta.persistence.Table;
-import org.hibernate.annotations.Formula;
 import org.mangorage.mangobotcore.api.util.data.FileName;
 import org.mangorage.mangobotcore.api.util.data.IFileNameResolver;
+import org.mangorage.mangobotcore.api.util.data.IUniqueIdHolder;
 
 import java.util.UUID;
 
 @Entity
 @Table(name = "tricks")
-public final class Trick implements IFileNameResolver {
+public final class Trick implements IFileNameResolver, IUniqueIdHolder<UUID> {
 
     @Id
     private UUID uuid;
@@ -142,4 +142,9 @@ public void use() {
     public FileName resolve() {
         return new FileName(guildID + "", trickID);
     }
+
+    @Override
+    public UUID getId() {
+        return uuid;
+    }
 }

src/main/java/org/mangorage/mangobotplugin/commands/trick/TrickManager.java

@@ -1,76 +1,47 @@
 package org.mangorage.mangobotplugin.commands.trick;
 
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.cfg.Configuration;
 import org.mangorage.mangobotcore.api.util.data.DataHandler;
+import org.mangorage.mangobotcore.api.util.data.DatabaseHandler;
 import org.mangorage.mangobotplugin.entrypoint.MangoBot;
 
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 
 public final class TrickManager {
 
-    public static final DataHandler<Trick> TRICKS_DATA_HANDLER = DataHandler.create()
+    private static final DataHandler<Trick> TRICKS_DATA_HANDLER = DataHandler.create()
             .path("data/tricksV2")
             .maxDepth(3)
             .build(Trick.class);
 
+    private static final DatabaseHandler<UUID, Trick> TRICKS_DATABASE_HANDLER = DatabaseHandler.create(
+            MangoBot.BOT_DATABASE_URL.get(),
+            MangoBot.BOT_DATABASE_USERNAME.get(),
+            MangoBot.BOT_DATABASE_PASSWORD.get(),
+            Trick.class
+    );
+
     private final Map<TrickKey, Trick> loadedTricks = new HashMap<>();
     private final MangoBot plugin;
-    private final SessionFactory sessionFactory;
     private final boolean useDatabase;
 
     public TrickManager(MangoBot plugin) {
         this.plugin = plugin;
-
-        String url = MangoBot.BOT_DATABASE_URL.get();
-        String user = MangoBot.BOT_DATABASE_USERNAME.get();
-        String pass = MangoBot.BOT_DATABASE_PASSWORD.get();
-
         this.useDatabase = MangoBot.BOT_USE_DATABASE.get();
 
         if (useDatabase) {
-            this.sessionFactory = new Configuration()
-                    .setProperty("hibernate.connection.url", url)
-                    .setProperty("hibernate.connection.username", user)
-                    .setProperty("hibernate.connection.password", pass)
-
-                    .setProperty("hibernate.connection.driver_class", "com.mysql.cj.jdbc.Driver")
-                    .setProperty("hibernate.dialect", "org.hibernate.dialect.MySQLDialect")
-
-                    .setProperty("hibernate.hbm2ddl.auto", "update")
-                    .setProperty("hibernate.show_sql", "false")
-
-                    .addAnnotatedClass(Trick.class)
-                    .buildSessionFactory();
-
             migrateFilesToDatabase();
-
             loadFromDatabase();
         } else {
-            this.sessionFactory = null;
             loadFromFiles();
         }
     }
 
     private void migrateFilesToDatabase() {
-        List<Trick> fileTricks = TRICKS_DATA_HANDLER.load(plugin.getPluginDirectory());
-
-        if (fileTricks.isEmpty()) return;
-
-        try (Session session = sessionFactory.openSession()) {
-            Transaction tx = session.beginTransaction();
-
-            for (Trick trick : fileTricks) {
-                session.merge(trick);
-                TRICKS_DATA_HANDLER.delete(plugin.getPluginDirectory(), trick);
-            }
-
-            tx.commit();
-        }
+        List<Trick> tricks = TRICKS_DATA_HANDLER.load(plugin.getPluginDirectory());
+        TRICKS_DATABASE_HANDLER.migrateToDatabase(tricks);
     }
 
     private void loadFromFiles() {
@@ -80,11 +51,8 @@ private void loadFromFiles() {
     }
 
     private void loadFromDatabase() {
-        try (Session session = sessionFactory.openSession()) {
-            List<Trick> tricks = session.createQuery("from Trick", Trick.class).list();
-            for (Trick trick : tricks) {
-                loadedTricks.put(new TrickKey(trick.getTrickID(), trick.getGuildID()), trick);
-            }
+        for (Trick trick : TRICKS_DATABASE_HANDLER.loadEntitiesFromDatabase()) {
+            loadedTricks.put(new TrickKey(trick.getTrickID(), trick.getGuildID()), trick);
         }
     }
 
@@ -107,11 +75,7 @@ public Trick getTrickForGuildByName(long guildId, String name) {
 
     public void saveTrick(Trick trick) {
         if (useDatabase) {
-            try (Session session = sessionFactory.openSession()) {
-                Transaction tx = session.beginTransaction();
-                session.merge(trick);
-                tx.commit();
-            }
+            TRICKS_DATABASE_HANDLER.saveEntity(trick);
         } else {
             TRICKS_DATA_HANDLER.save(plugin.getPluginDirectory(), trick);
         }
@@ -123,17 +87,7 @@ public boolean removeTrick(String trickID, long guildID) {
         if (removed == null) return false;
 
         if (useDatabase) {
-            try (Session session = sessionFactory.openSession()) {
-                final var transaction = session.beginTransaction();
-                session
-                        .createMutationQuery(
-                                "delete from Trick t where t.trickID = :trickId and t.guildID = :guildId"
-                        )
-                        .setParameter("trickId", trickID)
-                        .setParameter("guildId", guildID)
-                        .executeUpdate();
-                transaction.commit();
-            }
+            TRICKS_DATABASE_HANDLER.removeEntity(removed);
         } else {
             TRICKS_DATA_HANDLER.delete(plugin.getPluginDirectory(), removed);
         }