ZhouXY108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-04-19 03:01:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix FileResourceBug

Browse Source
This commit is contained in:
Looly 2021-11-10 22:48:11 +08:00
parent d53f1ff15e
commit 662485fb2b
8 changed files with 35 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -3,10 +3,11 @@
-------------------------------------------------------------------------------------------------------------
# 5.7.17 (2021-11-07)
# 5.7.17 (2021-11-10)
### 🐣新特性
### 🐞Bug修复
* 【core 】 修复FileResource构造fileName参数无效问题（issue#1942@Github）
-------------------------------------------------------------------------------------------------------------

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

@ -1,6 +1,8 @@
package cn.hutool.core.io.resource;
import cn.hutool.core.io.FileUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.URLUtil;
import java.io.File;
@ -18,11 +20,21 @@ public class FileResource implements Resource, Serializable {
private static final long serialVersionUID = 1L;
private final File file;
private final String name;
// ----------------------------------------------------------------------- Constructor start
/**
* 构造
*
* @param path 文件绝对路径或相对ClassPath路径，但是这个路径不能指向一个jar包中的文件
*/
public FileResource(String path) {
this(FileUtil.file(path));
}
/**
* 构造，文件名使用文件本身的名字，带扩展名
*
* @param path 文件
* @since 4.4.1
*/
@ -31,37 +43,31 @@ public class FileResource implements Resource, Serializable {
}
/**
* 构造
* 构造，文件名使用文件本身的名字，带扩展名
*
* @param file 文件
*/
public FileResource(File file) {
this(file, file.getName());
this(file, null);
}
/**
* 构造
*
* @param file 文件
* @param fileName 文件名，如果为null获取文件本身的文件名
* @param fileName 文件名，带扩展名，如果为null获取文件本身的文件名
*/
public FileResource(File file, String fileName) {
Assert.notNull(file, "File must be not null !");
this.file = file;
this.name = ObjectUtil.defaultIfNull(fileName, file.getName());
}
/**
* 构造
*
* @param path 文件绝对路径或相对ClassPath路径，但是这个路径不能指向一个jar包中的文件
*/
public FileResource(String path) {
this(FileUtil.file(path));
}
// ----------------------------------------------------------------------- Constructor end
@Override
public String getName() {
return this.file.getName();
return this.name;
}
@Override
@ -89,6 +95,6 @@ public class FileResource implements Resource, Serializable {
*/
@Override
public String toString() {
return (null == this.file) ? "null" : this.file.toString();
return this.file.toString();
}
}

4
hutool-core/src/test/java/cn/hutool/core/date/ZodiacTest.java
View File

@ -4,14 +4,14 @@ import org.junit.Assert;
import org.junit.Test;
public class ZodiacTest {
@Test
public void getZodiacTest() {
Assert.assertEquals("摩羯座", Zodiac.getZodiac(Month.JANUARY, 19));
Assert.assertEquals("水瓶座", Zodiac.getZodiac(Month.JANUARY, 20));
Assert.assertEquals("巨蟹座", Zodiac.getZodiac(6, 17));
}
@Test
public void getChineseZodiacTest() {
Assert.assertEquals("狗", Zodiac.getChineseZodiac(1994));

4
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/AbstractRowHandler.java
View File

@ -40,12 +40,12 @@ public abstract class AbstractRowHandler<T> implements RowHandler {
}
@Override
public void handle(int sheetIndex, long rowIndex, List<Object> rowList) {
public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
Assert.notNull(convertFunc);
if (rowIndex < this.startRowIndex || rowIndex > this.endRowIndex) {
return;
}
handleData(sheetIndex, rowIndex, convertFunc.callWithRuntimeException(rowList));
handleData(sheetIndex, rowIndex, convertFunc.callWithRuntimeException(rowCells));
}
/**

6
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/BeanRowHandler.java
View File

@ -42,11 +42,11 @@ public abstract class BeanRowHandler<T> extends AbstractRowHandler<T> {
}
@Override
public void handle(int sheetIndex, long rowIndex, List<Object> rowList) {
public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
if (rowIndex == this.headerRowIndex) {
this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowList));
this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowCells));
return;
}
super.handle(sheetIndex, rowIndex, rowList);
super.handle(sheetIndex, rowIndex, rowCells);
}
}

6
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/MapRowHandler.java
View File

@ -39,11 +39,11 @@ public abstract class MapRowHandler extends AbstractRowHandler<Map<String, Objec
}
@Override
public void handle(int sheetIndex, long rowIndex, List<Object> rowList) {
public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
if (rowIndex == this.headerRowIndex) {
this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowList));
this.headerList = ListUtil.unmodifiable(Convert.toList(String.class, rowCells));
return;
}
super.handle(sheetIndex, rowIndex, rowList);
super.handle(sheetIndex, rowIndex, rowCells);
}
}

4
hutool-poi/src/main/java/cn/hutool/poi/excel/sax/handler/RowHandler.java
View File

@ -17,9 +17,9 @@ public interface RowHandler {
*
* @param sheetIndex 当前Sheet序号
* @param rowIndex 当前行号，从0开始计数
* @param rowList 行数据列表
* @param rowCells 行数据，每个Object表示一个单元格的值
*/
void handle(int sheetIndex, long rowIndex, List<Object> rowList);
void handle(int sheetIndex, long rowIndex, List<Object> rowCells);
/**
* 处理一个单元格的数据

4
hutool-poi/src/test/java/cn/hutool/poi/excel/ExcelSaxReadTest.java
View File

@ -125,7 +125,7 @@ public class ExcelSaxReadTest {
}
@Override
public void handle(int sheetIndex, long rowIndex, List<Object> rowList) {
public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
}
}
@ -143,7 +143,7 @@ public class ExcelSaxReadTest {
}
@Override
public void handle(int sheetIndex, long rowIndex, List<Object> rowList) {
public void handle(int sheetIndex, long rowIndex, List<Object> rowCells) {
}
}
);