close
Skip to content

optimize this by standardizing on the @Slf4j annotation from Lombok for all logging operations #448

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
psxjoy merged 2 commits into from
Jul 30, 2025
Merged

optimize this by standardizing on the @Slf4j annotation from Lombok for all logging operations #448

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c526476
optimize log print
weihubeats Jul 30, 2025
7d79886
format code
weihubeats Jul 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/annotation/AnnotationDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class AnnotationDataListener extends AnalysisEventListener<AnnotationData> {
private static final Logger LOGGER = LoggerFactory.getLogger(AnnotationDataListener.class);
List<AnnotationData> list = new ArrayList<AnnotationData>();

@Override
Expand All @@ -34,6 +33,6 @@ public void doAfterAllAnalysed(AnalysisContext context) {
throw new ExcelCommonException("Test Exception", e);
}
Assertions.assertEquals(data.getNumber(), 99.99, 0.00);
LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0)));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
8 changes: 4 additions & 4 deletions .../src/test/java/cn/idev/excel/test/core/annotation/AnnotationIndexAndNameDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
import com.alibaba.fastjson2.JSON;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class AnnotationIndexAndNameDataListener extends AnalysisEventListener<AnnotationIndexAndNameData> {
private static final Logger LOGGER = LoggerFactory.getLogger(AnnotationIndexAndNameDataListener.class);

List<AnnotationIndexAndNameData> list = new ArrayList<AnnotationIndexAndNameData>();

@Override
Expand All @@ -29,6 +29,6 @@ public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(data.getIndex1(), "第1个");
Assertions.assertEquals(data.getIndex2(), "第2个");
Assertions.assertEquals(data.getIndex4(), "第4个");
LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0)));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
8 changes: 4 additions & 4 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/celldata/CellDataDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
import com.alibaba.fastjson2.JSON;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class CellDataDataListener extends AnalysisEventListener<CellDataReadData> {
private static final Logger LOGGER = LoggerFactory.getLogger(CellDataDataListener.class);

List<CellDataReadData> list = new ArrayList<>();

@Override
Expand All @@ -36,6 +36,6 @@ public void doAfterAllAnalysed(AnalysisContext context) {
} else {
Assertions.assertNull(cellDataData.getFormulaValue().getData());
}
LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0)));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
7 changes: 3 additions & 4 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/converter/ConverterDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class ConverterDataListener extends AnalysisEventListener<ConverterReadData> {
private static final Logger LOGGER = LoggerFactory.getLogger(ConverterDataListener.class);
private final List<ConverterReadData> list = new ArrayList<>();

@Override
Expand All @@ -42,6 +41,6 @@ public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(data.getFloatData(), (float) 1.0, 0.0);
Assertions.assertEquals(data.getString(), "测试");
Assertions.assertEquals(data.getCellData().getStringValue(), "自定义");
LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0)));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
7 changes: 3 additions & 4 deletions ...el-test/src/test/java/cn/idev/excel/test/core/converter/ReadAllConverterDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,14 @@
import java.text.ParseException;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class ReadAllConverterDataListener extends AnalysisEventListener<ReadAllConverterData> {
private static final Logger LOGGER = LoggerFactory.getLogger(ReadAllConverterDataListener.class);
List<ReadAllConverterData> list = new ArrayList<ReadAllConverterData>();

@Override
Expand Down Expand Up @@ -79,6 +78,6 @@ public void doAfterAllAnalysed(AnalysisContext context) {
double doubleStringFormulaNumber = new BigDecimal(data.getStringFormulaNumber()).doubleValue();
Assertions.assertEquals(doubleStringFormulaNumber, 2.0, 0.0);
Assertions.assertEquals(data.getStringFormulaString(), "1测试");
LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0)));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
9 changes: 4 additions & 5 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/exception/ExceptionDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,19 @@
import com.alibaba.fastjson2.JSON;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class ExceptionDataListener extends AnalysisEventListener<ExceptionData> {
private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionData.class);
List<ExceptionData> list = new ArrayList<ExceptionData>();

@Override
public void onException(Exception exception, AnalysisContext context) {
LOGGER.info("抛出异常,忽略：{}", exception.getMessage(), exception);
log.info("抛出异常,忽略：{}", exception.getMessage(), exception);
}

@Override
Expand Down Expand Up @@ -47,6 +46,6 @@ public void doAfterAllAnalysed(AnalysisContext context) {
.getHeadNameList()
.get(0),
"姓名");
LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0)));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
6 changes: 3 additions & 3 deletions ...xcel-test/src/test/java/cn/idev/excel/test/core/exception/ExceptionThrowDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@
import cn.idev.excel.read.listener.ReadListener;
import java.util.ArrayList;
import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;

