add return

This commit is contained in:
Looly 2021-06-07 00:00:45 +08:00
parent c402d7cbc2
commit ab195f4e67
5 changed files with 57 additions and 25 deletions

View File

@ -3,13 +3,14 @@
-------------------------------------------------------------------------------------------------------------
# 5.6.7 (2021-06-04)
# 5.6.7 (2021-06-06)
### 🐣新特性
* 【core 】 CharSequenceUtil增加join重载issue#I3TFJ5@Gitee
* 【http 】 HttpRequest增加form方法重载pr#337@Gitee
* 【http 】 ImgUtil增加getMainColor方法pr#338@Gitee
* 【core 】 改进TreeUtil.buid算法性能pr#1594@Github
* 【core 】 CsvConfig的setXXX返回thisissue#I3UIQF@Gitee
### 🐞Bug修复
* 【core 】 修复FileUtil.normalize去掉末尾空格问题issue#1603@Github

View File

@ -30,27 +30,33 @@ public class CsvConfig implements Serializable {
* 设置字段分隔符默认逗号','
*
* @param fieldSeparator 字段分隔符默认逗号','
* @return this
*/
public void setFieldSeparator(final char fieldSeparator) {
public CsvConfig setFieldSeparator(final char fieldSeparator) {
this.fieldSeparator = fieldSeparator;
return this;
}
/**
* 设置 文本分隔符文本包装符默认双引号'"'
*
* @param textDelimiter 文本分隔符文本包装符默认双引号'"'
* @return this
*/
public void setTextDelimiter(char textDelimiter) {
public CsvConfig setTextDelimiter(char textDelimiter) {
this.textDelimiter = textDelimiter;
return this;
}
/**
* 设置 注释符号用于区分注释行
*
* @param commentCharacter 注释符号用于区分注释行
* @return this
* @since 5.5.7
*/
public void setCommentCharacter(char commentCharacter) {
public CsvConfig setCommentCharacter(char commentCharacter) {
this.commentCharacter = commentCharacter;
return this;
}
}

View File

@ -31,26 +31,32 @@ public class CsvReadConfig extends CsvConfig implements Serializable {
* 设置是否首行做为标题行默认false
*
* @param containsHeader 是否首行做为标题行默认false
* @return this
*/
public void setContainsHeader(boolean containsHeader) {
public CsvReadConfig setContainsHeader(boolean containsHeader) {
this.containsHeader = containsHeader;
return this;
}
/**
* 设置是否跳过空白行默认true
*
* @param skipEmptyRows 是否跳过空白行默认true
* @return this
*/
public void setSkipEmptyRows(boolean skipEmptyRows) {
public CsvReadConfig setSkipEmptyRows(boolean skipEmptyRows) {
this.skipEmptyRows = skipEmptyRows;
return this;
}
/**
* 设置每行字段个数不同时是否抛出异常默认false
*
* @param errorOnDifferentFieldCount 每行字段个数不同时是否抛出异常默认false
* @return this
*/
public void setErrorOnDifferentFieldCount(boolean errorOnDifferentFieldCount) {
public CsvReadConfig setErrorOnDifferentFieldCount(boolean errorOnDifferentFieldCount) {
this.errorOnDifferentFieldCount = errorOnDifferentFieldCount;
return this;
}
}

View File

@ -1,21 +1,24 @@
package cn.hutool.core.text.csv;
import java.io.Serializable;
import cn.hutool.core.util.CharUtil;
import java.io.Serializable;
/**
* CSV写出配置项
*
* @author looly
*
*/
public class CsvWriteConfig extends CsvConfig implements Serializable {
private static final long serialVersionUID = 5396453565371560052L;
/** 是否始终使用文本分隔符文本包装符默认false按需添加 */
/**
* 是否始终使用文本分隔符文本包装符默认false按需添加
*/
protected boolean alwaysDelimitText;
/** 换行符 */
/**
* 换行符
*/
protected char[] lineDelimiter = {CharUtil.CR, CharUtil.LF};
/**
@ -31,17 +34,21 @@ public class CsvWriteConfig extends CsvConfig implements Serializable {
* 设置是否始终使用文本分隔符文本包装符默认false按需添加
*
* @param alwaysDelimitText 是否始终使用文本分隔符文本包装符默认false按需添加
* @return this
*/
public void setAlwaysDelimitText(boolean alwaysDelimitText) {
public CsvWriteConfig setAlwaysDelimitText(boolean alwaysDelimitText) {
this.alwaysDelimitText = alwaysDelimitText;
return this;
}
/**
* 设置换行符
*
* @param lineDelimiter 换行符
* @return this
*/
public void setLineDelimiter(char[] lineDelimiter) {
public CsvWriteConfig setLineDelimiter(char[] lineDelimiter) {
this.lineDelimiter = lineDelimiter;
return this;
}
}

View File

@ -85,4 +85,16 @@ public class CsvReaderTest {
Console.log(strings);
}
}
@Test
@Ignore
public void readTest3(){
final CsvReadConfig csvReadConfig = CsvReadConfig.defaultConfig();
csvReadConfig.setContainsHeader(true);
final CsvReader reader = CsvUtil.getReader(csvReadConfig);
final CsvData read = reader.read(FileUtil.file("d:/test/ceshi.csv"));
for (CsvRow row : read) {
Console.log(row.getByName("案件ID"));
}
}
}