mirror of
https://gitee.com/chinabugotech/hutool.git
synced 2025-07-21 15:09:48 +08:00
去除JDK8兼容代码
This commit is contained in:
@@ -16,7 +16,6 @@
|
||||
|
||||
package cn.hutool.v7.db.dialect;
|
||||
|
||||
import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.db.config.DbConfig;
|
||||
import cn.hutool.v7.db.dialect.impl.*;
|
||||
@@ -26,6 +25,7 @@ import cn.hutool.v7.log.LogUtil;
|
||||
|
||||
import javax.sql.DataSource;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/**
|
||||
* 方言工厂类
|
||||
@@ -34,7 +34,7 @@ import java.util.Map;
|
||||
*/
|
||||
public class DialectFactory {
|
||||
|
||||
private static final Map<DataSource, Dialect> DIALECT_POOL = new SafeConcurrentHashMap<>();
|
||||
private static final Map<DataSource, Dialect> DIALECT_POOL = new ConcurrentHashMap<>();
|
||||
|
||||
private DialectFactory() {
|
||||
}
|
||||
|
@@ -19,7 +19,6 @@ package cn.hutool.v7.db.ds;
|
||||
import cn.hutool.v7.core.io.IoUtil;
|
||||
import cn.hutool.v7.core.lang.Singleton;
|
||||
import cn.hutool.v7.core.map.MapUtil;
|
||||
import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
|
||||
import cn.hutool.v7.core.text.StrUtil;
|
||||
import cn.hutool.v7.db.config.ConfigParser;
|
||||
import cn.hutool.v7.db.config.DbConfig;
|
||||
@@ -29,6 +28,7 @@ import cn.hutool.v7.log.LogUtil;
|
||||
import java.io.Closeable;
|
||||
import java.util.Collection;
|
||||
import java.util.Map;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
/**
|
||||
* 数据源池,用于支持多数据源。<br>
|
||||
@@ -84,7 +84,7 @@ public class DSPool implements Closeable {
|
||||
public DSPool(final ConfigParser configParser, final DSFactory factory) {
|
||||
this.configParser = null != configParser ? configParser : SettingConfigParser.of();
|
||||
this.factory = null != factory ? factory : DSUtil.getDefaultDsFactory();
|
||||
this.pool = new SafeConcurrentHashMap<>();
|
||||
this.pool = new ConcurrentHashMap<>();
|
||||
}
|
||||
|
||||
/**
|
||||
|
Reference in New Issue
Block a user