去除JDK8兼容代码

This commit is contained in:
Looly
2025-04-18 12:12:34 +08:00
parent 45419bb8dc
commit 07739d72db
37 changed files with 154 additions and 725 deletions

View File

@@ -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() {
}

View File

@@ -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<>();
}
/**