Skip to content

Commit 41fe57a

Browse files
committed
feat: code style
1 parent d862ed0 commit 41fe57a

File tree

11 files changed

+62
-61
lines changed

11 files changed

+62
-61
lines changed

fesod-examples/src/test/java/org/apache/fesod/excel/demo/read/AutoMessageSource.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@
1919

2020
package org.apache.fesod.excel.demo.read;
2121

22-
import org.apache.fesod.excel.i18n.ExcelMessageSource;
23-
2422
import java.util.HashMap;
2523
import java.util.Locale;
2624
import java.util.Map;
25+
import org.apache.fesod.excel.i18n.ExcelMessageSource;
2726

2827
/**
2928
* AutoMessageSource
@@ -32,7 +31,7 @@
3231
* @date 2025/10/20
3332
*/
3433
public class AutoMessageSource implements ExcelMessageSource {
35-
private final static Map<String, Map<Locale, String>> MESSAGE_MAP = new HashMap<>();
34+
private static final Map<String, Map<Locale, String>> MESSAGE_MAP = new HashMap<>();
3635

3736
@Override
3837
public String resolveCode(String code, Locale locale) {

fesod-examples/src/test/java/org/apache/fesod/excel/demo/read/Il8nHeadDemoDataListener.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@
3333
@Slf4j
3434
public class Il8nHeadDemoDataListener implements ReadListener<Il8nZhHeadDemoData> {
3535

36-
public Il8nHeadDemoDataListener() {
37-
38-
}
36+
public Il8nHeadDemoDataListener() {}
3937

4038
@Override
4139
public void invoke(Il8nZhHeadDemoData data, AnalysisContext context) {
@@ -51,6 +49,4 @@ public void invoke(Il8nZhHeadDemoData data, AnalysisContext context) {
5149
public void doAfterAllAnalysed(AnalysisContext context) {
5250
log.info("All data has been parsed!");
5351
}
54-
55-
5652
}

fesod-examples/src/test/java/org/apache/fesod/excel/demo/read/Il8nZhHeadDemoData.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@
1919

2020
package org.apache.fesod.excel.demo.read;
2121

22+
import java.util.Date;
2223
import lombok.EqualsAndHashCode;
2324
import lombok.Getter;
2425
import lombok.Setter;
2526
import org.apache.fesod.excel.annotation.ExcelProperty;
2627

27-
import java.util.Date;
28-
2928
/**
3029
* 基础数据类.这里的排序和excel里面的排序一致
3130
*
@@ -37,10 +36,13 @@
3736
public class Il8nZhHeadDemoData {
3837
@ExcelProperty(value = {"head.str"})
3938
private String string;
39+
4040
@ExcelProperty(value = {"head.date"})
4141
private Date date;
42+
4243
@ExcelProperty(value = {"head.doubleData"})
4344
private Double doubleData;
45+
4446
@ExcelProperty(value = {"head.str1"})
4547
private String string1;
4648
}

fesod-examples/src/test/java/org/apache/fesod/excel/demo/read/ReadTest.java

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@
2020
package org.apache.fesod.excel.demo.read;
2121

2222
import com.alibaba.fastjson2.JSON;
23+
import java.io.File;
24+
import java.util.List;
25+
import java.util.Locale;
26+
import java.util.Map;
2327
import lombok.extern.slf4j.Slf4j;
2428
import org.apache.fesod.excel.ExcelReader;
2529
import org.apache.fesod.excel.FastExcel;
@@ -39,11 +43,6 @@
3943
import org.junit.jupiter.api.Nested;
4044
import org.junit.jupiter.api.Test;
4145

42-
import java.io.File;
43-
import java.util.List;
44-
import java.util.Locale;
45-
import java.util.Map;
46-
4746
/**
4847
* Common approaches for reading Excel files
4948
*/
@@ -127,7 +126,7 @@ private void saveData() {
127126
fileName = TestFileUtil.getPath() + "demo" + File.separator + "demo.xlsx";
128127
// One reader per file
129128
try (ExcelReader excelReader =
130-
FastExcel.read(fileName, DemoData.class, new DemoDataListener()).build()) {
129+
FastExcel.read(fileName, DemoData.class, new DemoDataListener()).build()) {
131130
// Build a sheet. You can specify the name or index.
132131
ReadSheet readSheet = FastExcel.readSheet(0).build();
133132
readSheet.setNumRows(2);
@@ -418,7 +417,10 @@ public void il8nZhHeadRead() {
418417
autoMessageSource.addMessage("head.date", Locale.US, "Date");
419418
autoMessageSource.addMessage("head.doubleData", Locale.US, "Number");
420419
FastExcel.read(fileName, Il8nZhHeadDemoData.class, new Il8nHeadDemoDataListener())
421-
.locale(Locale.CHINA).messageResource(autoMessageSource).sheet().doRead();
420+
.locale(Locale.CHINA)
421+
.messageResource(autoMessageSource)
422+
.sheet()
423+
.doRead();
422424
}
423425

424426
/**
@@ -436,7 +438,10 @@ public void il8nUsHeadRead() {
436438
autoMessageSource.addMessage("head.doubleData", Locale.US, "Number");
437439
autoMessageSource.addMessage("head.str1", Locale.US, "这是个中文表头1");
438440
FastExcel.read(fileName, Il8nZhHeadDemoData.class, new Il8nHeadDemoDataListener())
439-
.locale(Locale.US).messageResource(autoMessageSource).sheet().doRead();
441+
.locale(Locale.US)
442+
.messageResource(autoMessageSource)
443+
.sheet()
444+
.doRead();
440445
}
441446

442447
/**
@@ -481,8 +486,7 @@ public void invoke(DemoChainAccessorsData data, AnalysisContext context) {
481486
}
482487

483488
@Override
484-
public void doAfterAllAnalysed(AnalysisContext context) {
485-
}
489+
public void doAfterAllAnalysed(AnalysisContext context) {}
486490
})
487491
.build()) {
488492
excelReader.readAll();

fesod-examples/src/test/java/org/apache/fesod/excel/demo/write/WriteTest.java

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919

2020
package org.apache.fesod.excel.demo.write;
2121

22+
import java.io.File;
23+
import java.io.InputStream;
24+
import java.net.URL;
25+
import java.util.ArrayList;
26+
import java.util.Date;
27+
import java.util.List;
2228
import org.apache.fesod.excel.ExcelWriter;
2329
import org.apache.fesod.excel.FastExcel;
2430
import org.apache.fesod.excel.annotation.ExcelProperty;
@@ -27,9 +33,9 @@
2733
import org.apache.fesod.excel.annotation.write.style.ColumnWidth;
2834
import org.apache.fesod.excel.annotation.write.style.ContentRowHeight;
2935
import org.apache.fesod.excel.annotation.write.style.HeadRowHeight;
36+
import org.apache.fesod.excel.demo.read.AutoMessageSource;
3037
import org.apache.fesod.excel.demo.read.Il8nZhHeadDemoData;
3138
import org.apache.fesod.excel.enums.CellDataTypeEnum;
32-
import org.apache.fesod.excel.demo.read.AutoMessageSource;
3339
import org.apache.fesod.excel.metadata.data.*;
3440
import org.apache.fesod.excel.util.BooleanUtils;
3541
import org.apache.fesod.excel.util.FileUtils;
@@ -52,15 +58,6 @@
5258
import org.apache.poi.xssf.streaming.SXSSFSheet;
5359
import org.junit.jupiter.api.Test;
5460

55-
import java.io.File;
56-
import java.io.InputStream;
57-
import java.net.URL;
58-
import java.util.ArrayList;
59-
import java.util.Date;
60-
import java.util.HashMap;
61-
import java.util.List;
62-
import java.util.Map;
63-
6461
/**
6562
* 写的常见写法
6663
*
@@ -772,31 +769,33 @@ public void afterSheetDispose(SheetWriteHandlerContext context) {
772769
.doWrite(this::data);
773770
System.out.println(fileName);
774771
}
772+
775773
@Test
776774
public void sheetIl8nHeadWriteTest() {
777775
List<Locale> locales = new ArrayList<>();
778776
locales.add(Locale.CHINA);
779777
locales.add(Locale.US);
780778
AutoMessageSource autoMessageSource = new AutoMessageSource();
781-
autoMessageSource.addMessage("head.str", Locale.CHINA,"这是个中文表头");
782-
autoMessageSource.addMessage("head.str1", Locale.CHINA,"这是个中文表头2");
783-
autoMessageSource.addMessage("head.date", Locale.CHINA,"Date");
784-
autoMessageSource.addMessage("head.doubleData", Locale.CHINA,"Number");
785-
autoMessageSource.addMessage("head.str", Locale.US,"This is a English head");
786-
autoMessageSource.addMessage("head.date", Locale.US,"Date");
787-
autoMessageSource.addMessage("head.doubleData", Locale.US,"Number");
788-
autoMessageSource.addMessage("head.str1", Locale.US,"这是个中文表头1");
789-
for (Locale locale:locales){
790-
String fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + locale.getLanguage()+".xlsx";
779+
autoMessageSource.addMessage("head.str", Locale.CHINA, "这是个中文表头");
780+
autoMessageSource.addMessage("head.str1", Locale.CHINA, "这是个中文表头2");
781+
autoMessageSource.addMessage("head.date", Locale.CHINA, "Date");
782+
autoMessageSource.addMessage("head.doubleData", Locale.CHINA, "Number");
783+
autoMessageSource.addMessage("head.str", Locale.US, "This is a English head");
784+
autoMessageSource.addMessage("head.date", Locale.US, "Date");
785+
autoMessageSource.addMessage("head.doubleData", Locale.US, "Number");
786+
autoMessageSource.addMessage("head.str1", Locale.US, "这是个中文表头1");
787+
for (Locale locale : locales) {
788+
String fileName = TestFileUtil.getPath() + "simpleWrite" + System.currentTimeMillis() + locale.getLanguage()
789+
+ ".xlsx";
791790
FastExcel.write(fileName, Il8nZhHeadDemoData.class)
792-
.locale( locale)
791+
.locale(locale)
793792
.messageResource(autoMessageSource)
794793
.sheet("模板")
795794
.doWrite(this::Il8nHeadDemoDataList);
796795
System.out.println(fileName);
797796
}
798-
799797
}
798+
800799
private List<LongestMatchColumnWidthData> dataLong() {
801800
List<LongestMatchColumnWidthData> list = ListUtils.newArrayList();
802801
for (int i = 0; i < 10; i++) {
@@ -880,7 +879,7 @@ private List<Il8nZhHeadDemoData> Il8nHeadDemoDataList() {
880879
data.setString("STRING" + i);
881880
data.setDate(new Date());
882881
data.setDoubleData(0.56);
883-
data.setString1("测试000"+i);
882+
data.setString1("测试000" + i);
884883
list.add(data);
885884
}
886885
return list;

fesod/src/main/java/org/apache/fesod/excel/i18n/ExcelMessageSource.java

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,18 @@ public interface ExcelMessageSource {
3232
/**
3333
* resolveCode 转换code
3434
*
35-
* @param code String
36-
* @param locale Locale
37-
* @return String
35+
* @param code
36+
* @param locale
37+
* @return
3838
*/
3939
String resolveCode(String code, Locale locale);
4040

41-
4241
/**
4342
* addMessage 增加词条
4443
*
45-
* @param code String
46-
* @param locale Locale
47-
* @param msg String
44+
* @param code
45+
* @param locale
46+
* @param
4847
*/
4948
void addMessage(String code, Locale locale, String msg);
5049
}

fesod/src/main/java/org/apache/fesod/excel/metadata/AbstractParameterBuilder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,10 @@ public T locale(Locale locale) {
104104
/**
105105
* message resource
106106
*
107-
* @param excelMessageSource ExcelMessageSource
108-
* @return T
107+
* @param excelMessageSource
108+
* @return
109109
*/
110-
public T messageResource(ExcelMessageSource excelMessageSource) {
110+
public T messageResource(ExcelMessageSource excelMessageSource) {
111111
parameter().setMessageSource(excelMessageSource);
112112
return self();
113113
}

fesod/src/main/java/org/apache/fesod/excel/metadata/BasicParameter.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,13 @@ public class BasicParameter {
8282
private CacheLocationEnum filedCacheLocation;
8383
/**
8484
* Automatic strip includes sheet name and content
85+
*
8586
*/
8687
private Boolean autoStrip;
8788

88-
8989
/**
9090
* Message source
91+
*
9192
*/
9293
private ExcelMessageSource messageSource;
9394
}

fesod/src/main/java/org/apache/fesod/excel/metadata/GlobalConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,10 @@ public class GlobalConfiguration {
7373
private Boolean autoStrip;
7474
/**
7575
* Message source
76+
*
7677
*/
7778
private ExcelMessageSource messageSource;
79+
7880
public GlobalConfiguration() {
7981
this.autoTrim = Boolean.TRUE;
8082
this.autoStrip = Boolean.FALSE;

fesod/src/main/java/org/apache/fesod/excel/read/metadata/holder/ReadWorkbookHolder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ public class ReadWorkbookHolder extends AbstractReadHolder {
154154
*/
155155
private Boolean ignoreHiddenSheet;
156156

157-
158157
/**
159158
* Excel message source
160159
*/

0 commit comments

Comments
 (0)