去除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

@@ -18,10 +18,10 @@ package cn.hutool.v7.setting;
import cn.hutool.v7.core.io.file.FileNameUtil;
import cn.hutool.v7.core.io.resource.NoResourceException;
import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
import cn.hutool.v7.core.text.StrUtil;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* Setting工具类<br>
@@ -33,7 +33,7 @@ public class SettingUtil {
/**
* 配置文件缓存
*/
private static final Map<String, Setting> SETTING_MAP = new SafeConcurrentHashMap<>();
private static final Map<String, Setting> SETTING_MAP = new ConcurrentHashMap<>();
/**
* 获取当前环境下的配置文件<br>

View File

@@ -17,13 +17,14 @@
package cn.hutool.v7.setting.profile;
import cn.hutool.v7.core.lang.Assert;
import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
import cn.hutool.v7.core.text.StrUtil;
import cn.hutool.v7.setting.Setting;
import java.io.Serial;
import java.io.Serializable;
import java.nio.charset.Charset;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* Profile可以让我们定义一系列的配置信息然后指定其激活条件。<br>
@@ -40,6 +41,7 @@ import java.util.Map;
*
*/
public class Profile implements Serializable {
@Serial
private static final long serialVersionUID = -4189955219454008744L;
/** 默认环境 */
@@ -52,7 +54,7 @@ public class Profile implements Serializable {
/** 是否使用变量 */
private boolean useVar;
/** 配置文件缓存 */
private final Map<String, Setting> settingMap = new SafeConcurrentHashMap<>();
private final Map<String, Setting> settingMap = new ConcurrentHashMap<>();
// -------------------------------------------------------------------------------- Constructor start
/**

View File

@@ -18,10 +18,10 @@ package cn.hutool.v7.setting.props;
import cn.hutool.v7.core.io.file.FileNameUtil;
import cn.hutool.v7.core.io.resource.NoResourceException;
import cn.hutool.v7.core.map.concurrent.SafeConcurrentHashMap;
import cn.hutool.v7.core.text.StrUtil;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
/**
* Props工具类<br>
@@ -35,7 +35,7 @@ public class PropsUtil {
/**
* 配置文件缓存
*/
private static final Map<String, Props> propsMap = new SafeConcurrentHashMap<>();
private static final Map<String, Props> propsMap = new ConcurrentHashMap<>();
/**
* 获取当前环境下的配置文件<br>