From 75b434fb4958995baf423c3f8b90355176dcb70c Mon Sep 17 00:00:00 2001 From: ZhouXY108 Date: Mon, 4 Nov 2024 15:23:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=80=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E7=9A=84=20ObjectUtil#defaultIfNull=20=E7=9A=84=E9=87=8D?= =?UTF-8?q?=E8=BD=BD=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hutool-core/src/main/java/cn/hutool/core/date/DateTime.java | 2 +- .../java/cn/hutool/core/io/FastByteArrayOutputStream.java | 2 +- .../src/main/java/cn/hutool/core/io/file/PathMover.java | 2 +- .../main/java/cn/hutool/core/lang/ResourceClassLoader.java | 2 +- .../src/main/java/cn/hutool/core/net/url/UrlPath.java | 2 +- .../cn/hutool/core/swing/clipboard/ClipboardMonitor.java | 5 ++++- hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java | 2 +- hutool-json/src/main/java/cn/hutool/json/JSONObject.java | 4 ++-- 8 files changed, 12 insertions(+), 9 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/core/date/DateTime.java b/hutool-core/src/main/java/cn/hutool/core/date/DateTime.java index 9cea9780f..d1b33c8c8 100644 --- a/hutool-core/src/main/java/cn/hutool/core/date/DateTime.java +++ b/hutool-core/src/main/java/cn/hutool/core/date/DateTime.java @@ -160,7 +160,7 @@ public class DateTime extends Date { * @since 4.1.2 */ public DateTime(Date date, TimeZone timeZone) { - this(ObjectUtil.defaultIfNull(date, new Date()).getTime(), timeZone); + this(ObjectUtil.defaultIfNull(date, () -> new Date()).getTime(), timeZone); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/io/FastByteArrayOutputStream.java b/hutool-core/src/main/java/cn/hutool/core/io/FastByteArrayOutputStream.java index 68d78b489..24e30898a 100644 --- a/hutool-core/src/main/java/cn/hutool/core/io/FastByteArrayOutputStream.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/FastByteArrayOutputStream.java @@ -117,7 +117,7 @@ public class FastByteArrayOutputStream extends OutputStream { */ public String toString(Charset charset) { return new String(toByteArray(), - ObjectUtil.defaultIfNull(charset, CharsetUtil.defaultCharset())); + ObjectUtil.defaultIfNull(charset, () -> CharsetUtil.defaultCharset())); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/io/file/PathMover.java b/hutool-core/src/main/java/cn/hutool/core/io/file/PathMover.java index 489a946de..24729a084 100755 --- a/hutool-core/src/main/java/cn/hutool/core/io/file/PathMover.java +++ b/hutool-core/src/main/java/cn/hutool/core/io/file/PathMover.java @@ -59,7 +59,7 @@ public class PathMover { } this.src = src; 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[]{}); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/lang/ResourceClassLoader.java b/hutool-core/src/main/java/cn/hutool/core/lang/ResourceClassLoader.java index 5f83efcfa..a5ad67e83 100644 --- a/hutool-core/src/main/java/cn/hutool/core/lang/ResourceClassLoader.java +++ b/hutool-core/src/main/java/cn/hutool/core/lang/ResourceClassLoader.java @@ -31,7 +31,7 @@ public class ResourceClassLoader extends SecureClassLoader { */ public ResourceClassLoader(ClassLoader parentClassLoader, Map resourceMap) { super(ObjectUtil.defaultIfNull(parentClassLoader, ClassLoaderUtil::getClassLoader)); - this.resourceMap = ObjectUtil.defaultIfNull(resourceMap, new HashMap<>()); + this.resourceMap = ObjectUtil.defaultIfNull(resourceMap, () -> new HashMap<>()); this.cacheClassMap = new HashMap<>(); } diff --git a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java index 2a908c09f..41031bcca 100644 --- a/hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java +++ b/hutool-core/src/main/java/cn/hutool/core/net/url/UrlPath.java @@ -54,7 +54,7 @@ public class UrlPath { * @return 节点列表 */ public List getSegments() { - return ObjectUtil.defaultIfNull(this.segments, ListUtil.empty()); + return ObjectUtil.defaultIfNull(this.segments, ListUtil::empty); } /** diff --git a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java b/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java index 040fecfcb..91234939b 100755 --- a/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java +++ b/hutool-core/src/main/java/cn/hutool/core/swing/clipboard/ClipboardMonitor.java @@ -142,7 +142,10 @@ public enum ClipboardMonitor implements ClipboardOwner, Runnable, Closeable { if (isRunning) { // 继续监听 - clipboard.setContents(ObjectUtil.defaultIfNull(transferable, ObjectUtil.defaultIfNull(newContents, contents)), this); + clipboard.setContents( + ObjectUtil.defaultIfNull(transferable, + () -> ObjectUtil.defaultIfNull(newContents, contents)), + this); } } diff --git a/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java b/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java index 738c68171..8d5317d52 100755 --- a/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java +++ b/hutool-core/src/main/java/cn/hutool/core/util/TypeUtil.java @@ -389,7 +389,7 @@ public class TypeUtil { if (null == field) { return null; } - return getActualType(ObjectUtil.defaultIfNull(type, field.getDeclaringClass()), field.getGenericType()); + return getActualType(ObjectUtil.defaultIfNull(type, field::getDeclaringClass), field.getGenericType()); } /** diff --git a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java index 6e40a55bf..327be1be0 100755 --- a/hutool-json/src/main/java/cn/hutool/json/JSONObject.java +++ b/hutool-json/src/main/java/cn/hutool/json/JSONObject.java @@ -105,8 +105,8 @@ public class JSONObject extends MapWrapper implements JSON, JSON * @since 4.1.19 */ public JSONObject(int capacity, JSONConfig config) { - super(InternalJSONUtil.createRawMap(capacity, ObjectUtil.defaultIfNull(config, JSONConfig.create()))); - this.config = ObjectUtil.defaultIfNull(config, JSONConfig.create()); + super(InternalJSONUtil.createRawMap(capacity, ObjectUtil.defaultIfNull(config, JSONConfig::create))); + this.config = ObjectUtil.defaultIfNull(config, JSONConfig::create); } /**