Skip to content

Commit 31aa49a

Browse files
committed
feat(cp): Update to newest beecp
1 parent 1e2b180 commit 31aa49a

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

core/src/main/java/cc/carm/plugin/minesql/MineSQLCore.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@
1616
import cc.carm.plugin.minesql.conf.SQLSourceGroup;
1717
import cc.carm.plugin.minesql.lib.PluginLibraries;
1818
import cc.carm.plugin.minesql.util.DBPropertiesUtil;
19-
import cn.beecp.BeeDataSource;
20-
import cn.beecp.BeeDataSourceConfig;
2119
import co.aikar.commands.CommandManager;
2220
import co.aikar.commands.InvalidCommandArgument;
2321
import co.aikar.commands.Locales;
2422
import net.byteflux.libby.Library;
2523
import org.jetbrains.annotations.NotNull;
2624
import org.jetbrains.annotations.Nullable;
25+
import org.stone.beecp.BeeDataSource;
26+
import org.stone.beecp.BeeDataSourceConfig;
2727

2828
import javax.sql.DataSource;
2929
import java.io.File;
@@ -143,9 +143,9 @@ public static MineSQLCore getInstance() {
143143
Optional.ofNullable(conf.getSettings().getReadOnly()).ifPresent(config::setDefaultReadOnly);
144144
Optional.ofNullable(conf.getSettings().getSchema()).ifPresent(config::setDefaultSchema);
145145

146-
Optional.ofNullable(conf.getSettings().getValidationSQL()).ifPresent(config::setValidTestSql);
147-
Optional.ofNullable(conf.getSettings().getValidationTimeout()).ifPresent(config::setValidTestTimeout);
148-
Optional.ofNullable(conf.getSettings().getValidationInterval()).ifPresent(config::setValidAssumeTime);
146+
Optional.ofNullable(conf.getSettings().getValidationSQL()).ifPresent(config::setAliveTestSql);
147+
Optional.ofNullable(conf.getSettings().getValidationTimeout()).ifPresent(config::setAliveTestTimeout);
148+
Optional.ofNullable(conf.getSettings().getValidationInterval()).ifPresent(config::setTimerCheckInterval);
149149

150150
SQLManagerImpl manager = create(name, config);
151151
if (conf.getInitializer() != null) {

platforms/velocity/src/main/java/cc/carm/plugin/minesql/MineSQLVelocity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ public String getVersion() {
123123
return this.dataFolder;
124124
}
125125

126-
127126
@Override
128127
public @NotNull CommandManager<?, ?, ?, ?, ?, ?> getCommandManager() {
129128
return commandManager;

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<deps.easysql.version>0.4.7</deps.easysql.version>
1515
<deps.easyconf.version>3.5.1</deps.easyconf.version>
1616
<deps.easyplugin.version>1.5.5</deps.easyplugin.version>
17-
<deps.beecp.version>3.3.9</deps.beecp.version>
17+
<deps.beecp.version>4.1.7</deps.beecp.version>
1818

1919
<deps.libby.version>1.1.5</deps.libby.version>
2020
<deps.acf.version>0.5.1-SNAPSHOT</deps.acf.version>

0 commit comments

Comments
 (0)