From 00fac9d39ac6fb291d1ba6a1b45620de47d1a07c Mon Sep 17 00:00:00 2001 From: Looly Date: Mon, 4 Nov 2024 18:12:36 +0800 Subject: [PATCH] fix code --- .../java/org/dromara/hutool/core/io/file/PathMover.java | 8 ++++---- .../java/org/dromara/hutool/core/net/url/UrlPath.java | 2 +- .../java/org/dromara/hutool/core/reflect/TypeUtil.java | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java index 514116b2b..9a323018f 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java @@ -70,12 +70,12 @@ public class PathMover { */ public PathMover(final Path src, final Path target, final CopyOption[] options) { Assert.notNull(target, "Src path must be not null !"); - if(!PathUtil.exists(src, false)){ + if (!PathUtil.exists(src, false)) { throw new IllegalArgumentException("Src path is not exist!"); } 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[]{}); } /** @@ -94,13 +94,13 @@ public class PathMover { * @return 目标文件Path * @throws IllegalArgumentException src为目录,target为其子目录抛出此异常 */ - public Path move() throws IllegalArgumentException{ + public Path move() throws IllegalArgumentException { final Path src = this.src; Path target = this.target; final CopyOption[] options = this.options; if (PathUtil.isSub(src, target)) { - if(PathUtil.equals(src, target)){ + if (PathUtil.equals(src, target)) { // issue#2845,当用户传入目标路径与源路径一致时,直接返回,否则会导致删除风险。 return target; } diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java index 5e2bd3703..02d8dfcc7 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/net/url/UrlPath.java @@ -77,7 +77,7 @@ public class UrlPath { * @return 节点列表 */ public List getSegments() { - return ObjUtil.defaultIfNull(this.segments, ListUtil.empty()); + return ObjUtil.defaultIfNull(this.segments, ListUtil::empty); } /** diff --git a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java index 584358eca..95c86eabe 100644 --- a/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java +++ b/hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java @@ -406,7 +406,7 @@ public class TypeUtil { if (null == field) { return null; } - return getActualType(ObjUtil.defaultIfNull(type, field.getDeclaringClass()), field.getGenericType()); + return getActualType(ObjUtil.defaultIfNull(type, field::getDeclaringClass), field.getGenericType()); } /**