mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-07-21 15:09:48 +08:00
fix code
This commit is contained in:
@@ -1,11 +1,5 @@
|
||||
package cn.hutool.db.ds;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
|
||||
import cn.hutool.core.collection.CollectionUtil;
|
||||
import cn.hutool.core.io.resource.NoResourceException;
|
||||
import cn.hutool.core.lang.Assert;
|
||||
@@ -15,6 +9,11 @@ import cn.hutool.db.DbUtil;
|
||||
import cn.hutool.db.dialect.DriverUtil;
|
||||
import cn.hutool.setting.Setting;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/**
|
||||
* 抽象数据源工厂<br>
|
||||
* 此工厂抽象类用于实现数据源的缓存,当用户多次调用{@link #getDataSource(String)} 时,工厂只需创建一次即可。<br>
|
||||
@@ -32,9 +31,9 @@ public abstract class AbstractDSFactory extends DSFactory {
|
||||
private static final String DEFAULT_DB_SETTING_PATH2 = "db.setting";
|
||||
|
||||
/** 数据库连接配置文件 */
|
||||
private Setting setting;
|
||||
private final Setting setting;
|
||||
/** 数据源池 */
|
||||
private Map<String, DataSourceWrapper> dsMap;
|
||||
private final Map<String, DataSourceWrapper> dsMap;
|
||||
|
||||
/**
|
||||
* 构造
|
||||
|
@@ -144,7 +144,7 @@ public class MetaUtil {
|
||||
}
|
||||
}
|
||||
}
|
||||
return columnNames.toArray(new String[columnNames.size()]);
|
||||
return columnNames.toArray(new String[0]);
|
||||
} catch (Exception e) {
|
||||
throw new DbRuntimeException("Get columns error!", e);
|
||||
} finally {
|
||||
@@ -172,7 +172,6 @@ public class MetaUtil {
|
||||
* @param tableName 表名
|
||||
* @return Table对象
|
||||
*/
|
||||
@SuppressWarnings("resource")
|
||||
public static Table getTableMeta(DataSource ds, String tableName) {
|
||||
final Table table = Table.create(tableName);
|
||||
Connection conn = null;
|
||||
|
Reference in New Issue
Block a user