ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-05-09 23:51:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix code

Browse Source
This commit is contained in:
Looly 2024-11-04 18:12:36 +08:00
parent 96ad2ed57f
commit 00fac9d39a
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hutool-core/src/main/java/org/dromara/hutool/core/io/file/PathMover.java
View File

@ -70,12 +70,12 @@ public class PathMover {
*/ */
public PathMover(final Path src, final Path target, final CopyOption[] options) { public PathMover(final Path src, final Path target, final CopyOption[] options) {
Assert.notNull(target, "Src path must be not null !"); 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!"); throw new IllegalArgumentException("Src path is not exist!");
} }
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[]{});
} }
/** /**
@ -94,13 +94,13 @@ public class PathMover {
* @return 目标文件Path * @return 目标文件Path
* @throws IllegalArgumentException src为目录，target为其子目录抛出此异常 * @throws IllegalArgumentException src为目录，target为其子目录抛出此异常
*/ */
public Path move() throws IllegalArgumentException{ public Path move() throws IllegalArgumentException {
final Path src = this.src; final Path src = this.src;
Path target = this.target; Path target = this.target;
final CopyOption[] options = this.options; final CopyOption[] options = this.options;
if (PathUtil.isSub(src, target)) { if (PathUtil.isSub(src, target)) {
if(PathUtil.equals(src, target)){ if (PathUtil.equals(src, target)) {
// issue#2845，当用户传入目标路径与源路径一致时，直接返回，否则会导致删除风险。 // issue#2845，当用户传入目标路径与源路径一致时，直接返回，否则会导致删除风险。
return target; return target;
} }

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

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

2
hutool-core/src/main/java/org/dromara/hutool/core/reflect/TypeUtil.java
View File

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