Merge branch 'v5-dev' of https://gitee.com/deligense/hutool into v5-dev

This commit is contained in:
hongzhe.qin 2021-11-01 10:58:31 +08:00
commit 8f35f5429b
26 changed files with 448 additions and 213 deletions

View File

@ -3,7 +3,7 @@
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
# 5.7.16 (2021-10-28) # 5.7.16 (2021-10-31)
### 🐣新特性 ### 🐣新特性
* 【core 】 增加DateTime.toLocalDateTime * 【core 】 增加DateTime.toLocalDateTime
@ -15,6 +15,10 @@
* 【extra 】 Sftp增加put和upload重载issue#I4FGDH@Gitee * 【extra 】 Sftp增加put和upload重载issue#I4FGDH@Gitee
* 【core 】 TemporalUtil增加toChronoUnit、toTimeUnit方法issue#I4FGDH@Gitee * 【core 】 TemporalUtil增加toChronoUnit、toTimeUnit方法issue#I4FGDH@Gitee
* 【core 】 StopWatch增加prettyPrint重载issue#1910@Github * 【core 】 StopWatch增加prettyPrint重载issue#1910@Github
* 【core 】 修改RegexPool中Ipv4正则
* 【json 】 Filter改为MutablePair以便编辑键值对issue#1921@Github
* 【core 】 Opt增加peeks方法pr#445@Gitee
* 【extra 】 MailAccount中user默认值改为邮箱全称issue#I4FYVY@Gitee
### 🐞Bug修复 ### 🐞Bug修复
* 【core 】 修复UrlBuilder.addPath歧义问题issue#1912@Github * 【core 】 修复UrlBuilder.addPath歧义问题issue#1912@Github
@ -22,6 +26,7 @@
* 【core 】 修复CharSequenceUtil.wrapIfMissing预定义长度计算问题issue#I4FDZ2@Gitee * 【core 】 修复CharSequenceUtil.wrapIfMissing预定义长度计算问题issue#I4FDZ2@Gitee
* 【poi 】 修复合并单元格为日期时导出单元格数据为数字问题issue#1911@Github * 【poi 】 修复合并单元格为日期时导出单元格数据为数字问题issue#1911@Github
* 【core 】 修复CompilerUtil.getFileManager参数没有使用的问题issue#I4FIO6@Gitee * 【core 】 修复CompilerUtil.getFileManager参数没有使用的问题issue#I4FIO6@Gitee
* 【core 】 修复NetUtil.isInRange的cidr判断问题pr#1917@Github
------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------
@ -39,6 +44,8 @@
* 【core 】 ZipUtil增加append方法pr#441@Gitee * 【core 】 ZipUtil增加append方法pr#441@Gitee
* 【core 】 CollUtil增加重载issue#I4E9FS@Gitee * 【core 】 CollUtil增加重载issue#I4E9FS@Gitee
* 【core 】 CopyOptions新增setFieldValueEditorissue#I4E08T@Gitee * 【core 】 CopyOptions新增setFieldValueEditorissue#I4E08T@Gitee
* 【core 】 增加SystemPropsUtilissue#1918@Gitee
* 【core 】 增加`hutool.date.lenient`系统属性issue#1918@Gitee
### 🐞Bug修复 ### 🐞Bug修复
* 【core 】 修复CollUtil.isEqualList两个null返回错误问题issue#1885@Github * 【core 】 修复CollUtil.isEqualList两个null返回错误问题issue#1885@Github

View File

