zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

add TlsSocketStrategyBuilder

Browse Source
This commit is contained in:
Looly
2024-10-03 10:47:39 +08:00
parent 33a4746dc6
commit c7e0ef67aa
11 changed files with 222 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvBaseReader.java
View File

@@ -16,11 +16,11 @@
package org.dromara.hutool.poi.csv;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.func.SerConsumer;
import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.file.PathUtil;
import org.dromara.hutool.core.lang.Assert;
import org.dromara.hutool.core.func.SerConsumer;
import org.dromara.hutool.core.util.CharsetUtil;
import org.dromara.hutool.core.util.ObjUtil;
@@ -180,7 +180,7 @@ public class CsvBaseReader implements Serializable {
*/
public CsvData read(final Path path, final Charset charset) throws IORuntimeException {
Assert.notNull(path, "path must not be null");
return read(FileUtil.getReader(path, charset), true);
return read(PathUtil.getReader(path, charset), true);
}
/**

3
hutool-poi/src/main/java/org/dromara/hutool/poi/csv/CsvReader.java
View File

@@ -20,6 +20,7 @@ import org.dromara.hutool.core.io.IORuntimeException;
import org.dromara.hutool.core.io.IoUtil;
import org.dromara.hutool.core.io.file.FileUtil;
import org.dromara.hutool.core.func.SerConsumer;
import org.dromara.hutool.core.io.file.PathUtil;
import java.io.Closeable;
import java.io.File;
@@ -102,7 +103,7 @@ public class CsvReader extends CsvBaseReader implements Iterable<CsvRow>, Closea
* @since 5.0.4
*/
public CsvReader(final Path path, final Charset charset, final CsvReadConfig config) {
this(FileUtil.getReader(path, charset), config);
this(PathUtil.getReader(path, charset), config);
}
/**