From 31aa49a60be56f6fe0874053616e157ac6ff34fb Mon Sep 17 00:00:00 2001
From: Carm <carm@carm.cc>
Date: Sun, 26 Jan 2025 08:37:05 +0800
Subject: [PATCH] feat(cp): Update to newest beecp

---
 .../main/java/cc/carm/plugin/minesql/MineSQLCore.java  | 10 +++++-----
 .../java/cc/carm/plugin/minesql/MineSQLVelocity.java   |  1 -
 pom.xml                                                |  2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java b/core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java
index 1b1a8c6..96b58ad 100644
--- a/core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java
+++ b/core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java
@@ -16,14 +16,14 @@
 import cc.carm.plugin.minesql.conf.SQLSourceGroup;
 import cc.carm.plugin.minesql.lib.PluginLibraries;
 import cc.carm.plugin.minesql.util.DBPropertiesUtil;
-import cn.beecp.BeeDataSource;
-import cn.beecp.BeeDataSourceConfig;
 import co.aikar.commands.CommandManager;
 import co.aikar.commands.InvalidCommandArgument;
 import co.aikar.commands.Locales;
 import net.byteflux.libby.Library;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.stone.beecp.BeeDataSource;
+import org.stone.beecp.BeeDataSourceConfig;
 
 import javax.sql.DataSource;
 import java.io.File;
@@ -143,9 +143,9 @@ public static MineSQLCore getInstance() {
         Optional.ofNullable(conf.getSettings().getReadOnly()).ifPresent(config::setDefaultReadOnly);
         Optional.ofNullable(conf.getSettings().getSchema()).ifPresent(config::setDefaultSchema);
 
-        Optional.ofNullable(conf.getSettings().getValidationSQL()).ifPresent(config::setValidTestSql);
-        Optional.ofNullable(conf.getSettings().getValidationTimeout()).ifPresent(config::setValidTestTimeout);
-        Optional.ofNullable(conf.getSettings().getValidationInterval()).ifPresent(config::setValidAssumeTime);
+        Optional.ofNullable(conf.getSettings().getValidationSQL()).ifPresent(config::setAliveTestSql);
+        Optional.ofNullable(conf.getSettings().getValidationTimeout()).ifPresent(config::setAliveTestTimeout);
+        Optional.ofNullable(conf.getSettings().getValidationInterval()).ifPresent(config::setTimerCheckInterval);
 
         SQLManagerImpl manager = create(name, config);
         if (conf.getInitializer() != null) {
diff --git a/platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java b/platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java
index 7e6c1e3..7ff214d 100644
--- a/platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java
+++ b/platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java
@@ -123,7 +123,6 @@ public String getVersion() {
         return this.dataFolder;
     }
 
-
     @Override
     public @NotNull CommandManager<?, ?, ?, ?, ?, ?> getCommandManager() {
         return commandManager;
diff --git a/pom.xml b/pom.xml
index c19541b..40ac067 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,7 +14,7 @@
         <deps.easysql.version>0.4.7</deps.easysql.version>
         <deps.easyconf.version>3.5.1</deps.easyconf.version>
         <deps.easyplugin.version>1.5.5</deps.easyplugin.version>
-        <deps.beecp.version>3.3.9</deps.beecp.version>
+        <deps.beecp.version>4.1.7</deps.beecp.version>
 
         <deps.libby.version>1.1.5</deps.libby.version>
         <deps.acf.version>0.5.1-SNAPSHOT</deps.acf.version>