lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2026-02-09 09:16:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix getName

Browse Source
This commit is contained in:
Looly
2026-02-01 20:07:56 +08:00
parent 1317ebba97
commit cb10513f6f
17 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ public class ResourceClassLoader<T extends Resource> extends SecureClassLoader {
* @return this
*/
public ResourceClassLoader<T> addResource(final T resource) {
this.resourceMap.put(resource.name(), resource);
this.resourceMap.put(resource.getName(), resource);
return this;
}

2
hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipUtil.java
View File

@@ -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

4
hutool-core/src/main/java/cn/hutool/v7/core/compress/ZipWriter.java
View File

@@ -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;

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

@@ -395,7 +395,7 @@ public class DelegatePath extends SimpleWrapper<Path> implements Path, Resource
}
@Override
public String name() {
public String getName() {
return PathUtil.getName(this.raw);
}

2
hutool-core/src/main/java/cn/hutool/v7/core/io/resource/BytesResource.java
View File

@@ -67,7 +67,7 @@ public class BytesResource implements Resource, Serializable {
}
@Override
public String name() {
public String getName() {
return this.name;
}

2
hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileObjectResource.java
View File

@@ -57,7 +57,7 @@ public class FileObjectResource implements Resource {
}
@Override
public String name() {
public String getName() {
return this.fileObject.getName();
}

2
hutool-core/src/main/java/cn/hutool/v7/core/io/resource/FileResource.java
View File

@@ -94,7 +94,7 @@ public class FileResource implements Resource, Serializable {
// ----------------------------------------------------------------------- Constructor end
@Override
public String name() {
public String getName() {
return this.name;
}

4
hutool-core/src/main/java/cn/hutool/v7/core/io/resource/HttpResource.java
View File

@@ -54,8 +54,8 @@ public class HttpResource implements Resource, Serializable {
}
@Override
public String name() {
return resource.name();
public String getName() {
return resource.getName();
}
@Override

2
hutool-core/src/main/java/cn/hutool/v7/core/io/resource/InputStreamResource.java
View File

@@ -74,7 +74,7 @@ public class InputStreamResource implements Resource, Serializable {
}
@Override
public String name() {
public String getName() {
return this.name;
}

4
hutool-core/src/main/java/cn/hutool/v7/core/io/resource/MultiResource.java
View File

@@ -73,8 +73,8 @@ public class MultiResource implements Resource, Iterable<Resource>, Iterator<Res
}
@Override
public String name() {
return resources.get(getValidCursor()).name();
public String getName() {
return resources.get(getValidCursor()).getName();
}
@Override

2
hutool-core/src/main/java/cn/hutool/v7/core/io/resource/Resource.java
View File

@@ -53,7 +53,7 @@ public interface Resource {
* @return 资源名
* @since 4.0.13
*/
String name();
String getName();
/**
* 获得解析后的{@link URL}，无对应URL的返回{@code null}

2
hutool-core/src/main/java/cn/hutool/v7/core/io/resource/ResourceUtil.java
View File

@@ -319,7 +319,7 @@ public class ResourceUtil {
public static void loadTo(final Properties properties, final Resource resource, final Charset charset) {
Assert.notNull(properties);
Assert.notNull(resource);
final String filename = resource.name();
final String filename = resource.getName();
if (filename != null && StrUtil.endWithIgnoreCase(filename, ".xml")) {
// XML
try (final InputStream in = resource.getStream()) {

2
hutool-core/src/main/java/cn/hutool/v7/core/io/resource/UrlResource.java
View File

@@ -89,7 +89,7 @@ public class UrlResource implements Resource, Serializable {
//-------------------------------------------------------------------------------------- Constructor end
@Override
public String name() {
public String getName() {
return this.name;
}

2
hutool-core/src/main/java/cn/hutool/v7/core/io/resource/VfsResource.java
View File

@@ -86,7 +86,7 @@ public class VfsResource implements Resource {
}
@Override
public String name() {
public String getName() {
return MethodUtil.invoke(virtualFile, VIRTUAL_FILE_METHOD_GET_NAME);
}

10
hutool-core/src/test/java/cn/hutool/v7/core/io/resource/MultiResourceTest.java
View File

@@ -101,7 +101,7 @@ class MultiResourceTest {
assertEquals(0, getCursorValue(multiResource), "游标应该更新为0");
// 验证getName方法使用的是第一个资源
assertEquals("resource1", multiResource.name(), "getName应该返回第一个资源名称");
assertEquals("resource1", multiResource.getName(), "getName应该返回第一个资源名称");
// 第二次调用next()
final Resource result2 = multiResource.next();
@@ -109,7 +109,7 @@ class MultiResourceTest {
assertEquals(1, getCursorValue(multiResource), "游标应该更新为1");
// 验证getName方法使用的是第二个资源
assertEquals("resource2", multiResource.name(), "getName应该返回第二个资源名称");
assertEquals("resource2", multiResource.getName(), "getName应该返回第二个资源名称");
}
/**
@@ -142,7 +142,7 @@ class MultiResourceTest {
multiResource.remove();
assertEquals(2, getInternalSize(multiResource), "删除后资源数量应该是2");
assertEquals("resource2", multiResource.name(), "删除后getName应该返回第二个资源名称");
assertEquals("resource2", multiResource.getName(), "删除后getName应该返回第二个资源名称");
}
/**
@@ -265,11 +265,11 @@ class MultiResourceTest {
/**
* 测试Resource接口的实现类，用于单元测试
*/
private record TestResource(String name, String content) implements Resource {
private record TestResource(String getName, String content) implements Resource {
@Override
public URL getUrl() {
try {
return new URL("http://example.com/" + name);
return new URL("http://example.com/" + getName);
} catch (final MalformedURLException e) {
throw new RuntimeException(e);
}

4
hutool-core/src/test/java/cn/hutool/v7/core/io/resource/ResourceUtilTest.java
View File

@@ -38,7 +38,7 @@ public class ResourceUtilTest {
@Test
public void stringResourceTest(){
final StringResource stringResource = new StringResource("testData", "test");
Assertions.assertEquals("test", stringResource.name());
Assertions.assertEquals("test", stringResource.getName());
Assertions.assertArrayEquals("testData".getBytes(), stringResource.readBytes());
Assertions.assertArrayEquals("testData".getBytes(), IoUtil.readBytes(stringResource.getStream()));
}
@@ -46,7 +46,7 @@ public class ResourceUtilTest {
@Test
public void fileResourceTest(){
final FileResource resource = new FileResource(FileUtil.file("test.xml"));
Assertions.assertEquals("test.xml", resource.name());
Assertions.assertEquals("test.xml", resource.getName());
Assertions.assertTrue(StrUtil.isNotEmpty(resource.readUtf8Str()));
}

2
hutool-http/src/main/java/cn/hutool/v7/http/client/body/MultipartOutputStream.java
View File

@@ -162,7 +162,7 @@ public class MultipartOutputStream extends OutputStream {
* @throws IORuntimeException IO异常
*/
private void appendResource(final String formFieldName, final Resource resource) throws IORuntimeException {
final String fileName = resource.name();
final String fileName = resource.getName();
// Content-Disposition
if (null == fileName) {