@ -7,6 +7,7 @@ import cn.hutool.core.date.format.GlobalCustomFormat;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.SystemPropsUtil;
import java.sql.Timestamp; import java.sql.Timestamp;
import java.text.DateFormat; import java.text.DateFormat;
@ -288,7 +289,7 @@ public class DateTime extends Date {
* @see DatePattern * @see DatePattern
*/ */
public DateTime(CharSequence dateStr, DateParser dateParser) { public DateTime(CharSequence dateStr, DateParser dateParser) {
this(dateStr, dateParser, true); this(dateStr, dateParser, SystemPropsUtil.getBoolean(SystemPropsUtil.HUTOOL_DATE_LENIENT, true));
} }
/** /**

View File

@ -262,6 +262,25 @@ public class Opt<T> {
return this; return this;
} }
/**
* 如果包裹里元素的值存在就执行对应的操作集并返回本身
* 如果不存在返回一个空的{@code Opt}
*
* <p>属于 {@link #ifPresent}的链式拓展
* <p>属于 {@link #peek(Consumer)}的动态拓展
*
* @param actions 值存在时执行的操作动态参数可传入数组当数组为一个空数组时并不会抛出 {@code NPE}
* @return this
* @throws NullPointerException 如果值存在并且传入的操作集中的元素为 {@code null}
* @author VampireAchao
*/
@SafeVarargs
public final Opt<T> peeks(Consumer<T>... actions) throws NullPointerException {
// 第三个参数 (opts, opt) -> null其实并不会执行到该函数式接口所以直接返回了个null
return Stream.of(actions).reduce(this, Opt<T>::peek, (opts, opt) -> null);
}
/** /**
* 如果包裹里元素的值存在就返回本身如果不存在则使用传入的操作执行后获得的 {@code Opt} * 如果包裹里元素的值存在就返回本身如果不存在则使用传入的操作执行后获得的 {@code Opt}
* *

View File

@ -16,17 +16,17 @@ import java.util.Objects;
public class Pair<K, V> extends CloneSupport<Pair<K, V>> implements Serializable { public class Pair<K, V> extends CloneSupport<Pair<K, V>> implements Serializable {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
private final K key; protected K key;
private final V value; protected V value;
/** /**
* 构建{@link Pair}对象 * 构建{@code Pair}对象
* *
* @param <K> 键类型 * @param <K> 键类型
* @param <V> 值类型 * @param <V> 值类型
* @param key * @param key
* @param value * @param value
* @return {@link Pair} * @return {@code Pair}
* @since 5.4.3 * @since 5.4.3
*/ */
public static <K, V> Pair<K, V> of(K key, V value) { public static <K, V> Pair<K, V> of(K key, V value) {

View File

@ -32,9 +32,11 @@ public interface RegexPool {
*/ */
String GROUP_VAR = "\\$(\\d+)"; String GROUP_VAR = "\\$(\\d+)";
/** /**
* IP v4 * IP v4<br>
* 采用分组方式便于解析地址的每一个段
*/ */
String IPV4 = "\\b((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\.((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\.((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\.((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\b"; //String IPV4 = "\\b((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\.((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\.((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\.((?!\\d\\d\\d)\\d+|1\\d\\d|2[0-4]\\d|25[0-5])\\b";
String IPV4 = "^(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)\\.(25[0-5]|2[0-4]\\d|[0-1]?\\d?\\d)$";
/** /**
* IP v6 * IP v6
*/ */

View File

@ -3,7 +3,7 @@ package cn.hutool.core.lang.mutable;
import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.NumberUtil;
/** /**
* 可变 <code>double</code> 类型 * 可变 {@code double} 类型
* *
* @see Double * @see Double
* @since 3.0.1 * @since 3.0.1
@ -150,12 +150,12 @@ public class MutableDouble extends Number implements Comparable<MutableDouble>,
* 相等需同时满足如下条件 * 相等需同时满足如下条件
* <ol> * <ol>
* <li>非空</li> * <li>非空</li>
* <li>类型为 {@link MutableDouble}</li> * <li>类型为 {@code MutableDouble}</li>
* <li>值相等</li> * <li>值相等</li>
* </ol> * </ol>
* *
* @param obj 比对的对象 * @param obj 比对的对象
* @return 相同返回<code>true</code>否则 <code>false</code> * @return 相同返回<code>true</code>否则 {@code false}
*/ */
@Override @Override
public boolean equals(final Object obj) { public boolean equals(final Object obj) {
@ -175,7 +175,7 @@ public class MutableDouble extends Number implements Comparable<MutableDouble>,
/** /**
* 比较 * 比较
* *
* @param other 其它 {@link MutableDouble} 对象 * @param other 其它 {@code MutableDouble} 对象
* @return x==y返回0x&lt;y返回-1x&gt;y返回1 * @return x==y返回0x&lt;y返回-1x&gt;y返回1
*/ */
@Override @Override

View File

@ -0,0 +1,57 @@
package cn.hutool.core.lang.mutable;
import cn.hutool.core.lang.Pair;
/**
* 可变{@link Pair}实现可以修改键和值
*
* @param <K> 键类型
* @param <V> 值类型
* @since 5.7.16
*/
public class MutablePair<K, V> extends Pair<K, V> implements Mutable<Pair<K, V>>{
private static final long serialVersionUID = 1L;
/**
* 构造
*
* @param key
* @param value
*/
public MutablePair(K key, V value) {
super(key, value);
}
/**
* 设置键
*
* @param key 新键
* @return this
*/
public MutablePair<K, V> setKey(K key) {
this.key = key;
return this;
}
/**
* 设置值
*
* @param value 新值
* @return this
*/
public MutablePair<K, V> setValue(V value) {
this.value = value;
return this;
}
@Override
public Pair<K, V> get() {
return this;
}
@Override
public void set(Pair<K, V> pair) {
this.key = pair.getKey();
this.value = pair.getValue();
}
}

View File

@ -3,13 +3,14 @@ package cn.hutool.core.net;
import cn.hutool.core.collection.ListUtil; import cn.hutool.core.collection.ListUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Assert; import cn.hutool.core.lang.Assert;
import cn.hutool.core.lang.Validator; import cn.hutool.core.lang.PatternPool;
import cn.hutool.core.util.CharUtil; import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.regex.Matcher;
/** /**
* IPV4地址工具类 * IPV4地址工具类
@ -20,6 +21,7 @@ import java.util.Objects;
* @since 5.4.1 * @since 5.4.1
*/ */
public class Ipv4Util { public class Ipv4Util {
/** /**
* IP段的分割符 * IP段的分割符
*/ */
@ -149,18 +151,25 @@ public class Ipv4Util {
/** /**
* 根据ip地址(xxx.xxx.xxx.xxx)计算出long型的数据 * 根据ip地址(xxx.xxx.xxx.xxx)计算出long型的数据
* 方法别名inet_aton * 方法别名inet_aton
*
* @param strIP IP V4 地址 * @param strIP IP V4 地址
* @return long值 * @return long值
*/ */
public static long ipv4ToLong(String strIP) { public static long ipv4ToLong(String strIP) {
Validator.validateIpv4(strIP, "Invalid IPv4 address!"); final Matcher matcher = PatternPool.IPV4.matcher(strIP);
final long[] ip = Convert.convert(long[].class, StrUtil.split(strIP, CharUtil.DOT)); if (matcher.matches()) {
return (ip[0] << 24) + (ip[1] << 16) + (ip[2] << 8) + ip[3]; return matchAddress(matcher);
}
// Validator.validateIpv4(strIP, "Invalid IPv4 address!");
// final long[] ip = Convert.convert(long[].class, StrUtil.split(strIP, CharUtil.DOT));
// return (ip[0] << 24) + (ip[1] << 16) + (ip[2] << 8) + ip[3];
throw new IllegalArgumentException("Invalid IPv4 address!");
} }
/** /**
* 根据 ip/掩码位 计算IP段的起始IP字符串型 * 根据 ip/掩码位 计算IP段的起始IP字符串型
* 方法别名inet_ntoa * 方法别名inet_ntoa
*
* @param ip 给定的IP如218.240.38.69 * @param ip 给定的IP如218.240.38.69
* @param maskBit 给定的掩码位如30 * @param maskBit 给定的掩码位如30
* @return 起始IP的字符串表示 * @return 起始IP的字符串表示
@ -195,9 +204,7 @@ public class Ipv4Util {
* 根据子网掩码转换为掩码位 * 根据子网掩码转换为掩码位
* *
* @param mask 掩码的点分十进制表示例如 255.255.255.0 * @param mask 掩码的点分十进制表示例如 255.255.255.0
*
* @return 掩码位例如 24 * @return 掩码位例如 24
*
* @throws IllegalArgumentException 子网掩码非法 * @throws IllegalArgumentException 子网掩码非法
*/ */
public static int getMaskBitByMask(String mask) { public static int getMaskBitByMask(String mask) {
@ -282,7 +289,6 @@ public class Ipv4Util {
* 判断掩码是否合法 * 判断掩码是否合法
* *
* @param mask 掩码的点分十进制表示例如 255.255.255.0 * @param mask 掩码的点分十进制表示例如 255.255.255.0
*
* @return true掩码合法false掩码不合法 * @return true掩码合法false掩码不合法
*/ */
public static boolean isMaskValid(String mask) { public static boolean isMaskValid(String mask) {
@ -293,7 +299,6 @@ public class Ipv4Util {
* 判断掩码位是否合法 * 判断掩码位是否合法
* *
* @param maskBit 掩码位例如 24 * @param maskBit 掩码位例如 24
*
* @return true掩码位合法false掩码位不合法 * @return true掩码位合法false掩码位不合法
*/ */
public static boolean isMaskBitValid(int maskBit) { public static boolean isMaskBitValid(int maskBit) {
@ -315,5 +320,19 @@ public class Ipv4Util {
return getBeginIpLong(ip, maskBit) return getBeginIpLong(ip, maskBit)
+ ~ipv4ToLong(getMaskByMaskBit(maskBit)); + ~ipv4ToLong(getMaskByMaskBit(maskBit));
} }
/**
* 将匹配到的Ipv4地址的4个分组分别处理
*
* @param matcher 匹配到的Ipv4正则
* @return ipv4对应long
*/
private static long matchAddress(Matcher matcher) {
long addr = 0;
for (int i = 1; i <= 4; ++i) {
addr |= Long.parseLong(matcher.group(i)) << 8 * (4 - i);
}
return addr;
}
//-------------------------------------------------------------------------------- Private method end //-------------------------------------------------------------------------------- Private method end
} }

View File

@ -699,14 +699,15 @@ public class NetUtil {
* @since 4.0.6 * @since 4.0.6
*/ */
public static boolean isInRange(String ip, String cidr) { public static boolean isInRange(String ip, String cidr) {
String[] ips = StrUtil.splitToArray(ip, '.'); final int maskSplitMarkIndex = cidr.lastIndexOf(Ipv4Util.IP_MASK_SPLIT_MARK);
int ipAddr = (Integer.parseInt(ips[0]) << 24) | (Integer.parseInt(ips[1]) << 16) | (Integer.parseInt(ips[2]) << 8) | Integer.parseInt(ips[3]); if(maskSplitMarkIndex < 0){
int type = Integer.parseInt(cidr.replaceAll(".*/", "")); throw new IllegalArgumentException("Invalid cidr: " + cidr);
int mask = 0xFFFFFFFF << (32 - type); }
String cidrIp = cidr.replaceAll("/.*", "");
String[] cidrIps = cidrIp.split("\\."); final long mask = (-1L << 32 - Integer.parseInt(cidr.substring(maskSplitMarkIndex + 1)));
int cidrIpAddr = (Integer.parseInt(cidrIps[0]) << 24) | (Integer.parseInt(cidrIps[1]) << 16) | (Integer.parseInt(cidrIps[2]) << 8) | Integer.parseInt(cidrIps[3]); long cidrIpAddr = ipv4ToLong(cidr.substring(0, maskSplitMarkIndex));
return (ipAddr & mask) == (cidrIpAddr & mask);
return (ipv4ToLong(ip) & mask) == (cidrIpAddr & mask);
} }
/** /**

View File

@ -22,7 +22,6 @@ import java.util.Iterator;
import java.util.LinkedHashSet; import java.util.LinkedHashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Objects;
import java.util.Random; import java.util.Random;
import java.util.Set; import java.util.Set;
import java.util.function.Function; import java.util.function.Function;
@ -118,7 +117,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
public static <T> boolean hasNull(T... array) { public static <T> boolean hasNull(T... array) {
if (isNotEmpty(array)) { if (isNotEmpty(array)) {
for (T element : array) { for (T element : array) {
if (null == element) { if (ObjectUtil.isNull(element)) {
return true; return true;
} }
} }
@ -150,7 +149,7 @@ public class ArrayUtil extends PrimitiveArrayUtil {
*/ */
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public static <T> T firstNonNull(T... array) { public static <T> T firstNonNull(T... array) {
return firstMatch(Objects::nonNull, array); return firstMatch(ObjectUtil::isNotNull, array);
} }
/** /**

View File

@ -292,7 +292,7 @@ public class ObjectUtil {
* @since 3.0.7 * @since 3.0.7
*/ */
public static <T> T defaultIfNull(final T object, final T defaultValue) { public static <T> T defaultIfNull(final T object, final T defaultValue) {
return (null != object) ? object : defaultValue; return isNull(object) ? defaultValue : object;
} }
@ -300,14 +300,14 @@ public class ObjectUtil {
* 如果给定对象为{@code null} 返回默认值, 如果不为null 返回自定义handle处理后的返回值 * 如果给定对象为{@code null} 返回默认值, 如果不为null 返回自定义handle处理后的返回值
* *
* @param source Object 类型对象 * @param source Object 类型对象
* @param handle 自定义的处理方法 * @param handle 非空时自定义的处理方法
* @param defaultValue 默认为空的返回值 * @param defaultValue 默认为空的返回值
* @param <T> 被检查对象为{@code null}返回默认值否则返回自定义handle处理后的返回值 * @param <T> 被检查对象为{@code null}返回默认值否则返回自定义handle处理后的返回值
* @return 处理后的返回值 * @return 处理后的返回值
* @since 5.4.6 * @since 5.4.6
*/ */
public static <T> T defaultIfNull(Object source, Supplier<? extends T> handle, final T defaultValue) { public static <T> T defaultIfNull(Object source, Supplier<? extends T> handle, final T defaultValue) {
if (Objects.nonNull(source)) { if (isNotNull(source)) {
return handle.get(); return handle.get();
} }
return defaultValue; return defaultValue;

View File

@ -0,0 +1,146 @@
package cn.hutool.core.util;
import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Console;
import java.util.Properties;
/**
* 系统属性工具<br>
* 此工具用于读取系统属性或环境变量信息封装包括
* <ul>
* <li>{@link System#getProperty(String)}</li>
* <li>{@link System#getenv(String)}</li>
* </ul>
*
* @author looly
* @since 5.7.16
*/
public class SystemPropsUtil {
/** Hutool自定义系统属性是否解析日期字符串采用严格模式 */
public static String HUTOOL_DATE_LENIENT = "hutool.date.lenient";
/**
* 取得系统属性如果因为Java安全的限制而失败则将错误打在Log中然后返回 defaultValue
*
* @param name 属性名
* @param defaultValue 默认值
* @return 属性值或defaultValue
* @see System#getProperty(String)
* @see System#getenv(String)
*/
public static String get(String name, String defaultValue) {
return StrUtil.nullToDefault(get(name, false), defaultValue);
}
/**
* 取得系统属性如果因为Java安全的限制而失败则将错误打在Log中然后返回 {@code null}
*
* @param name 属性名
* @param quiet 安静模式不将出错信息打在{@code System.err}
* @return 属性值或{@code null}
* @see System#getProperty(String)
* @see System#getenv(String)
*/
public static String get(String name, boolean quiet) {
String value = null;
try {
value = System.getProperty(name);
} catch (SecurityException e) {
if (false == quiet) {
Console.error("Caught a SecurityException reading the system property '{}'; " +
"the SystemUtil property value will default to null.", name);
}
}
if (null == value) {
try {
value = System.getenv(name);
} catch (SecurityException e) {
if (false == quiet) {
Console.error("Caught a SecurityException reading the system env '{}'; " +
"the SystemUtil env value will default to null.", name);
}
}
}
return value;
}
/**
* 获得System属性
*
* @param key
* @return 属性值
* @see System#getProperty(String)
* @see System#getenv(String)
*/
public static String get(String key) {
return get(key, null);
}
/**
* 获得boolean类型值
*
* @param key
* @param defaultValue 默认值
* @return
*/
public static boolean getBoolean(String key, boolean defaultValue) {
String value = get(key);
if (value == null) {
return defaultValue;
}
value = value.trim().toLowerCase();
if (value.isEmpty()) {
return true;
}
return Convert.toBool(value, defaultValue);
}
/**
* 获得int类型值
*
* @param key
* @param defaultValue 默认值
* @return
*/
public static long getInt(String key, int defaultValue) {
return Convert.toInt(get(key), defaultValue);
}
/**
* 获得long类型值
*
* @param key
* @param defaultValue 默认值
* @return
*/
public static long getLong(String key, long defaultValue) {
return Convert.toLong(get(key), defaultValue);
}
/**
* @return 属性列表
*/
public static Properties getProps() {
return System.getProperties();
}
/**
* 设置系统属性value为{@code null}表示移除此属性
*
* @param key 属性名
* @param value 属性值{@code null}表示移除此属性
*/
public static void set(String key, String value) {
if (null == value) {
System.clearProperty(key);
} else {
System.setProperty(key, value);
}
}
}

View File

@ -63,6 +63,34 @@ public class OptTest {
Assert.assertEquals("hutool", name); Assert.assertEquals("hutool", name);
} }
@Test
public void peeksTest() {
User user = new User();
// 相当于上面peek的动态参数调用更加灵活你可以像操作数组一样去动态设置中间的步骤也可以使用这种方式去编写你的代码
// 可以一行搞定
Opt.ofNullable("hutool").peeks(user::setUsername, user::setNickname);
// 也可以在适当的地方换行使得代码的可读性提高
Opt.of(user).peeks(
u -> Assert.assertEquals("hutool", u.getNickname()),
u -> Assert.assertEquals("hutool", u.getUsername())
);
Assert.assertEquals("hutool", user.getNickname());
Assert.assertEquals("hutool", user.getUsername());
// 注意传入的lambda中对包裹内的元素执行赋值操作并不会影响到原来的元素,这是java语言的特性
// 这也是为什么我们需要getter和setter而不直接给bean中的属性赋值中的其中一个原因
String name = Opt.ofNullable("hutool").peeks(
username -> username = "123", username -> username = "456",
n -> Assert.assertEquals("hutool", n)).get();
Assert.assertEquals("hutool", name);
// 当然以下情况不会抛出NPE但也没什么意义
Opt.ofNullable("hutool").peeks().peeks().peeks();
Opt.ofNullable(null).peeks(i -> {
});
}
@Test @Test
public void orTest() { public void orTest() {
// 这是jdk9 Optional中的新函数直接照搬了过来 // 这是jdk9 Optional中的新函数直接照搬了过来

View File

@ -21,7 +21,7 @@ public class ValidatorTest {
} }
@Test @Test
public void hasNumberTest() throws Exception { public void hasNumberTest() {
String var1 = ""; String var1 = "";
String var2 = "str"; String var2 = "str";
String var3 = "180"; String var3 = "180";
@ -218,4 +218,13 @@ public class ValidatorTest {
public void isCarDrivingLicenceTest(){ public void isCarDrivingLicenceTest(){
Assert.assertTrue(Validator.isCarDrivingLicence("430101758218")); Assert.assertTrue(Validator.isCarDrivingLicence("430101758218"));
} }
@Test
public void validateIpv4Test(){
Validator.validateIpv4("192.168.1.1", "Error ip");
Validator.validateIpv4("8.8.8.8", "Error ip");
Validator.validateIpv4("0.0.0.0", "Error ip");
Validator.validateIpv4("255.255.255.255", "Error ip");
Validator.validateIpv4("127.0.0.0", "Error ip");
}
} }

View File

@ -1,11 +1,10 @@
package cn.hutool.core.net; package cn.hutool.core.net;
import cn.hutool.core.lang.Console;
import org.junit.Assert; import org.junit.Assert;
import org.junit.Test; import org.junit.Test;
import org.junit.function.ThrowingRunnable;
import java.util.List; import java.util.List;
import org.junit.function.ThrowingRunnable;
public class Ipv4UtilTest { public class Ipv4UtilTest {
@ -40,7 +39,7 @@ public class Ipv4UtilTest {
String ip = "192.168.1.1"; String ip = "192.168.1.1";
final int maskBitByMask = Ipv4Util.getMaskBitByMask("255.255.255.0"); final int maskBitByMask = Ipv4Util.getMaskBitByMask("255.255.255.0");
final String endIpStr = Ipv4Util.getEndIpStr(ip, maskBitByMask); final String endIpStr = Ipv4Util.getEndIpStr(ip, maskBitByMask);
Console.log(endIpStr); Assert.assertEquals("192.168.1.255", endIpStr);
} }
@Test @Test
@ -75,4 +74,16 @@ public class Ipv4UtilTest {
boolean maskBitValid = Ipv4Util.isMaskBitValid(33); boolean maskBitValid = Ipv4Util.isMaskBitValid(33);
Assert.assertFalse("掩码位非法检验", maskBitValid); Assert.assertFalse("掩码位非法检验", maskBitValid);
} }
@Test
public void ipv4ToLongTest(){
long l = Ipv4Util.ipv4ToLong("127.0.0.1");
Assert.assertEquals(2130706433L, l);
l = Ipv4Util.ipv4ToLong("114.114.114.114");
Assert.assertEquals(1920103026L, l);
l = Ipv4Util.ipv4ToLong("0.0.0.0");
Assert.assertEquals(0L, l);
l = Ipv4Util.ipv4ToLong("255.255.255.255");
Assert.assertEquals(4294967295L, l);
}
} }

View File

@ -101,4 +101,15 @@ public class NetUtilTest {
Console.log(txt); Console.log(txt);
} }
@Test
public void isInRangeTest(){
Assert.assertTrue(NetUtil.isInRange("114.114.114.114","0.0.0.0/0"));
Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.0.0.0/8"));
Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.168.0.0/16"));
Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.168.3.0/24"));
Assert.assertTrue(NetUtil.isInRange("192.168.3.4","192.168.3.4/32"));
Assert.assertFalse(NetUtil.isInRange("8.8.8.8","192.0.0.0/8"));
Assert.assertFalse(NetUtil.isInRange("114.114.114.114","192.168.3.4/32"));
}
} }

View File

@ -27,7 +27,7 @@
<mail.version>1.6.2</mail.version> <mail.version>1.6.2</mail.version>
<jsch.version>0.1.55</jsch.version> <jsch.version>0.1.55</jsch.version>
<zxing.version>3.4.1</zxing.version> <zxing.version>3.4.1</zxing.version>
<net.version>3.7.2</net.version> <net.version>3.8.0</net.version>
<emoji-java.version>5.1.1</emoji-java.version> <emoji-java.version>5.1.1</emoji-java.version>
<servlet-api.version>4.0.1</servlet-api.version> <servlet-api.version>4.0.1</servlet-api.version>
<spring-boot.version>2.5.6</spring-boot.version> <spring-boot.version>2.5.6</spring-boot.version>

View File

@ -608,8 +608,9 @@ public class MailAccount implements Serializable {
this.host = StrUtil.format("smtp.{}", StrUtil.subSuf(fromAddress, fromAddress.indexOf('@') + 1)); this.host = StrUtil.format("smtp.{}", StrUtil.subSuf(fromAddress, fromAddress.indexOf('@') + 1));
} }
if (StrUtil.isBlank(user)) { if (StrUtil.isBlank(user)) {
// 如果用户名为空默认为发件人邮箱前缀 // 如果用户名为空默认为发件人issue#I4FYVY@Gitee
this.user = StrUtil.subPre(fromAddress, fromAddress.indexOf('@')); //this.user = StrUtil.subPre(fromAddress, fromAddress.indexOf('@'));
this.user = fromAddress;
} }
if (null == this.auth) { if (null == this.auth) {
// 如果密码非空白则使用认证模式 // 如果密码非空白则使用认证模式

View File

@ -11,7 +11,7 @@ port = 465
# 发件人(必须正确,否则发送失败) # 发件人(必须正确,否则发送失败)
from = 小磊<hutool@yeah.net> from = 小磊<hutool@yeah.net>
# 用户名注意如果使用foxmail邮箱此处user为qq号 # 用户名注意如果使用foxmail邮箱此处user为qq号
user = hutool user = hutool@yeah.net
# 密码 # 密码
pass = q1w2e3 pass = q1w2e3
# 使用 STARTTLS安全连接 # 使用 STARTTLS安全连接

View File

@ -4,7 +4,7 @@ import cn.hutool.core.bean.BeanPath;
import cn.hutool.core.collection.ArrayIter; import cn.hutool.core.collection.ArrayIter;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Filter; import cn.hutool.core.lang.Filter;
import cn.hutool.core.lang.Pair; import cn.hutool.core.lang.mutable.MutablePair;
import cn.hutool.core.text.StrJoiner; import cn.hutool.core.text.StrJoiner;
import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.ArrayUtil;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
@ -446,13 +446,13 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
/** /**
* 加入或者替换JSONArray中指定Index的值如果index大于JSONArray的长度将在指定index设置值之前的位置填充JSONNull.Null * 加入或者替换JSONArray中指定Index的值如果index大于JSONArray的长度将在指定index设置值之前的位置填充JSONNull.Null
* *
* @param index 位置 * @param index 位置
* @param element 值对象. 可以是以下类型: Boolean, Double, Integer, JSONArray, JSONObject, Long, String, or the JSONNull.NULL. * @param element 值对象. 可以是以下类型: Boolean, Double, Integer, JSONArray, JSONObject, Long, String, or the JSONNull.NULL.
* @return 替换的值即之前的值 * @return 替换的值即之前的值
*/ */
@Override @Override
public Object set(int index, Object element) { public Object set(int index, Object element) {
if(index >= size()){ if (index >= size()) {
add(index, element); add(index, element);
} }
return this.rawList.set(index, JSONUtil.wrap(element, this.config)); return this.rawList.set(index, JSONUtil.wrap(element, this.config));
@ -537,11 +537,11 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
* 支持过滤器即选择哪些字段或值不写出 * 支持过滤器即选择哪些字段或值不写出
* *
* @param indentFactor 每层缩进空格数 * @param indentFactor 每层缩进空格数
* @param filter 键值对过滤器 * @param filter 过滤器可以修改值keyindex无法修改
* @return JSON字符串 * @return JSON字符串
* @since 5.7.15 * @since 5.7.15
*/ */
public String toJSONString(int indentFactor, Filter<Pair<Integer, Object>> filter){ public String toJSONString(int indentFactor, Filter<MutablePair<Integer, Object>> filter) {
final StringWriter sw = new StringWriter(); final StringWriter sw = new StringWriter();
synchronized (sw.getBuffer()) { synchronized (sw.getBuffer()) {
return this.write(sw, indentFactor, 0, filter).toString(); return this.write(sw, indentFactor, 0, filter).toString();
@ -560,18 +560,19 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
* @param writer writer * @param writer writer
* @param indentFactor 缩进因子定义每一级别增加的缩进量 * @param indentFactor 缩进因子定义每一级别增加的缩进量
* @param indent 本级别缩进量 * @param indent 本级别缩进量
* @param filter 过滤器 * @param filter 过滤器可以修改值keyindex无法修改
* @return Writer * @return Writer
* @throws JSONException JSON相关异常 * @throws JSONException JSON相关异常
* @since 5.7.15 * @since 5.7.15
*/ */
public Writer write(Writer writer, int indentFactor, int indent, Filter<Pair<Integer, Object>> filter) throws JSONException { public Writer write(Writer writer, int indentFactor, int indent, Filter<MutablePair<Integer, Object>> filter) throws JSONException {
final JSONWriter jsonWriter = JSONWriter.of(writer, indentFactor, indent, config) final JSONWriter jsonWriter = JSONWriter.of(writer, indentFactor, indent, config)
.beginArray(); .beginArray();
CollUtil.forEach(this, (value, index)->{ CollUtil.forEach(this, (value, index) -> {
if (null == filter || filter.accept(new Pair<>(index, value))) { final MutablePair<Integer, Object> pair = new MutablePair<>(index, value);
jsonWriter.writeValue(value); if (null == filter || filter.accept(pair)) {
jsonWriter.writeValue(pair.getValue());
} }
}); });
jsonWriter.end(); jsonWriter.end();
@ -580,6 +581,7 @@ public class JSONArray implements JSON, JSONGetter<Integer>, List<Object>, Rando
} }
// ------------------------------------------------------------------------------------------------- Private method start // ------------------------------------------------------------------------------------------------- Private method start
/** /**
* 初始化 * 初始化
* *

View File

@ -7,7 +7,7 @@ import cn.hutool.core.bean.copier.CopyOptions;
import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.collection.CollectionUtil;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Filter; import cn.hutool.core.lang.Filter;
import cn.hutool.core.lang.Pair; import cn.hutool.core.lang.mutable.MutablePair;
import cn.hutool.core.map.CaseInsensitiveLinkedMap; import cn.hutool.core.map.CaseInsensitiveLinkedMap;
import cn.hutool.core.map.CaseInsensitiveMap; import cn.hutool.core.map.CaseInsensitiveMap;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
@ -560,11 +560,11 @@ public class JSONObject implements JSON, JSONGetter<String>, Map<String, Object>
* 支持过滤器即选择哪些字段或值不写出 * 支持过滤器即选择哪些字段或值不写出
* *
* @param indentFactor 每层缩进空格数 * @param indentFactor 每层缩进空格数
* @param filter 键值对过滤器 * @param filter 过滤器同时可以修改编辑键和值
* @return JSON字符串 * @return JSON字符串
* @since 5.7.15 * @since 5.7.15
*/ */
public String toJSONString(int indentFactor, Filter<Pair<String, Object>> filter){ public String toJSONString(int indentFactor, Filter<MutablePair<String, Object>> filter) {
final StringWriter sw = new StringWriter(); final StringWriter sw = new StringWriter();
synchronized (sw.getBuffer()) { synchronized (sw.getBuffer()) {
return this.write(sw, indentFactor, 0, filter).toString(); return this.write(sw, indentFactor, 0, filter).toString();
@ -583,17 +583,18 @@ public class JSONObject implements JSON, JSONGetter<String>, Map<String, Object>
* @param writer writer * @param writer writer
* @param indentFactor 缩进因子定义每一级别增加的缩进量 * @param indentFactor 缩进因子定义每一级别增加的缩进量
* @param indent 本级别缩进量 * @param indent 本级别缩进量
* @param filter 过滤器 * @param filter 过滤器同时可以修改编辑键和值
* @return Writer * @return Writer
* @throws JSONException JSON相关异常 * @throws JSONException JSON相关异常
* @since 5.7.15 * @since 5.7.15
*/ */
public Writer write(Writer writer, int indentFactor, int indent, Filter<Pair<String, Object>> filter) throws JSONException { public Writer write(Writer writer, int indentFactor, int indent, Filter<MutablePair<String, Object>> filter) throws JSONException {
final JSONWriter jsonWriter = JSONWriter.of(writer, indentFactor, indent, config) final JSONWriter jsonWriter = JSONWriter.of(writer, indentFactor, indent, config)
.beginObj(); .beginObj();
this.forEach((key, value) -> { this.forEach((key, value) -> {
if (null == filter || filter.accept(new Pair<>(key, value))) { final MutablePair<String, Object> pair = new MutablePair<>(key, value);
jsonWriter.writeField(key, value); if (null == filter || filter.accept(pair)) {
jsonWriter.writeField(pair.getKey(), pair.getValue());
} }
}); });
jsonWriter.end(); jsonWriter.end();

View File

@ -10,6 +10,7 @@ import cn.hutool.core.io.FileUtil;
import cn.hutool.core.io.resource.ResourceUtil; import cn.hutool.core.io.resource.ResourceUtil;
import cn.hutool.core.lang.Console; import cn.hutool.core.lang.Console;
import cn.hutool.core.map.MapUtil; import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.json.test.bean.JSONBean; import cn.hutool.json.test.bean.JSONBean;
import cn.hutool.json.test.bean.ResultDto; import cn.hutool.json.test.bean.ResultDto;
@ -67,7 +68,7 @@ public class JSONObjectTest {
@Test @Test
public void toStringTest3() { public void toStringTest3() {
JSONObject json = Objects.requireNonNull(JSONUtil.createObj()// JSONObject json = Objects.requireNonNull(JSONUtil.createObj()//
.set("dateTime", DateUtil.parse("2019-05-02 22:12:01")))// .set("dateTime", DateUtil.parse("2019-05-02 22:12:01")))//
.setDateFormat(DatePattern.NORM_DATE_PATTERN); .setDateFormat(DatePattern.NORM_DATE_PATTERN);
Assert.assertEquals("{\"dateTime\":\"2019-05-02\"}", json.toString()); Assert.assertEquals("{\"dateTime\":\"2019-05-02\"}", json.toString());
} }
@ -86,14 +87,14 @@ public class JSONObjectTest {
@Test @Test
public void putAllTest() { public void putAllTest() {
JSONObject json1 = JSONUtil.createObj() JSONObject json1 = JSONUtil.createObj()
.set("a", "value1") .set("a", "value1")
.set("b", "value2") .set("b", "value2")
.set("c", "value3") .set("c", "value3")
.set("d", true); .set("d", true);
JSONObject json2 = JSONUtil.createObj() JSONObject json2 = JSONUtil.createObj()
.set("a", "value21") .set("a", "value21")
.set("b", "value22"); .set("b", "value22");
// putAll操作会覆盖相同key的值因此a,b两个key的值改变c的值不变 // putAll操作会覆盖相同key的值因此a,b两个key的值改变c的值不变
json1.putAll(json2); json1.putAll(json2);
@ -399,7 +400,7 @@ public class JSONObjectTest {
} }
@Test @Test
public void aliasTest(){ public void aliasTest() {
final BeanWithAlias beanWithAlias = new BeanWithAlias(); final BeanWithAlias beanWithAlias = new BeanWithAlias();
beanWithAlias.setValue1("张三"); beanWithAlias.setValue1("张三");
beanWithAlias.setValue2(35); beanWithAlias.setValue2(35);
@ -417,7 +418,7 @@ public class JSONObjectTest {
} }
@Test @Test
public void setDateFormatTest(){ public void setDateFormatTest() {
JSONConfig jsonConfig = JSONConfig.create(); JSONConfig jsonConfig = JSONConfig.create();
jsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss"); jsonConfig.setDateFormat("yyyy-MM-dd HH:mm:ss");
jsonConfig.setOrder(true); jsonConfig.setOrder(true);
@ -430,7 +431,7 @@ public class JSONObjectTest {
} }
@Test @Test
public void setDateFormatTest2(){ public void setDateFormatTest2() {
JSONConfig jsonConfig = JSONConfig.create(); JSONConfig jsonConfig = JSONConfig.create();
jsonConfig.setDateFormat("yyyy#MM#dd"); jsonConfig.setDateFormat("yyyy#MM#dd");
jsonConfig.setOrder(true); jsonConfig.setOrder(true);
@ -451,7 +452,7 @@ public class JSONObjectTest {
} }
@Test @Test
public void setCustomDateFormatTest(){ public void setCustomDateFormatTest() {
JSONConfig jsonConfig = JSONConfig.create(); JSONConfig jsonConfig = JSONConfig.create();
jsonConfig.setDateFormat("#sss"); jsonConfig.setDateFormat("#sss");
jsonConfig.setOrder(true); jsonConfig.setOrder(true);
@ -472,7 +473,7 @@ public class JSONObjectTest {
} }
@Test @Test
public void getTimestampTest(){ public void getTimestampTest() {
String timeStr = "1970-01-01 00:00:00"; String timeStr = "1970-01-01 00:00:00";
final JSONObject jsonObject = JSONUtil.createObj().set("time", timeStr); final JSONObject jsonObject = JSONUtil.createObj().set("time", timeStr);
final Timestamp time = jsonObject.get("time", Timestamp.class); final Timestamp time = jsonObject.get("time", Timestamp.class);
@ -518,7 +519,7 @@ public class JSONObjectTest {
} }
@Test @Test
public void parseBeanSameNameTest(){ public void parseBeanSameNameTest() {
final SameNameBean sameNameBean = new SameNameBean(); final SameNameBean sameNameBean = new SameNameBean();
final JSONObject parse = JSONUtil.parseObj(sameNameBean); final JSONObject parse = JSONUtil.parseObj(sameNameBean);
Assert.assertEquals("123", parse.getStr("username")); Assert.assertEquals("123", parse.getStr("username"));
@ -537,9 +538,11 @@ public class JSONObjectTest {
public static class SameNameBean { public static class SameNameBean {
private final String username = "123"; private final String username = "123";
private final String userName = "abc"; private final String userName = "abc";
public String getUsername() { public String getUsername() {
return username; return username;
} }
@PropIgnore @PropIgnore
private final String fieldToIgnore = "sfdsdads"; private final String fieldToIgnore = "sfdsdads";
@ -547,13 +550,13 @@ public class JSONObjectTest {
return userName; return userName;
} }
public String getFieldToIgnore(){ public String getFieldToIgnore() {
return this.fieldToIgnore; return this.fieldToIgnore;
} }
} }
@Test @Test
public void setEntryTest(){ public void setEntryTest() {
final HashMap<String, String> of = MapUtil.of("test", "testValue"); final HashMap<String, String> of = MapUtil.of("test", "testValue");
final Set<Map.Entry<String, String>> entries = of.entrySet(); final Set<Map.Entry<String, String>> entries = of.entrySet();
final Map.Entry<String, String> next = entries.iterator().next(); final Map.Entry<String, String> next = entries.iterator().next();
@ -563,13 +566,13 @@ public class JSONObjectTest {
} }
@Test(expected = JSONException.class) @Test(expected = JSONException.class)
public void createJSONObjectTest(){ public void createJSONObjectTest() {
// 集合类不支持转为JSONObject // 集合类不支持转为JSONObject
new JSONObject(new JSONArray(), JSONConfig.create()); new JSONObject(new JSONArray(), JSONConfig.create());
} }
@Test @Test
public void floatTest(){ public void floatTest() {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("c", 2.0F); map.put("c", 2.0F);
@ -578,7 +581,7 @@ public class JSONObjectTest {
} }
@Test @Test
public void accumulateTest(){ public void accumulateTest() {
final JSONObject jsonObject = JSONUtil.createObj().accumulate("key1", "value1"); final JSONObject jsonObject = JSONUtil.createObj().accumulate("key1", "value1");
Assert.assertEquals("{\"key1\":\"value1\"}", jsonObject.toString()); Assert.assertEquals("{\"key1\":\"value1\"}", jsonObject.toString());
@ -598,7 +601,7 @@ public class JSONObjectTest {
@Test @Test
public void bigDecimalTest(){ public void bigDecimalTest() {
String jsonStr = "{\"orderId\":\"1704747698891333662002277\"}"; String jsonStr = "{\"orderId\":\"1704747698891333662002277\"}";
BigDecimalBean bigDecimalBean = JSONUtil.toBean(jsonStr, BigDecimalBean.class); BigDecimalBean bigDecimalBean = JSONUtil.toBean(jsonStr, BigDecimalBean.class);
Assert.assertEquals("{\"orderId\":1704747698891333662002277}", JSONUtil.toJsonStr(bigDecimalBean)); Assert.assertEquals("{\"orderId\":1704747698891333662002277}", JSONUtil.toJsonStr(bigDecimalBean));
@ -606,12 +609,12 @@ public class JSONObjectTest {
@Data @Data
static static
class BigDecimalBean{ class BigDecimalBean {
private BigDecimal orderId; private BigDecimal orderId;
} }
@Test @Test
public void filterIncludeTest(){ public void filterIncludeTest() {
JSONObject json1 = JSONUtil.createObj(JSONConfig.create().setOrder(true)) JSONObject json1 = JSONUtil.createObj(JSONConfig.create().setOrder(true))
.set("a", "value1") .set("a", "value1")
.set("b", "value2") .set("b", "value2")
@ -623,7 +626,7 @@ public class JSONObjectTest {
} }
@Test @Test
public void filterExcludeTest(){ public void filterExcludeTest() {
JSONObject json1 = JSONUtil.createObj(JSONConfig.create().setOrder(true)) JSONObject json1 = JSONUtil.createObj(JSONConfig.create().setOrder(true))
.set("a", "value1") .set("a", "value1")
.set("b", "value2") .set("b", "value2")
@ -633,4 +636,37 @@ public class JSONObjectTest {
final String s = json1.toJSONString(0, (pair) -> false == pair.getKey().equals("b")); final String s = json1.toJSONString(0, (pair) -> false == pair.getKey().equals("b"));
Assert.assertEquals("{\"a\":\"value1\",\"c\":\"value3\",\"d\":true}", s); Assert.assertEquals("{\"a\":\"value1\",\"c\":\"value3\",\"d\":true}", s);
} }
@Test
public void editTest() {
JSONObject json1 = JSONUtil.createObj(JSONConfig.create().setOrder(true))
.set("a", "value1")
.set("b", "value2")
.set("c", "value3")
.set("d", true);
final String s = json1.toJSONString(0, (pair) -> {
if ("b".equals(pair.getKey())) {
// 修改值为新值
pair.setValue(pair.getValue() + "_edit");
return true;
}
// 除了"b"其他都去掉
return false;
});
Assert.assertEquals("{\"b\":\"value2_edit\"}", s);
}
@Test
public void nullToEmptyTest() {
JSONObject json1 = JSONUtil.createObj(JSONConfig.create().setOrder(true).setIgnoreNullValue(false))
.set("a", null)
.set("b", "value2");
final String s = json1.toJSONString(0, (pair) -> {
pair.setValue(ObjectUtil.defaultIfNull(pair.getValue(), StrUtil.EMPTY));
return true;
});
Assert.assertEquals("{\"a\":\"\",\"b\":\"value2\"}", s);
}
} }

View File

@ -8,6 +8,7 @@ import cn.hutool.core.util.CharUtil;
import cn.hutool.core.util.CharsetUtil; import cn.hutool.core.util.CharsetUtil;
import cn.hutool.core.util.ReUtil; import cn.hutool.core.util.ReUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.SystemPropsUtil;
import cn.hutool.log.Log; import cn.hutool.log.Log;
import java.io.BufferedReader; import java.io.BufferedReader;
@ -230,13 +231,9 @@ public class SettingLoader {
varValue = this.groupedMap.get(groupAndKey.get(0), groupAndKey.get(1)); varValue = this.groupedMap.get(groupAndKey.get(0), groupAndKey.get(1));
} }
} }
// 系统参数中查找 // 系统参数和环境变量中查找
if (null == varValue) { if (null == varValue) {
varValue = System.getProperty(key); varValue = SystemPropsUtil.get(key);
}
// 环境变量中查找
if (null == varValue) {
varValue = System.getenv(key);
} }
if (null != varValue) { if (null != varValue) {

View File

@ -13,7 +13,7 @@ public class YamlUtilTest {
@Test @Test
public void loadByPathTest() { public void loadByPathTest() {
final Dict result = YamlUtil.loadByPath("test.yaml", Dict.class); final Dict result = YamlUtil.loadByPath("test.yaml");
Assert.assertEquals("John", result.getStr("firstName")); Assert.assertEquals("John", result.getStr("firstName"));

View File

@ -11,3 +11,4 @@ homeAddress:
city: "City Y" city: "City Y"
state: "State Y" state: "State Y"
zip: 345657 zip: 345657
123: 345

View File

@ -1,9 +1,9 @@
package cn.hutool.system; package cn.hutool.system;
import cn.hutool.core.convert.Convert; import cn.hutool.core.convert.Convert;
import cn.hutool.core.lang.Console;
import cn.hutool.core.lang.Singleton; import cn.hutool.core.lang.Singleton;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import cn.hutool.core.util.SystemPropsUtil;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.lang.management.ClassLoadingMXBean; import java.lang.management.ClassLoadingMXBean;
@ -17,7 +17,6 @@ import java.lang.management.OperatingSystemMXBean;
import java.lang.management.RuntimeMXBean; import java.lang.management.RuntimeMXBean;
import java.lang.management.ThreadMXBean; import java.lang.management.ThreadMXBean;
import java.util.List; import java.util.List;
import java.util.Properties;
/** /**
* Java的System类封装工具类<br> * Java的System类封装工具类<br>
@ -25,7 +24,7 @@ import java.util.Properties;
* *
* @author Looly * @author Looly
*/ */
public class SystemUtil { public class SystemUtil extends SystemPropsUtil {
// ----- Java运行时环境信息 -----/ // ----- Java运行时环境信息 -----/
/** /**
@ -149,117 +148,6 @@ public class SystemUtil {
*/ */
public final static String USER_DIR = SystemPropsKeys.USER_DIR; public final static String USER_DIR = SystemPropsKeys.USER_DIR;
// ----------------------------------------------------------------------- Basic start
/**
* 取得系统属性如果因为Java安全的限制而失败则将错误打在Log中然后返回 defaultValue
*
* @param name 属性名
* @param defaultValue 默认值
* @return 属性值或defaultValue
* @see System#getProperty(String)
* @see System#getenv(String)
*/
public static String get(String name, String defaultValue) {
return StrUtil.nullToDefault(get(name, false), defaultValue);
}
/**
* 取得系统属性如果因为Java安全的限制而失败则将错误打在Log中然后返回 {@code null}
*
* @param name 属性名
* @param quiet 安静模式不将出错信息打在{@code System.err}
* @return 属性值或{@code null}
* @see System#getProperty(String)
* @see System#getenv(String)
*/
public static String get(String name, boolean quiet) {
String value = null;
try {
value = System.getProperty(name);
} catch (SecurityException e) {
if (false == quiet) {
Console.error("Caught a SecurityException reading the system property '{}'; " +
"the SystemUtil property value will default to null.", name);
}
}
if (null == value) {
try {
value = System.getenv(name);
} catch (SecurityException e) {
if (false == quiet) {
Console.error("Caught a SecurityException reading the system env '{}'; " +
"the SystemUtil env value will default to null.", name);
}
}
}
return value;
}
/**
* 获得System属性
*
* @param key
* @return 属性值
* @see System#getProperty(String)
* @see System#getenv(String)
*/
public static String get(String key) {
return get(key, null);
}
/**
* 获得boolean类型值
*
* @param key
* @param defaultValue 默认值
* @return
*/
public static boolean getBoolean(String key, boolean defaultValue) {
String value = get(key);
if (value == null) {
return defaultValue;
}
value = value.trim().toLowerCase();
if (value.isEmpty()) {
return true;
}
return Convert.toBool(value, defaultValue);
}
/**
* 获得int类型值
*
* @param key
* @param defaultValue 默认值
* @return
*/
public static long getInt(String key, int defaultValue) {
return Convert.toInt(get(key), defaultValue);
}
/**
* 获得long类型值
*
* @param key
* @param defaultValue 默认值
* @return
*/
public static long getLong(String key, long defaultValue) {
return Convert.toLong(get(key), defaultValue);
}
/**
* @return 属性列表
*/
public static Properties props() {
return System.getProperties();
}
/** /**
* 获取当前进程 PID * 获取当前进程 PID
* *
@ -268,7 +156,6 @@ public class SystemUtil {
public static long getCurrentPID() { public static long getCurrentPID() {
return Long.parseLong(getRuntimeMXBean().getName().split("@")[0]); return Long.parseLong(getRuntimeMXBean().getName().split("@")[0]);
} }
// ----------------------------------------------------------------------- Basic end
/** /**
* 返回Java虚拟机类加载系统相关属性 * 返回Java虚拟机类加载系统相关属性