From cb10513f6f5503ddff0c906087ad4cdfdf963811 Mon Sep 17 00:00:00 2001 From: Looly Date: Sun, 1 Feb 2026 20:07:56 +0800 Subject: [PATCH] fix getName --- .../v7/core/classloader/ResourceClassLoader.java | 2 +- .../main/java/cn/hutool/v7/core/compress/ZipUtil.java | 2 +- .../java/cn/hutool/v7/core/compress/ZipWriter.java | 4 ++-- .../java/cn/hutool/v7/core/io/file/DelegatePath.java | 2 +- .../cn/hutool/v7/core/io/resource/BytesResource.java | 2 +- .../hutool/v7/core/io/resource/FileObjectResource.java | 2 +- .../cn/hutool/v7/core/io/resource/FileResource.java | 2 +- .../cn/hutool/v7/core/io/resource/HttpResource.java | 4 ++-- .../v7/core/io/resource/InputStreamResource.java | 2 +- .../cn/hutool/v7/core/io/resource/MultiResource.java | 4 ++-- .../java/cn/hutool/v7/core/io/resource/Resource.java | 2 +- .../cn/hutool/v7/core/io/resource/ResourceUtil.java | 2 +- .../cn/hutool/v7/core/io/resource/UrlResource.java | 2 +- .../cn/hutool/v7/core/io/resource/VfsResource.java | 2 +- .../hutool/v7/core/io/resource/MultiResourceTest.java | 10 +++++----- .../hutool/v7/core/io/resource/ResourceUtilTest.java | 4 ++-- .../v7/http/client/body/MultipartOutputStream.java | 2 +- 17 files changed, 25 insertions(+), 25 deletions(-) diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/classloader/ResourceClassLoader.java b/hutool-core/src/main/java/cn/hutool/v7/core/classloader/ResourceClassLoader.java index 5ddbd80966..02b4c7b711 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/classloader/ResourceClassLoader.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/classloader/ResourceClassLoader.java @@ -57,7 +57,7 @@ public class ResourceClassLoader extends SecureClassLoader { * @return this */ public ResourceClassLoader addResource(final T resource) { - this.resourceMap.put(resource.name(), resource); + this.resourceMap.put(resource.getName(), resource); return this; } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipUtil.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipUtil.java index 9d88e8716e..0e5119ca54 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipUtil.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipUtil.java @@ -432,7 +432,7 @@ public class ZipUtil { * * @param zipFile 生成的Zip文件,包括文件名。注意:zipPath不能是srcPath路径下的子文件夹 * @param charset 编码 - * @param resources 需要压缩的资源,资源的路径为{@link Resource#name()} + * @param resources 需要压缩的资源,资源的路径为{@link Resource#getName()} * @return 压缩文件 * @throws HutoolException IO异常 * @since 5.5.2 diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipWriter.java b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipWriter.java index 4ea84c88b0..3c47bba0f4 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipWriter.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipWriter.java @@ -189,14 +189,14 @@ public class ZipWriter implements Closeable { /** * 添加资源到压缩包,添加后关闭资源流 * - * @param resources 需要压缩的资源,资源的路径为{@link Resource#name()} + * @param resources 需要压缩的资源,资源的路径为{@link Resource#getName()} * @return this * @throws IORuntimeException IO异常 */ public ZipWriter add(final Resource... resources) throws IORuntimeException { for (final Resource resource : resources) { if (null != resource) { - add(resource.name(), resource.getStream()); + add(resource.getName(), resource.getStream()); } } return this; diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/file/DelegatePath.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/DelegatePath.java index 6780b8462b..d66c64e63c 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/file/DelegatePath.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/file/DelegatePath.java @@ -395,7 +395,7 @@ public class DelegatePath extends SimpleWrapper implements Path, Resource } @Override - public String name() { + public String getName() { return PathUtil.getName(this.raw); } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java index 173e36f388..79eed72ad9 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java @@ -67,7 +67,7 @@ public class BytesResource implements Resource, Serializable { } @Override - public String name() { + public String getName() { return this.name; } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileObjectResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileObjectResource.java index 20852f7be8..13bb253886 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileObjectResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileObjectResource.java @@ -57,7 +57,7 @@ public class FileObjectResource implements Resource { } @Override - public String name() { + public String getName() { return this.fileObject.getName(); } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java index 5640e887e0..4444a685ba 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java @@ -94,7 +94,7 @@ public class FileResource implements Resource, Serializable { // ----------------------------------------------------------------------- Constructor end @Override - public String name() { + public String getName() { return this.name; } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java index 32effff008..382ea70c33 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java @@ -54,8 +54,8 @@ public class HttpResource implements Resource, Serializable { } @Override - public String name() { - return resource.name(); + public String getName() { + return resource.getName(); } @Override diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java index f71a648c9a..fb5474df6d 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java @@ -74,7 +74,7 @@ public class InputStreamResource implements Resource, Serializable { } @Override - public String name() { + public String getName() { return this.name; } diff --git a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java index 06ca759f4b..287a93623a 100644 --- a/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java +++ b/hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java @@ -73,8 +73,8 @@ public class MultiResource implements Resource, Iterable, Iterator