|
16 | 16 | import cc.carm.plugin.minesql.conf.SQLSourceGroup; |
17 | 17 | import cc.carm.plugin.minesql.lib.PluginLibraries; |
18 | 18 | import cc.carm.plugin.minesql.util.DBPropertiesUtil; |
19 | | -import cn.beecp.BeeDataSource; |
20 | | -import cn.beecp.BeeDataSourceConfig; |
21 | 19 | import co.aikar.commands.CommandManager; |
22 | 20 | import co.aikar.commands.InvalidCommandArgument; |
23 | 21 | import co.aikar.commands.Locales; |
24 | 22 | import net.byteflux.libby.Library; |
25 | 23 | import org.jetbrains.annotations.NotNull; |
26 | 24 | import org.jetbrains.annotations.Nullable; |
| 25 | +import org.stone.beecp.BeeDataSource; |
| 26 | +import org.stone.beecp.BeeDataSourceConfig; |
27 | 27 |
|
28 | 28 | import javax.sql.DataSource; |
29 | 29 | import java.io.File; |
@@ -143,9 +143,9 @@ public static MineSQLCore getInstance() { |
143 | 143 | Optional.ofNullable(conf.getSettings().getReadOnly()).ifPresent(config::setDefaultReadOnly); |
144 | 144 | Optional.ofNullable(conf.getSettings().getSchema()).ifPresent(config::setDefaultSchema); |
145 | 145 |
|
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); |
149 | 149 |
|
150 | 150 | SQLManagerImpl manager = create(name, config); |
151 | 151 | if (conf.getInitializer() != null) { |
|
0 commit comments