fuhouyin/fastexcel
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor: refactor code style

Browse Source
This commit is contained in:
psxjoy 2024-12-21 00:21:09 +08:00
parent 9ff44cf606
commit 66a4ea855a
2 changed files with 115 additions and 107 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
fastexcel-test/src/test/java/cn/idev/excel/test/core/excludeorinclude/ExcludeOrIncludeDataTest.java
View File

@ -1,11 +1,19 @@
package cn.idev.excel.test.core.excludeorinclude; package cn.idev.excel.test.core.excludeorinclude;
import cn.idev.excel.test.util.TestFileUtil;
import cn.idev.excel.EasyExcel;
import org.junit.jupiter.api.*;
import java.io.File; import java.io.File;
import java.util.*; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import cn.idev.excel.EasyExcel;
import cn.idev.excel.test.util.TestFileUtil;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.MethodOrderer;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.TestMethodOrder;
/** /**
* @author Jiaju Zhuang * @author Jiaju Zhuang
@ -150,7 +158,7 @@ public class ExcludeOrIncludeDataTest {
excludeColumnIndexes.add(0); excludeColumnIndexes.add(0);
excludeColumnIndexes.add(3); excludeColumnIndexes.add(3);
EasyExcel.write(file, ExcludeOrIncludeData.class).excludeColumnIndexes(excludeColumnIndexes).sheet() EasyExcel.write(file, ExcludeOrIncludeData.class).excludeColumnIndexes(excludeColumnIndexes).sheet()
.doWrite(data()); .doWrite(data());
List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync(); List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
Assertions.assertEquals(1, dataMap.size()); Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0); Map<Integer, String> record = dataMap.get(0);
@ -166,7 +174,7 @@ public class ExcludeOrIncludeDataTest {
excludeColumnFieldNames.add("column3"); excludeColumnFieldNames.add("column3");
excludeColumnFieldNames.add("column4"); excludeColumnFieldNames.add("column4");
EasyExcel.write(file, ExcludeOrIncludeData.class).excludeColumnFieldNames(excludeColumnFieldNames).sheet() EasyExcel.write(file, ExcludeOrIncludeData.class).excludeColumnFieldNames(excludeColumnFieldNames).sheet()
.doWrite(data()); .doWrite(data());
List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync(); List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
Assertions.assertEquals(1, dataMap.size()); Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0); Map<Integer, String> record = dataMap.get(0);
@ -180,7 +188,7 @@ public class ExcludeOrIncludeDataTest {
includeColumnIndexes.add(1); includeColumnIndexes.add(1);
includeColumnIndexes.add(2); includeColumnIndexes.add(2);
EasyExcel.write(file, ExcludeOrIncludeData.class).includeColumnIndexes(includeColumnIndexes).sheet() EasyExcel.write(file, ExcludeOrIncludeData.class).includeColumnIndexes(includeColumnIndexes).sheet()
.doWrite(data()); .doWrite(data());
List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync(); List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
Assertions.assertEquals(1, dataMap.size()); Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0); Map<Integer, String> record = dataMap.get(0);
@ -195,9 +203,9 @@ public class ExcludeOrIncludeDataTest {
includeColumnFieldNames.add("column2"); includeColumnFieldNames.add("column2");
includeColumnFieldNames.add("column3"); includeColumnFieldNames.add("column3");
EasyExcel.write(file, ExcludeOrIncludeData.class) EasyExcel.write(file, ExcludeOrIncludeData.class)
.sheet() .sheet()
.includeColumnFieldNames(includeColumnFieldNames) .includeColumnFieldNames(includeColumnFieldNames)
.doWrite(data()); .doWrite(data());
List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync(); List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
Assertions.assertEquals(1, dataMap.size()); Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0); Map<Integer, String> record = dataMap.get(0);
@ -213,10 +221,10 @@ public class ExcludeOrIncludeDataTest {
includeColumnIndexes.add(2); includeColumnIndexes.add(2);
includeColumnIndexes.add(0); includeColumnIndexes.add(0);
EasyExcel.write(file, ExcludeOrIncludeData.class) EasyExcel.write(file, ExcludeOrIncludeData.class)
.includeColumnIndexes(includeColumnIndexes) .includeColumnIndexes(includeColumnIndexes)
.orderByIncludeColumn(true). .orderByIncludeColumn(true).
sheet() sheet()
.doWrite(data()); .doWrite(data());
List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync(); List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
Assertions.assertEquals(1, dataMap.size()); Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0); Map<Integer, String> record = dataMap.get(0);
@ -233,10 +241,10 @@ public class ExcludeOrIncludeDataTest {
includeColumnFieldNames.add("column2"); includeColumnFieldNames.add("column2");
includeColumnFieldNames.add("column3"); includeColumnFieldNames.add("column3");
EasyExcel.write(file, ExcludeOrIncludeData.class) EasyExcel.write(file, ExcludeOrIncludeData.class)
.includeColumnFieldNames(includeColumnFieldNames) .includeColumnFieldNames(includeColumnFieldNames)
.orderByIncludeColumn(true). .orderByIncludeColumn(true).
sheet() sheet()
.doWrite(data()); .doWrite(data());
List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync(); List<Map<Integer, String>> dataMap = EasyExcel.read(file).sheet().doReadSync();
Assertions.assertEquals(1, dataMap.size()); Assertions.assertEquals(1, dataMap.size());
Map<Integer, String> record = dataMap.get(0); Map<Integer, String> record = dataMap.get(0);

176
style/codestyle/idea/codestyle.xml
View File

@ -1,91 +1,91 @@
<code_scheme name="easyexcel" version="173"> <code_scheme name="fastexcel" version="173">
<option name="INSERT_INNER_CLASS_IMPORTS" value="true" /> <option name="INSERT_INNER_CLASS_IMPORTS" value="true"/>
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" /> <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999"/>
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" /> <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999"/>
<option name="IMPORT_LAYOUT_TABLE">
<value>
<package name="java" withSubpackages="true" static="false" />
<emptyLine />
<package name="javax" withSubpackages="true" static="false" />
<emptyLine />
<package name="com.alibaba" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="true" />
</value>
</option>
<option name="FORMATTER_TAGS_ENABLED" value="true" />
<JavaCodeStyleSettings>
<option name="ANNOTATION_PARAMETER_WRAP" value="1" />
<option name="CLASS_NAMES_IN_JAVADOC" value="3" />
<option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
<option name="IMPORT_LAYOUT_TABLE"> <option name="IMPORT_LAYOUT_TABLE">
<value> <value>
<package name="java" withSubpackages="true" static="false" /> <package name="java" withSubpackages="true" static="false"/>
<emptyLine /> <emptyLine/>
<package name="javax" withSubpackages="true" static="false" /> <package name="javax" withSubpackages="true" static="false"/>
<emptyLine /> <emptyLine/>
<package name="com.alibaba" withSubpackages="true" static="false" /> <package name="cn.idev.excel" withSubpackages="true" static="false"/>
<emptyLine /> <emptyLine/>
<package name="" withSubpackages="true" static="false" /> <package name="" withSubpackages="true" static="false"/>
<emptyLine /> <emptyLine/>
<package name="" withSubpackages="true" static="true" /> <package name="" withSubpackages="true" static="true"/>
</value> </value>
</option> </option>
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" /> <option name="FORMATTER_TAGS_ENABLED" value="true"/>
<option name="JD_P_AT_EMPTY_LINES" value="false" /> <JavaCodeStyleSettings>
<option name="JD_PRESERVE_LINE_FEEDS" value="true" /> <option name="ANNOTATION_PARAMETER_WRAP" value="1"/>
</JavaCodeStyleSettings> <option name="CLASS_NAMES_IN_JAVADOC" value="3"/>
<editorconfig> <option name="INSERT_INNER_CLASS_IMPORTS" value="true"/>
<option name="ENABLED" value="false" /> <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999"/>
</editorconfig> <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999"/>
<codeStyleSettings language="JAVA"> <option name="IMPORT_LAYOUT_TABLE">
<option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false" /> <value>
<option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false" /> <package name="java" withSubpackages="true" static="false"/>
<option name="KEEP_FIRST_COLUMN_COMMENT" value="false" /> <emptyLine/>
<option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false" /> <package name="javax" withSubpackages="true" static="false"/>
<option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1" /> <emptyLine/>
<option name="KEEP_BLANK_LINES_IN_CODE" value="1" /> <package name="cn.idev.excel" withSubpackages="true" static="false"/>
<option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1" /> <emptyLine/>
<option name="ALIGN_MULTILINE_PARAMETERS" value="false" /> <package name="" withSubpackages="true" static="false"/>
<option name="SPACE_AFTER_TYPE_CAST" value="false" /> <emptyLine/>
<option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true" /> <package name="" withSubpackages="true" static="true"/>
<option name="CALL_PARAMETERS_WRAP" value="1" /> </value>
<option name="PREFER_PARAMETERS_WRAP" value="true" /> </option>
<option name="METHOD_PARAMETERS_WRAP" value="1" /> <option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false"/>
<option name="RESOURCE_LIST_WRAP" value="1" /> <option name="JD_P_AT_EMPTY_LINES" value="false"/>
<option name="EXTENDS_LIST_WRAP" value="1" /> <option name="JD_PRESERVE_LINE_FEEDS" value="true"/>
<option name="THROWS_LIST_WRAP" value="1" /> </JavaCodeStyleSettings>
<option name="EXTENDS_KEYWORD_WRAP" value="1" /> <editorconfig>
<option name="THROWS_KEYWORD_WRAP" value="1" /> <option name="ENABLED" value="false"/>
<option name="METHOD_CALL_CHAIN_WRAP" value="1" /> </editorconfig>
<option name="BINARY_OPERATION_WRAP" value="1" /> <codeStyleSettings language="JAVA">
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" /> <option name="LINE_COMMENT_AT_FIRST_COLUMN" value="false"/>
<option name="TERNARY_OPERATION_WRAP" value="1" /> <option name="BLOCK_COMMENT_AT_FIRST_COLUMN" value="false"/>
<option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true" /> <option name="KEEP_FIRST_COLUMN_COMMENT" value="false"/>
<option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true" /> <option name="KEEP_CONTROL_STATEMENT_IN_ONE_LINE" value="false"/>
<option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" /> <option name="KEEP_BLANK_LINES_IN_DECLARATIONS" value="1"/>
<option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" /> <option name="KEEP_BLANK_LINES_IN_CODE" value="1"/>
<option name="FOR_STATEMENT_WRAP" value="1" /> <option name="KEEP_BLANK_LINES_BEFORE_RBRACE" value="1"/>
<option name="ARRAY_INITIALIZER_WRAP" value="1" /> <option name="ALIGN_MULTILINE_PARAMETERS" value="false"/>
<option name="ASSIGNMENT_WRAP" value="1" /> <option name="SPACE_AFTER_TYPE_CAST" value="false"/>
<option name="PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE" value="true" /> <option name="SPACE_BEFORE_ARRAY_INITIALIZER_LBRACE" value="true"/>
<option name="WRAP_COMMENTS" value="true" /> <option name="CALL_PARAMETERS_WRAP" value="1"/>
<option name="ASSERT_STATEMENT_WRAP" value="1" /> <option name="PREFER_PARAMETERS_WRAP" value="true"/>
<option name="ASSERT_STATEMENT_COLON_ON_NEXT_LINE" value="true" /> <option name="METHOD_PARAMETERS_WRAP" value="1"/>
<option name="IF_BRACE_FORCE" value="3" /> <option name="RESOURCE_LIST_WRAP" value="1"/>
<option name="DOWHILE_BRACE_FORCE" value="3" /> <option name="EXTENDS_LIST_WRAP" value="1"/>
<option name="WHILE_BRACE_FORCE" value="3" /> <option name="THROWS_LIST_WRAP" value="1"/>
<option name="FOR_BRACE_FORCE" value="3" /> <option name="EXTENDS_KEYWORD_WRAP" value="1"/>
<option name="WRAP_LONG_LINES" value="true" /> <option name="THROWS_KEYWORD_WRAP" value="1"/>
<option name="PARAMETER_ANNOTATION_WRAP" value="1" /> <option name="METHOD_CALL_CHAIN_WRAP" value="1"/>
<option name="VARIABLE_ANNOTATION_WRAP" value="2" /> <option name="BINARY_OPERATION_WRAP" value="1"/>
<option name="ENUM_CONSTANTS_WRAP" value="2" /> <option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true"/>
<indentOptions> <option name="TERNARY_OPERATION_WRAP" value="1"/>
<option name="CONTINUATION_INDENT_SIZE" value="4" /> <option name="TERNARY_OPERATION_SIGNS_ON_NEXT_LINE" value="true"/>
</indentOptions> <option name="KEEP_SIMPLE_BLOCKS_IN_ONE_LINE" value="true"/>
</codeStyleSettings> <option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true"/>
<option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true"/>
<option name="FOR_STATEMENT_WRAP" value="1"/>
<option name="ARRAY_INITIALIZER_WRAP" value="1"/>
<option name="ASSIGNMENT_WRAP" value="1"/>
<option name="PLACE_ASSIGNMENT_SIGN_ON_NEXT_LINE" value="true"/>
<option name="WRAP_COMMENTS" value="true"/>
<option name="ASSERT_STATEMENT_WRAP" value="1"/>
<option name="ASSERT_STATEMENT_COLON_ON_NEXT_LINE" value="true"/>
<option name="IF_BRACE_FORCE" value="3"/>
<option name="DOWHILE_BRACE_FORCE" value="3"/>
<option name="WHILE_BRACE_FORCE" value="3"/>
<option name="FOR_BRACE_FORCE" value="3"/>
<option name="WRAP_LONG_LINES" value="true"/>
<option name="PARAMETER_ANNOTATION_WRAP" value="1"/>
<option name="VARIABLE_ANNOTATION_WRAP" value="2"/>
<option name="ENUM_CONSTANTS_WRAP" value="2"/>
<indentOptions>
<option name="CONTINUATION_INDENT_SIZE" value="4"/>
</indentOptions>
</codeStyleSettings>
</code_scheme> </code_scheme>