/**
*
*/
@Slf4j
public class ExceptionThrowDataListener implements ReadListener<ExceptionData> {
private static final Logger LOGGER = LoggerFactory.getLogger(ExceptionData.class);

List<ExceptionData> list = new ArrayList<ExceptionData>();

@Override
Expand Down
7 changes: 3 additions & 4 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/extra/ExtraDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,14 @@
import cn.idev.excel.event.AnalysisEventListener;
import cn.idev.excel.metadata.CellExtra;
import com.alibaba.fastjson2.JSON;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class ExtraDataListener extends AnalysisEventListener<ExtraData> {
private static final Logger LOGGER = LoggerFactory.getLogger(ExtraData.class);

@Override
public void invoke(ExtraData data, AnalysisContext context) {}
Expand All @@ -22,7 +21,7 @@ public void doAfterAllAnalysed(AnalysisContext context) {}

@Override
public void extra(CellExtra extra, AnalysisContext context) {
LOGGER.info("extra data:{}", JSON.toJSONString(extra));
log.info("extra data:{}", JSON.toJSONString(extra));
switch (extra.getType()) {
case COMMENT:
Assertions.assertEquals("批注的内容", extra.getText());
Expand Down
7 changes: 3 additions & 4 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/extra/ExtraDataTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@
import cn.idev.excel.test.util.TestFileUtil;
import com.alibaba.fastjson2.JSON;
import java.io.File;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class ExtraDataTest {
private static final Logger LOGGER = LoggerFactory.getLogger(ExtraDataTest.class);
private static File file03;
private static File file07;

Expand Down Expand Up @@ -52,7 +51,7 @@ public void doAfterAllAnalysed(AnalysisContext context) {}

@Override
public void extra(CellExtra extra, AnalysisContext context) {
LOGGER.info("extra data:{}", JSON.toJSONString(extra));
log.info("extra data:{}", JSON.toJSONString(extra));
switch (extra.getType()) {
case HYPERLINK:
if ("222222222".equals(extra.getText())) {
Expand Down
8 changes: 4 additions & 4 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/head/ComplexDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
import com.alibaba.fastjson2.JSON;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class ComplexDataListener extends AnalysisEventListener<ComplexHeadData> {
private static final Logger LOGGER = LoggerFactory.getLogger(ComplexHeadData.class);

List<ComplexHeadData> list = new ArrayList<ComplexHeadData>();

@Override
Expand All @@ -26,6 +26,6 @@ public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 1);
ComplexHeadData data = list.get(0);
Assertions.assertEquals(data.getString4(), "字符串4");
LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0)));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
7 changes: 3 additions & 4 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/head/ListHeadDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,15 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class ListHeadDataListener implements ReadListener<Map<Integer, String>> {

private static final Logger LOGGER = LoggerFactory.getLogger(NoHeadData.class);
List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();

@Override
Expand All @@ -41,6 +40,6 @@ public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals("1", data.get(1));
Assertions.assertEquals("2020-01-01 01:01:01", data.get(2));
Assertions.assertEquals("额外数据", data.get(3));
LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0)));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
6 changes: 3 additions & 3 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/head/MaxHeadReadListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import lombok.extern.slf4j.Slf4j;

@Slf4j
public class MaxHeadReadListener extends AnalysisEventListener<Map<Integer, String>> {
private static final Logger log = LoggerFactory.getLogger(MaxHeadReadListener.class);

List<Map<Integer, String>> list = new ArrayList<Map<Integer, String>>();
private List<Map<Integer, String>> headList = new ArrayList<>();
private Map<Integer, String> headTitleMap = new HashMap<>();
Expand Down
5 changes: 2 additions & 3 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/head/MaxHeadSizeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,17 +8,16 @@
import java.io.File;
import java.util.List;
import java.util.Map;
import lombok.extern.slf4j.Slf4j;
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

@TestMethodOrder(MethodOrderer.MethodName.class)
@Slf4j
public class MaxHeadSizeTest {
private static final Logger log = LoggerFactory.getLogger(MaxHeadSizeTest.class);

private static String headFile01;
private static String headFile02;
Expand Down
8 changes: 4 additions & 4 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/head/NoHeadDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
import com.alibaba.fastjson2.JSON;
import java.util.ArrayList;
import java.util.List;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class NoHeadDataListener extends AnalysisEventListener<NoHeadData> {
private static final Logger LOGGER = LoggerFactory.getLogger(NoHeadData.class);

List<NoHeadData> list = new ArrayList<NoHeadData>();

@Override
Expand All @@ -26,6 +26,6 @@ public void doAfterAllAnalysed(AnalysisContext context) {
Assertions.assertEquals(list.size(), 1);
NoHeadData data = list.get(0);
Assertions.assertEquals(data.getString(), "字符串0");
LOGGER.debug("First row:{}", JSON.toJSONString(list.get(0)));
log.debug("First row:{}", JSON.toJSONString(list.get(0)));
}
}
11 changes: 5 additions & 6 deletions fastexcel-test/src/test/java/cn/idev/excel/test/core/large/LargeDataListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,31 +4,30 @@
import cn.idev.excel.event.AnalysisEventListener;
import cn.idev.excel.support.ExcelTypeEnum;
import com.alibaba.fastjson2.JSON;
import lombok.extern.slf4j.Slf4j;
import org.junit.jupiter.api.Assertions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

/**
*
*/
@Slf4j
public class LargeDataListener extends AnalysisEventListener<LargeData> {
private static final Logger LOGGER = LoggerFactory.getLogger(LargeDataListener.class);
private int count = 0;

@Override
public void invoke(LargeData data, AnalysisContext context) {
if (count == 0) {
LOGGER.info("First row:{}", JSON.toJSONString(data));
log.info("First row:{}", JSON.toJSONString(data));
}
count++;
if (count % 100000 == 0) {
LOGGER.info("Already read:{},{}", count, JSON.toJSONString(data));
log.info("Already read:{},{}", count, JSON.toJSONString(data));
}
}

@Override
public void doAfterAllAnalysed(AnalysisContext context) {
LOGGER.info("Large row count:{}", count);
log.info("Large row count:{}", count);
if (context.readWorkbookHolder().getExcelType() != ExcelTypeEnum.CSV) {
Assertions.assertEquals(count, 464509);
} else {
Expand Down
Loading