Migrate from IDB to Database plugin API

Signed-off-by: applenick <applenick@users.noreply.github.com>

Author: applenick

buildSrc/src/main/kotlin/buildlogic.java-conventions.gradle.kts

@@ -23,8 +23,6 @@ dependencies {
     implementation("fr.minuskube.inv:smart-invs:1.2.7") { isTransitive = false }
 
     implementation("redis.clients:jedis:3.5.1")
-    implementation("co.aikar:idb-core:1.0.0-SNAPSHOT")
-    implementation("co.aikar:idb-bukkit:1.0.0-SNAPSHOT")
     implementation("net.kyori:adventure-api:4.25.0")
     implementation("net.kyori:adventure-text-serializer-plain:4.25.0")
     implementation("net.kyori:adventure-platform-bukkit:4.4.1")
@@ -75,4 +73,4 @@ restrictImports {
         reason = "Use tc.oc.pgm.util.Assert to add assertions"
         bannedImports = listOf("com.google.common.base.Preconditions.**", "java.util.Objects.requireNonNull")
     }
-}
+}

core/build.gradle.kts

@@ -8,6 +8,9 @@ plugins {
 
 dependencies {
     compileOnly("dev.pgm.paper:paper-api:1.8_1.21.10-SNAPSHOT")
+    compileOnly("tc.oc.occ:Database:2.0.0-SNAPSHOT")
+
+    implementation("org.xerial:sqlite-jdbc:3.51.1.0")
 
     implementation(project(":util"))
 
@@ -25,6 +28,7 @@ tasks.named<ShadowJar>("shadowJar") {
         // Exclude from minimization as they're required at runtime
         exclude(project(":platform-sportpaper"))
         exclude(project(":platform-modern"))
+        exclude(dependency("org.xerial:sqlite-jdbc"))
     }
 
     dependencies {
@@ -81,4 +85,4 @@ tasks {
     named("build") {
         dependsOn(shadowJar)
     }
-}
+}

core/src/main/java/dev/pgm/community/Community.java

@@ -1,7 +1,6 @@
 package dev.pgm.community;
 
 import dev.pgm.community.commands.graph.CommunityCommandGraph;
-import dev.pgm.community.database.DatabaseConnection;
 import dev.pgm.community.events.CommunityEvent;
 import dev.pgm.community.feature.FeatureManager;
 import dev.pgm.community.squads.SquadChannel;
@@ -24,9 +23,6 @@ public class Community extends JavaPlugin {
   // Config for general stuff (database)
   private CommunityConfig config;
 
-  // Database
-  private DatabaseConnection database;
-
   // Feature Manager
   private FeatureManager features;
 
@@ -58,13 +54,14 @@ public void onEnable() {
     }
 
     this.setupConfig();
-    this.setupDatabase();
+    getLogger().info(dev.pgm.community.database.DatabaseExecutor.describeBackend());
     this.setupFeatures();
   }
 
   @Override
   public void onDisable() {
     features.disable();
+    dev.pgm.community.database.DatabaseExecutor.shutdown();
   }
 
   public void reload() {
@@ -82,10 +79,6 @@ private void setupConfig() {
     this.config = new CommunityConfig(getConfig());
   }
 
-  private void setupDatabase() {
-    this.database = new DatabaseConnection(this);
-  }
-
   private void setupCommands() {
     try {
       new CommunityCommandGraph(this);
@@ -111,7 +104,7 @@ public void registerListener(Listener listener) {
   private void setupFeatures() {
     this.setupTranslations();
     this.setupInventory();
-    this.features = new FeatureManager(getConfig(), getLogger(), database, inventory);
+    this.features = new FeatureManager(getConfig(), getLogger(), inventory);
     this.setupCommands();
   }
 

…tance/feature/AssistanceFeatureBase.java …feature/types/AssistanceFeatureCore.javacore/src/main/java/dev/pgm/community/assistance/feature/AssistanceFeatureBase.java renamed to core/src/main/java/dev/pgm/community/assistance/feature/types/AssistanceFeatureCore.java core/src/main/java/dev/pgm/community/assistance/feature/AssistanceFeatureBase.java renamed to core/src/main/java/dev/pgm/community/assistance/feature/types/AssistanceFeatureCore.java

@@ -1,18 +1,21 @@
-package dev.pgm.community.assistance.feature;
+package dev.pgm.community.assistance.feature.types;
 
 import static net.kyori.adventure.text.Component.space;
 import static net.kyori.adventure.text.Component.text;
 import static net.kyori.adventure.text.Component.translatable;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import com.google.common.collect.Lists;
 import dev.pgm.community.CommunityPermissions;
 import dev.pgm.community.assistance.AssistanceRequest;
 import dev.pgm.community.assistance.AssistanceRequest.RequestType;
 import dev.pgm.community.assistance.PlayerHelpRequest;
 import dev.pgm.community.assistance.Report;
 import dev.pgm.community.assistance.ReportConfig;
+import dev.pgm.community.assistance.feature.AssistanceFeature;
 import dev.pgm.community.assistance.menu.ReportCategoryMenu;
+import dev.pgm.community.assistance.store.AssistanceStore;
 import dev.pgm.community.events.PlayerHelpRequestEvent;
 import dev.pgm.community.events.PlayerPunishmentEvent;
 import dev.pgm.community.events.PlayerReportEvent;
@@ -22,6 +25,7 @@
 import dev.pgm.community.network.updates.types.AssistUpdate;
 import dev.pgm.community.users.feature.UsersFeature;
 import dev.pgm.community.utils.BroadcastUtils;
+import dev.pgm.community.utils.NameUtils;
 import dev.pgm.community.utils.NetworkUtils;
 import dev.pgm.community.utils.Sounds;
 import fr.minuskube.inv.InventoryManager;
@@ -40,59 +44,67 @@
 import net.kyori.adventure.text.event.HoverEvent;
 import net.kyori.adventure.text.format.NamedTextColor;
 import org.bukkit.Bukkit;
+import org.bukkit.configuration.Configuration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.jetbrains.annotations.Nullable;
 import tc.oc.pgm.util.Audience;
 import tc.oc.pgm.util.bukkit.BukkitUtils;
 import tc.oc.pgm.util.named.NameStyle;
 
-public abstract class AssistanceFeatureBase extends FeatureBase implements AssistanceFeature {
+public class AssistanceFeatureCore extends FeatureBase implements AssistanceFeature {
 
   private final NetworkFeature network;
-  protected final UsersFeature users;
+  private final UsersFeature users;
   private final InventoryManager inventory;
+  private final AssistanceStore store;
 
-  protected final Cache<UUID, Instant> cooldown;
-  protected final Cache<Report, Instant> recentReports;
-  protected final Cache<PlayerHelpRequest, Instant> recentHelp;
+  private final Cache<UUID, Instant> cooldown;
+  private final Cache<Report, Instant> recentReports;
+  private final Cache<PlayerHelpRequest, Instant> recentHelp;
 
-  public AssistanceFeatureBase(
-      ReportConfig config,
+  public AssistanceFeatureCore(
+      Configuration config,
       Logger logger,
-      String featureName,
-      NetworkFeature network,
       UsersFeature users,
-      InventoryManager inventory) {
-    super(config, logger, featureName);
-    cooldown = CacheBuilder.newBuilder()
-        .expireAfterWrite(config.getCooldown(), TimeUnit.SECONDS)
+      NetworkFeature network,
+      InventoryManager inventory,
+      AssistanceStore store) {
+    super(new ReportConfig(config), logger, "Assistance");
+    this.cooldown = CacheBuilder.newBuilder()
+        .expireAfterWrite(getReportConfig().getCooldown(), TimeUnit.SECONDS)
         .build();
     this.recentReports = CacheBuilder.newBuilder()
-        .expireAfterWrite(config.getReportExpireTime().getSeconds(), TimeUnit.SECONDS)
+        .expireAfterWrite(getReportConfig().getReportExpireTime().getSeconds(), TimeUnit.SECONDS)
         .build();
     this.recentHelp = CacheBuilder.newBuilder()
-        .expireAfterWrite(config.getReportExpireTime().getSeconds(), TimeUnit.SECONDS)
+        .expireAfterWrite(getReportConfig().getReportExpireTime().getSeconds(), TimeUnit.SECONDS)
         .build();
     this.network = network;
     this.users = users;
     this.inventory = inventory;
+    this.store = store;
 
-    if (config.isEnabled()) {
+    if (getConfig().isEnabled()) {
       enable();
       network.registerSubscriber(new AssistanceSubscriber(this, network.getNetworkId(), logger));
     }
   }
 
-  protected ReportConfig getReportConfig() {
+  private ReportConfig getReportConfig() {
     return (ReportConfig) getConfig();
   }
 
+  @Override
+  public void enable() {
+    super.enable();
+  }
+
   private boolean isCooldownEnabled() {
     return getReportConfig().getCooldown() > 0;
   }
 
-  protected boolean isPersistent() {
+  private boolean isPersistent() {
     return getReportConfig().isPersistent();
   }
 
@@ -162,9 +174,31 @@ public Report report(Player sender, Player target, String reason) {
     // Reset cooldown
     startCooldown(sender);
 
+    if (isPersistent()) {
+      store.save(report);
+    }
     return report;
   }
 
+  @Override
+  public CompletableFuture<List<Report>> query(String target) {
+    if (NameUtils.isMinecraftName(target)) {
+      // CONVERT TO UUID if username
+      return users
+          .getStoredId(target)
+          .thenApplyAsync(uuid -> uuid.isPresent()
+              ? store.queryList(uuid.get().toString()).join()
+              : Lists.newArrayList());
+    }
+
+    return store.queryList(target);
+  }
+
+  @Override
+  public CompletableFuture<Integer> count() {
+    return store.count();
+  }
+
   @Override
   public Set<Report> getRecentReports() {
     return recentReports.asMap().keySet();
@@ -198,6 +232,11 @@ public void recieveUpdate(AssistanceRequest request) {
     broadcastRequest(request);
   }
 
+  @Override
+  public void invalidate(UUID playerId) {
+    store.invalidate(playerId);
+  }
+
   @EventHandler
   public void onPlayerReport(PlayerReportEvent event) {
     recentReports.put(event.getReport(), Instant.now());