lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2025-04-05 17:37:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

修改所调用的 ObjectUtil#defaultIfNull 的重载版本

Browse Source
This commit is contained in:
ZhouXY108 2024-11-04 15:23:11 +08:00
parent 8b79d3caa3
commit 75b434fb49
8 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hutool-core/src/main/java/cn/hutool/core/date/DateTime.java
View File

@ -160,7 +160,7 @@ public class DateTime extends Date {
* @since 4.1.2 * @since 4.1.2
*/ */
public DateTime(Date date, TimeZone timeZone) { public DateTime(Date date, TimeZone timeZone) {
this(ObjectUtil.defaultIfNull(date, new Date()).getTime(), timeZone); this(ObjectUtil.defaultIfNull(date, () -> new Date()).getTime(), timeZone);
} }
/** /**

2
hutool-core/src/main/java/cn/hutool/core/io/FastByteArrayOutputStream.java
View File

@ -117,7 +117,7 @@ public class FastByteArrayOutputStream extends OutputStream {
*/ */
public String toString(Charset charset) { public String toString(Charset charset) {
return new String(toByteArray(), return new String(toByteArray(),
ObjectUtil.defaultIfNull(charset, CharsetUtil.defaultCharset())); ObjectUtil.defaultIfNull(charset, () -> CharsetUtil.defaultCharset()));
} }
} }

2
hutool-core/src/main/java/cn/hutool/core/io/file/PathMover.java
View File

@ -59,7 +59,7 @@ public class PathMover {
} }
this.src = src; this.src = src;
this.target = Assert.notNull(target, "Target path must be not null !"); this.target = Assert.notNull(target, "Target path must be not null !");
this.options = ObjUtil.defaultIfNull(options, new CopyOption[]{});; this.options = ObjUtil.defaultIfNull(options, () -> new CopyOption[]{});
} }
/** /**

2
hutool-core/src/main/java/cn/hutool/core/lang/ResourceClassLoader.java
View File

@ -31,7 +31,7 @@ public class ResourceClassLoader<T extends Resource> extends SecureClassLoader {
*/ */
public ResourceClassLoader(ClassLoader parentClassLoader, Map<String, T> resourceMap) { public ResourceClassLoader(ClassLoader parentClassLoader, Map<String, T> resourceMap) {
super(ObjectUtil.defaultIfNull(parentClassLoader, ClassLoaderUtil::getClassLoader)); super(ObjectUtil.defaultIfNull(parentClassLoader, ClassLoaderUtil::getClassLoader));
this.resourceMap = ObjectUtil.defaultIfNull(resourceMap, new HashMap<>()); this.resourceMap = ObjectUtil.defaultIfNull(resourceMap, () -> new HashMap<>());
this.cacheClassMap = new HashMap<>(); this.cacheClassMap = new HashMap<>();
} }

2
hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java
View File

@ -54,7 +54,7 @@ public class UrlPath {
* @return 节点列表 * @return 节点列表
*/ */
public List<String> getSegments() { public List<String> getSegments() {
return ObjectUtil.defaultIfNull(this.segments, ListUtil.empty()); return ObjectUtil.defaultIfNull(this.segments, ListUtil::empty);
} }
/** /**

5
hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java
View File

@ -142,7 +142,10 @@ public enum ClipboardMonitor implements ClipboardOwner, Runnable, Closeable {
if (isRunning) { if (isRunning) {
// 继续监听 // 继续监听
clipboard.setContents(ObjectUtil.defaultIfNull(transferable, ObjectUtil.defaultIfNull(newContents, contents)), this); clipboard.setContents(
ObjectUtil.defaultIfNull(transferable,
() -> ObjectUtil.defaultIfNull(newContents, contents)),
this);
} }
} }

2
hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java
View File

@ -389,7 +389,7 @@ public class TypeUtil {
if (null == field) { if (null == field) {
return null; return null;
} }
return getActualType(ObjectUtil.defaultIfNull(type, field.getDeclaringClass()), field.getGenericType()); return getActualType(ObjectUtil.defaultIfNull(type, field::getDeclaringClass), field.getGenericType());
} }
/** /**

4
hutool-json/src/main/java/cn/hutool/json/JSONObject.java
View File

@ -105,8 +105,8 @@ public class JSONObject extends MapWrapper<String, Object> implements JSON, JSON
* @since 4.1.19 * @since 4.1.19
*/ */
public JSONObject(int capacity, JSONConfig config) { public JSONObject(int capacity, JSONConfig config) {
super(InternalJSONUtil.createRawMap(capacity, ObjectUtil.defaultIfNull(config, JSONConfig.create()))); super(InternalJSONUtil.createRawMap(capacity, ObjectUtil.defaultIfNull(config, JSONConfig::create)));
this.config = ObjectUtil.defaultIfNull(config, JSONConfig.create()); this.config = ObjectUtil.defaultIfNull(config, JSONConfig::create);
} }
/** /**