From 7bd8caa559fdd1dce0e3fc5bc38f170480c0b2d4 Mon Sep 17 00:00:00 2001 From: Jiaju Zhuang Date: Fri, 29 Oct 2021 21:29:33 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95=E6=A1=88?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../excel/converters/ConverterKeyBuild.java | 18 +++++++++++------- .../excel/converters/ReadConverterContext.java | 8 ++++++-- .../converters/WriteConverterContext.java | 8 ++++++-- .../exception/ExcelDataConvertException.java | 8 ++++++-- .../ExcelWriteDataConvertException.java | 8 ++++++-- .../alibaba/excel/metadata/AbstractCell.java | 8 ++++++-- .../alibaba/excel/metadata/AbstractHolder.java | 8 ++++++-- .../alibaba/excel/metadata/BasicParameter.java | 8 ++++++-- .../com/alibaba/excel/metadata/CellRange.java | 8 ++++++-- .../excel/metadata/GlobalConfiguration.java | 8 ++++++-- .../java/com/alibaba/excel/metadata/Head.java | 8 ++++++-- .../alibaba/excel/metadata/csv/CsvCell.java | 6 ++++-- .../excel/metadata/csv/CsvCellStyle.java | 8 ++++++-- .../com/alibaba/excel/metadata/csv/CsvRow.java | 8 ++++++-- .../alibaba/excel/metadata/csv/CsvSheet.java | 8 ++++++-- .../excel/metadata/csv/CsvWorkbook.java | 8 ++++++-- .../alibaba/excel/metadata/data/CellData.java | 8 ++++++-- .../excel/metadata/data/ClientAnchorData.java | 7 +++++-- .../excel/metadata/data/CommentData.java | 8 ++++++-- .../excel/metadata/data/CoordinateData.java | 8 ++++++-- .../excel/metadata/data/DataFormatData.java | 8 ++++++-- .../excel/metadata/data/FormulaData.java | 8 ++++++-- .../excel/metadata/data/HyperlinkData.java | 7 +++++-- .../alibaba/excel/metadata/data/ImageData.java | 7 +++++-- .../excel/metadata/data/ReadCellData.java | 8 ++++++-- .../metadata/data/RichTextStringData.java | 12 +++++++++--- .../excel/metadata/data/WriteCellData.java | 8 ++++++-- .../property/DateTimeFormatProperty.java | 8 ++++++-- .../property/ExcelContentProperty.java | 8 ++++++-- .../metadata/property/ExcelHeadProperty.java | 8 ++++++-- .../excel/metadata/property/FontProperty.java | 8 ++++++-- .../excel/metadata/property/StyleProperty.java | 8 ++++++-- .../read/metadata/ReadBasicParameter.java | 8 ++++++-- .../excel/read/metadata/ReadWorkbook.java | 8 ++++++-- .../metadata/holder/AbstractReadHolder.java | 8 ++++++-- .../read/metadata/holder/ReadSheetHolder.java | 8 ++++++-- .../metadata/holder/ReadWorkbookHolder.java | 8 ++++++-- .../holder/csv/CsvReadSheetHolder.java | 8 ++++++-- .../holder/csv/CsvReadWorkbookHolder.java | 8 ++++++-- .../holder/xlsx/XlsxReadSheetHolder.java | 8 ++++++-- .../holder/xlsx/XlsxReadWorkbookHolder.java | 8 ++++++-- .../com/alibaba/excel/util/ClassUtils.java | 8 ++++++-- .../write/executor/ExcelWriteFillExecutor.java | 9 +++++++-- .../chain/CellHandlerExecutionChain.java | 8 ++++++-- .../chain/RowHandlerExecutionChain.java | 8 ++++++-- .../chain/SheetHandlerExecutionChain.java | 8 ++++++-- .../chain/WorkbookHandlerExecutionChain.java | 8 ++++++-- .../context/CellWriteHandlerContext.java | 8 ++++++-- .../context/RowWriteHandlerContext.java | 8 ++++++-- .../context/SheetWriteHandlerContext.java | 8 ++++++-- .../context/WorkbookWriteHandlerContext.java | 8 ++++++-- .../write/metadata/WriteBasicParameter.java | 8 ++++++-- .../excel/write/metadata/WriteSheet.java | 8 ++++++-- .../excel/write/metadata/WriteTable.java | 8 ++++++-- .../excel/write/metadata/WriteWorkbook.java | 8 ++++++-- .../write/metadata/fill/AnalysisCell.java | 8 ++++++-- .../excel/write/metadata/fill/FillConfig.java | 8 ++++++-- .../metadata/holder/AbstractWriteHolder.java | 18 +++++++++--------- .../metadata/holder/WriteSheetHolder.java | 8 ++++++-- .../metadata/holder/WriteTableHolder.java | 8 ++++++-- .../metadata/holder/WriteWorkbookHolder.java | 10 ++++++++-- .../write/metadata/style/WriteCellStyle.java | 8 ++++++-- .../excel/write/metadata/style/WriteFont.java | 8 ++++++-- .../write/property/ExcelWriteHeadProperty.java | 8 ++++++-- .../style/HorizontalCellStyleStrategy.java | 8 ++++++-- .../test/core/annotation/AnnotationData.java | 8 ++++++-- .../annotation/AnnotationIndexAndNameData.java | 8 ++++++-- .../test/core/celldata/CellDataReadData.java | 8 ++++++-- .../test/core/celldata/CellDataWriteData.java | 8 ++++++-- .../test/core/converter/ConverterReadData.java | 8 ++++++-- .../core/converter/ConverterWriteData.java | 8 ++++++-- .../test/core/converter/ImageData.java | 8 ++++++-- .../core/converter/ReadAllConverterData.java | 8 ++++++-- .../test/core/dataformat/DateFormatData.java | 8 ++++++-- .../test/core/encrypt/EncryptData.java | 8 ++++++-- .../test/core/exception/ExceptionData.java | 8 ++++++-- .../excludeorinclude/ExcludeOrIncludeData.java | 8 ++++++-- .../easyexcel/test/core/extra/ExtraData.java | 8 ++++++-- .../easyexcel/test/core/fill/FillData.java | 8 ++++++-- .../fill/style/FillStyleAnnotatedData.java | 8 ++++++-- .../test/core/fill/style/FillStyleData.java | 8 ++++++-- .../test/core/handler/WriteHandlerData.java | 8 ++++++-- .../test/core/head/ComplexHeadData.java | 8 ++++++-- .../easyexcel/test/core/head/NoHeadData.java | 8 ++++++-- .../easyexcel/test/core/large/LargeData.java | 8 ++++++-- .../multiplesheets/MultipleSheetsData.java | 8 ++++++-- .../test/core/noncamel/UnCamelData.java | 8 ++++++-- .../test/core/parameter/ParameterData.java | 8 ++++++-- .../test/core/repetition/RepetitionData.java | 8 ++++++-- .../easyexcel/test/core/simple/SimpleData.java | 8 ++++++-- .../easyexcel/test/core/skip/SkipData.java | 8 ++++++-- .../easyexcel/test/core/sort/SortData.java | 8 ++++++-- .../easyexcel/test/core/style/StyleData.java | 8 ++++++-- .../test/core/template/TemplateData.java | 8 ++++++-- .../easyexcel/test/demo/fill/FillData.java | 8 ++++++-- .../test/demo/read/CellDataReadDemoData.java | 8 ++++++-- .../test/demo/read/ConverterData.java | 8 ++++++-- .../easyexcel/test/demo/read/DemoData.java | 8 ++++++-- .../test/demo/read/DemoExtraData.java | 8 ++++++-- .../test/demo/read/ExceptionDemoData.java | 8 ++++++-- .../test/demo/read/IndexOrNameData.java | 8 ++++++-- .../easyexcel/test/demo/web/DownloadData.java | 8 ++++++-- .../easyexcel/test/demo/web/UploadData.java | 8 ++++++-- .../test/demo/write/ComplexHeadData.java | 8 ++++++-- .../test/demo/write/ConverterData.java | 8 ++++++-- .../easyexcel/test/demo/write/DemoData.java | 9 ++++++--- .../test/demo/write/DemoMergeData.java | 8 ++++++-- .../test/demo/write/DemoStyleData.java | 8 ++++++-- .../demo/write/ImageDataWithAnnotation.java | 8 ++++++-- .../test/demo/write/ImageDemoData.java | 8 ++++++-- .../easyexcel/test/demo/write/IndexData.java | 8 ++++++-- .../write/LongestMatchColumnWidthData.java | 8 ++++++-- .../test/demo/write/WidthAndHeightData.java | 8 ++++++-- .../test/demo/write/WriteCellDemoData.java | 8 ++++++-- .../alibaba/easyexcel/test/temp/CamlData.java | 8 ++++++-- .../alibaba/easyexcel/test/temp/LockData.java | 8 ++++++-- .../alibaba/easyexcel/test/temp/StyleData.java | 8 ++++++-- .../easyexcel/test/temp/TempFillData.java | 8 ++++++-- .../easyexcel/test/temp/bug/DataType.java | 9 +++++++-- .../easyexcel/test/temp/bug/HeadType.java | 9 +++++++-- .../easyexcel/test/temp/csv/CsvData.java | 8 ++++++-- .../easyexcel/test/temp/data/DataType.java | 8 ++++++-- .../easyexcel/test/temp/data/HeadType.java | 8 ++++++-- .../test/temp/dataformat/DataFormatData.java | 9 ++++++--- .../easyexcel/test/temp/fill/FillData2.java | 8 ++++++-- .../test/temp/issue1662/Data1662.java | 13 +++++++++---- .../test/temp/issue1663/FillData.java | 8 ++++++-- .../easyexcel/test/temp/large/LargeData.java | 8 ++++++-- .../easyexcel/test/temp/poi/TestCell.java | 8 ++++++-- .../easyexcel/test/temp/read/HeadReadData.java | 9 ++++++--- .../easyexcel/test/temp/simple/DemoData1.java | 8 ++++++-- .../easyexcel/test/temp/simple/DemoData2.java | 8 ++++++-- .../easyexcel/test/temp/simple/JsonData.java | 8 ++++++-- .../easyexcel/test/temp/simple/WriteData.java | 10 ++++++---- 134 files changed, 818 insertions(+), 288 deletions(-) diff --git a/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java b/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java index 5fe8f0bc..d6417be7 100644 --- a/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java +++ b/src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java @@ -6,7 +6,9 @@ import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.util.MapUtils; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Converter unique key.Consider that you can just use class as the key. @@ -29,18 +31,20 @@ public class ConverterKeyBuild { } public static ConverterKey buildKey(Class clazz) { - Class boxingClass = BOXING_MAP.get(clazz); - if (boxingClass != null) { - return new ConverterKey(boxingClass, null); - } - return new ConverterKey(clazz, null); + return buildKey(clazz, null); } public static ConverterKey buildKey(Class clazz, CellDataTypeEnum cellDataTypeEnum) { + Class boxingClass = BOXING_MAP.get(clazz); + if (boxingClass != null) { + return new ConverterKey(boxingClass, cellDataTypeEnum); + } return new ConverterKey(clazz, cellDataTypeEnum); } - @Data + @Getter + @Setter + @EqualsAndHashCode @AllArgsConstructor public static class ConverterKey { private Class clazz; diff --git a/src/main/java/com/alibaba/excel/converters/ReadConverterContext.java b/src/main/java/com/alibaba/excel/converters/ReadConverterContext.java index e1367065..9c7970cd 100644 --- a/src/main/java/com/alibaba/excel/converters/ReadConverterContext.java +++ b/src/main/java/com/alibaba/excel/converters/ReadConverterContext.java @@ -5,14 +5,18 @@ import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * read converter context * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @AllArgsConstructor public class ReadConverterContext { /** diff --git a/src/main/java/com/alibaba/excel/converters/WriteConverterContext.java b/src/main/java/com/alibaba/excel/converters/WriteConverterContext.java index cb01c773..46abda47 100644 --- a/src/main/java/com/alibaba/excel/converters/WriteConverterContext.java +++ b/src/main/java/com/alibaba/excel/converters/WriteConverterContext.java @@ -4,15 +4,19 @@ import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.metadata.property.ExcelContentProperty; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * write converter context * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor @AllArgsConstructor public class WriteConverterContext { diff --git a/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java b/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java index 1e56a200..ff1b409d 100644 --- a/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java +++ b/src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java @@ -4,14 +4,18 @@ import com.alibaba.excel.metadata.data.CellData; import com.alibaba.excel.metadata.property.ExcelContentProperty; import com.alibaba.excel.write.builder.ExcelWriterBuilder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Data convert exception * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcelDataConvertException extends RuntimeException { /** * NotNull. diff --git a/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java b/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java index 9f9a2e4a..b8e3fcb3 100644 --- a/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java +++ b/src/main/java/com/alibaba/excel/exception/ExcelWriteDataConvertException.java @@ -2,14 +2,18 @@ package com.alibaba.excel.exception; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Data convert exception * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcelWriteDataConvertException extends ExcelDataConvertException { /** * handler. diff --git a/src/main/java/com/alibaba/excel/metadata/AbstractCell.java b/src/main/java/com/alibaba/excel/metadata/AbstractCell.java index 6647cf0c..9650b303 100644 --- a/src/main/java/com/alibaba/excel/metadata/AbstractCell.java +++ b/src/main/java/com/alibaba/excel/metadata/AbstractCell.java @@ -1,13 +1,17 @@ package com.alibaba.excel.metadata; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * cell * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class AbstractCell implements Cell { /** * Row index diff --git a/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java b/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java index 828f38e7..839a8b4b 100644 --- a/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java +++ b/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java @@ -6,15 +6,19 @@ import java.util.Map; import com.alibaba.excel.converters.Converter; import com.alibaba.excel.converters.ConverterKeyBuild.ConverterKey; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * Write/read holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public abstract class AbstractHolder implements ConfigurationHolder { /** diff --git a/src/main/java/com/alibaba/excel/metadata/BasicParameter.java b/src/main/java/com/alibaba/excel/metadata/BasicParameter.java index f574f10e..0c11f942 100644 --- a/src/main/java/com/alibaba/excel/metadata/BasicParameter.java +++ b/src/main/java/com/alibaba/excel/metadata/BasicParameter.java @@ -5,14 +5,18 @@ import java.util.Locale; import com.alibaba.excel.converters.Converter; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Basic parameter * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class BasicParameter { /** * You can only choose one of the {@link BasicParameter#head} and {@link BasicParameter#clazz} diff --git a/src/main/java/com/alibaba/excel/metadata/CellRange.java b/src/main/java/com/alibaba/excel/metadata/CellRange.java index bd0f54f9..8552d09f 100644 --- a/src/main/java/com/alibaba/excel/metadata/CellRange.java +++ b/src/main/java/com/alibaba/excel/metadata/CellRange.java @@ -1,11 +1,15 @@ package com.alibaba.excel.metadata; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellRange { private int firstRow; diff --git a/src/main/java/com/alibaba/excel/metadata/GlobalConfiguration.java b/src/main/java/com/alibaba/excel/metadata/GlobalConfiguration.java index 987e553b..5cafe90c 100644 --- a/src/main/java/com/alibaba/excel/metadata/GlobalConfiguration.java +++ b/src/main/java/com/alibaba/excel/metadata/GlobalConfiguration.java @@ -2,14 +2,18 @@ package com.alibaba.excel.metadata; import java.util.Locale; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Global configuration * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class GlobalConfiguration { /** * Automatic trim includes sheet name and content diff --git a/src/main/java/com/alibaba/excel/metadata/Head.java b/src/main/java/com/alibaba/excel/metadata/Head.java index 7e1fd47b..5aa1cc3a 100644 --- a/src/main/java/com/alibaba/excel/metadata/Head.java +++ b/src/main/java/com/alibaba/excel/metadata/Head.java @@ -10,14 +10,18 @@ import com.alibaba.excel.metadata.property.FontProperty; import com.alibaba.excel.metadata.property.LoopMergeProperty; import com.alibaba.excel.metadata.property.StyleProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * excel head * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class Head { /** * Column index of head diff --git a/src/main/java/com/alibaba/excel/metadata/csv/CsvCell.java b/src/main/java/com/alibaba/excel/metadata/csv/CsvCell.java index f0e925e6..72beb30a 100644 --- a/src/main/java/com/alibaba/excel/metadata/csv/CsvCell.java +++ b/src/main/java/com/alibaba/excel/metadata/csv/CsvCell.java @@ -10,7 +10,7 @@ import com.alibaba.excel.enums.NumericCellTypeEnum; import com.alibaba.excel.metadata.data.FormulaData; import lombok.AccessLevel; -import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.Getter; import lombok.Setter; import org.apache.poi.ss.SpreadsheetVersion; @@ -29,7 +29,9 @@ import org.apache.poi.ss.util.CellRangeAddress; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvCell extends CellBase { /** diff --git a/src/main/java/com/alibaba/excel/metadata/csv/CsvCellStyle.java b/src/main/java/com/alibaba/excel/metadata/csv/CsvCellStyle.java index 08b46e3a..a992f213 100644 --- a/src/main/java/com/alibaba/excel/metadata/csv/CsvCellStyle.java +++ b/src/main/java/com/alibaba/excel/metadata/csv/CsvCellStyle.java @@ -2,7 +2,9 @@ package com.alibaba.excel.metadata.csv; import com.alibaba.excel.metadata.data.DataFormatData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.CellStyle; import org.apache.poi.ss.usermodel.Color; @@ -16,7 +18,9 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvCellStyle implements CellStyle { /** diff --git a/src/main/java/com/alibaba/excel/metadata/csv/CsvRow.java b/src/main/java/com/alibaba/excel/metadata/csv/CsvRow.java index 24acd9d9..89e76a71 100644 --- a/src/main/java/com/alibaba/excel/metadata/csv/CsvRow.java +++ b/src/main/java/com/alibaba/excel/metadata/csv/CsvRow.java @@ -3,7 +3,9 @@ package com.alibaba.excel.metadata.csv; import java.util.Iterator; import java.util.List; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.compress.utils.Lists; import org.apache.poi.ss.usermodel.Cell; @@ -17,7 +19,9 @@ import org.apache.poi.ss.usermodel.Sheet; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvRow implements Row { /** diff --git a/src/main/java/com/alibaba/excel/metadata/csv/CsvSheet.java b/src/main/java/com/alibaba/excel/metadata/csv/CsvSheet.java index b002b6b4..79331677 100644 --- a/src/main/java/com/alibaba/excel/metadata/csv/CsvSheet.java +++ b/src/main/java/com/alibaba/excel/metadata/csv/CsvSheet.java @@ -16,7 +16,9 @@ import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.util.NumberDataFormatterUtils; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.csv.CSVFormat; import org.apache.commons.csv.CSVPrinter; import org.apache.poi.ss.usermodel.AutoFilter; @@ -45,7 +47,9 @@ import org.apache.poi.ss.util.PaneInformation; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvSheet implements Sheet, Closeable { /** * workbook diff --git a/src/main/java/com/alibaba/excel/metadata/csv/CsvWorkbook.java b/src/main/java/com/alibaba/excel/metadata/csv/CsvWorkbook.java index e26a2b65..4e713509 100644 --- a/src/main/java/com/alibaba/excel/metadata/csv/CsvWorkbook.java +++ b/src/main/java/com/alibaba/excel/metadata/csv/CsvWorkbook.java @@ -6,7 +6,9 @@ import java.util.Iterator; import java.util.List; import java.util.Locale; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.compress.utils.Lists; import org.apache.poi.ss.SpreadsheetVersion; import org.apache.poi.ss.formula.udf.UDFFinder; @@ -26,7 +28,9 @@ import org.apache.poi.ss.usermodel.Workbook; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvWorkbook implements Workbook { /** * output diff --git a/src/main/java/com/alibaba/excel/metadata/data/CellData.java b/src/main/java/com/alibaba/excel/metadata/data/CellData.java index ed6085f9..2f74ea9b 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/CellData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/CellData.java @@ -6,7 +6,9 @@ import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.metadata.AbstractCell; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Excel internal cell data. @@ -15,7 +17,9 @@ import lombok.Data; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellData extends AbstractCell { /** * cell type diff --git a/src/main/java/com/alibaba/excel/metadata/data/ClientAnchorData.java b/src/main/java/com/alibaba/excel/metadata/data/ClientAnchorData.java index 2416635d..1963133d 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/ClientAnchorData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/ClientAnchorData.java @@ -1,7 +1,8 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.ClientAnchor; import org.apache.poi.util.Internal; @@ -21,7 +22,9 @@ import org.apache.poi.util.Internal; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ClientAnchorData extends CoordinateData { /** * top diff --git a/src/main/java/com/alibaba/excel/metadata/data/CommentData.java b/src/main/java/com/alibaba/excel/metadata/data/CommentData.java index 08cff272..6373b0a6 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/CommentData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/CommentData.java @@ -1,13 +1,17 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * comment * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CommentData extends ClientAnchorData { /** * Name of the original comment author diff --git a/src/main/java/com/alibaba/excel/metadata/data/CoordinateData.java b/src/main/java/com/alibaba/excel/metadata/data/CoordinateData.java index 69242e57..0755662b 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/CoordinateData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/CoordinateData.java @@ -1,13 +1,17 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * coordinate. * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CoordinateData { /** * first row index.Priority is higher than {@link #relativeFirstRowIndex}. diff --git a/src/main/java/com/alibaba/excel/metadata/data/DataFormatData.java b/src/main/java/com/alibaba/excel/metadata/data/DataFormatData.java index 877ca270..4f447632 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/DataFormatData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/DataFormatData.java @@ -2,14 +2,18 @@ package com.alibaba.excel.metadata.data; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * data format * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DataFormatData { /** * index diff --git a/src/main/java/com/alibaba/excel/metadata/data/FormulaData.java b/src/main/java/com/alibaba/excel/metadata/data/FormulaData.java index 36d0206b..f71ff2eb 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/FormulaData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/FormulaData.java @@ -1,13 +1,17 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * formula * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FormulaData { /** * formula diff --git a/src/main/java/com/alibaba/excel/metadata/data/HyperlinkData.java b/src/main/java/com/alibaba/excel/metadata/data/HyperlinkData.java index 3fa23893..03edad13 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/HyperlinkData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/HyperlinkData.java @@ -1,14 +1,17 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.Setter; /** * hyperlink * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class HyperlinkData extends CoordinateData { /** * Depending on the hyperlink type it can be URL, e-mail, path to a file, etc diff --git a/src/main/java/com/alibaba/excel/metadata/data/ImageData.java b/src/main/java/com/alibaba/excel/metadata/data/ImageData.java index 20cd43e1..2ca1cdc8 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/ImageData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/ImageData.java @@ -1,14 +1,17 @@ package com.alibaba.excel.metadata.data; -import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.Getter; +import lombok.Setter; /** * image * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ImageData extends ClientAnchorData { /** diff --git a/src/main/java/com/alibaba/excel/metadata/data/ReadCellData.java b/src/main/java/com/alibaba/excel/metadata/data/ReadCellData.java index 68231a19..e1bb57ca 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/ReadCellData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/ReadCellData.java @@ -4,15 +4,19 @@ import java.math.BigDecimal; import com.alibaba.excel.enums.CellDataTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * read cell data * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class ReadCellData extends CellData { /** diff --git a/src/main/java/com/alibaba/excel/metadata/data/RichTextStringData.java b/src/main/java/com/alibaba/excel/metadata/data/RichTextStringData.java index 1717741a..d277614f 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/RichTextStringData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/RichTextStringData.java @@ -6,15 +6,19 @@ import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.write.metadata.style.WriteFont; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * rich text string * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class RichTextStringData { private String textString; @@ -25,7 +29,9 @@ public class RichTextStringData { this.textString = textString; } - @Data + @Getter + @Setter + @EqualsAndHashCode @AllArgsConstructor public static class IntervalFont { private Integer startIndex; diff --git a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java index a988703a..f8ce9064 100644 --- a/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java +++ b/src/main/java/com/alibaba/excel/metadata/data/WriteCellData.java @@ -10,8 +10,10 @@ import com.alibaba.excel.enums.CellDataTypeEnum; import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.write.metadata.style.WriteCellStyle; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import org.apache.poi.ss.usermodel.CellStyle; /** @@ -19,7 +21,9 @@ import org.apache.poi.ss.usermodel.CellStyle; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class WriteCellData extends CellData { /** diff --git a/src/main/java/com/alibaba/excel/metadata/property/DateTimeFormatProperty.java b/src/main/java/com/alibaba/excel/metadata/property/DateTimeFormatProperty.java index d2bb20cd..10752b74 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/DateTimeFormatProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/DateTimeFormatProperty.java @@ -3,14 +3,18 @@ package com.alibaba.excel.metadata.property; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.util.BooleanUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Configuration from annotations * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DateTimeFormatProperty { private String format; private Boolean use1904windowing; diff --git a/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java b/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java index 1c0bb232..f0b72198 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/ExcelContentProperty.java @@ -4,12 +4,16 @@ import java.lang.reflect.Field; import com.alibaba.excel.converters.Converter; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcelContentProperty { public static final ExcelContentProperty EMPTY = new ExcelContentProperty(); diff --git a/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java b/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java index a0359fb3..f3a8474a 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/ExcelHeadProperty.java @@ -17,7 +17,9 @@ import com.alibaba.excel.util.MapUtils; import com.alibaba.excel.util.StringUtils; import com.alibaba.excel.write.metadata.holder.AbstractWriteHolder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -27,7 +29,9 @@ import org.slf4j.LoggerFactory; * * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcelHeadProperty { private static final Logger LOGGER = LoggerFactory.getLogger(ExcelHeadProperty.class); diff --git a/src/main/java/com/alibaba/excel/metadata/property/FontProperty.java b/src/main/java/com/alibaba/excel/metadata/property/FontProperty.java index 619cfe6b..c280b921 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/FontProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/FontProperty.java @@ -4,7 +4,9 @@ import com.alibaba.excel.annotation.write.style.ContentFontStyle; import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.common.usermodel.fonts.FontCharset; import org.apache.poi.hssf.usermodel.HSSFPalette; import org.apache.poi.ss.usermodel.Font; @@ -15,7 +17,9 @@ import org.apache.poi.ss.usermodel.IndexedColors; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FontProperty { /** * The name for the font (i.e. Arial) diff --git a/src/main/java/com/alibaba/excel/metadata/property/StyleProperty.java b/src/main/java/com/alibaba/excel/metadata/property/StyleProperty.java index 4ef87f68..bb469cd3 100644 --- a/src/main/java/com/alibaba/excel/metadata/property/StyleProperty.java +++ b/src/main/java/com/alibaba/excel/metadata/property/StyleProperty.java @@ -5,7 +5,9 @@ import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.metadata.data.DataFormatData; import com.alibaba.excel.write.metadata.style.WriteFont; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.BuiltinFormats; import org.apache.poi.ss.usermodel.FillPatternType; @@ -19,7 +21,9 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class StyleProperty { /** * Set the data format (must be a valid format). Built in formats are defined at {@link BuiltinFormats}. diff --git a/src/main/java/com/alibaba/excel/read/metadata/ReadBasicParameter.java b/src/main/java/com/alibaba/excel/read/metadata/ReadBasicParameter.java index b5d17cbe..59149fb3 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/ReadBasicParameter.java +++ b/src/main/java/com/alibaba/excel/read/metadata/ReadBasicParameter.java @@ -6,14 +6,18 @@ import java.util.List; import com.alibaba.excel.metadata.BasicParameter; import com.alibaba.excel.read.listener.ReadListener; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Read basic parameter * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ReadBasicParameter extends BasicParameter { /** * Count the number of added heads when read sheet. diff --git a/src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java b/src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java index f8106631..54ab034c 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java +++ b/src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java @@ -14,14 +14,18 @@ import com.alibaba.excel.event.AnalysisEventListener; import com.alibaba.excel.read.listener.ModelBuildEventListener; import com.alibaba.excel.support.ExcelTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Workbook * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ReadWorkbook extends ReadBasicParameter { /** * Excel type diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/AbstractReadHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/AbstractReadHolder.java index 6561d377..8163a5df 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/AbstractReadHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/AbstractReadHolder.java @@ -15,15 +15,19 @@ import com.alibaba.excel.read.metadata.ReadWorkbook; import com.alibaba.excel.read.metadata.property.ExcelReadHeadProperty; import com.alibaba.excel.util.ListUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * Read Holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public abstract class AbstractReadHolder extends AbstractHolder implements ReadHolder { /** diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/ReadSheetHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/ReadSheetHolder.java index 558bec57..197835ad 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/ReadSheetHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/ReadSheetHolder.java @@ -9,15 +9,19 @@ import com.alibaba.excel.metadata.CellExtra; import com.alibaba.excel.metadata.data.ReadCellData; import com.alibaba.excel.read.metadata.ReadSheet; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * sheet holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class ReadSheetHolder extends AbstractReadHolder { diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/ReadWorkbookHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/ReadWorkbookHolder.java index b1e03e4f..7de30aa5 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/ReadWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/ReadWorkbookHolder.java @@ -19,15 +19,19 @@ import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.read.metadata.ReadWorkbook; import com.alibaba.excel.support.ExcelTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * Workbook holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class ReadWorkbookHolder extends AbstractReadHolder { diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadSheetHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadSheetHolder.java index d6bf6953..1b784e44 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadSheetHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadSheetHolder.java @@ -4,14 +4,18 @@ import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.read.metadata.holder.ReadSheetHolder; import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * sheet holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvReadSheetHolder extends ReadSheetHolder { public CsvReadSheetHolder(ReadSheet readSheet, ReadWorkbookHolder readWorkbookHolder) { diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadWorkbookHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadWorkbookHolder.java index 8066fab6..0a322d58 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/csv/CsvReadWorkbookHolder.java @@ -4,7 +4,9 @@ import com.alibaba.excel.read.metadata.ReadWorkbook; import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; import com.alibaba.excel.support.ExcelTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.csv.CSVFormat; /** @@ -12,7 +14,9 @@ import org.apache.commons.csv.CSVFormat; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvReadWorkbookHolder extends ReadWorkbookHolder { private CSVFormat csvFormat; diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java index b29ba455..f4ed56e7 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadSheetHolder.java @@ -7,14 +7,18 @@ import com.alibaba.excel.read.metadata.ReadSheet; import com.alibaba.excel.read.metadata.holder.ReadSheetHolder; import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * sheet holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class XlsxReadSheetHolder extends ReadSheetHolder { /** * Record the label of the current operation to prevent NPE. diff --git a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java index 24ff8503..4e70aa0e 100644 --- a/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/read/metadata/holder/xlsx/XlsxReadWorkbookHolder.java @@ -11,7 +11,9 @@ import com.alibaba.excel.read.metadata.holder.ReadWorkbookHolder; import com.alibaba.excel.support.ExcelTypeEnum; import com.alibaba.excel.util.MapUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.openxml4j.opc.OPCPackage; import org.apache.poi.xssf.model.StylesTable; import org.apache.poi.xssf.usermodel.XSSFCellStyle; @@ -21,7 +23,9 @@ import org.apache.poi.xssf.usermodel.XSSFCellStyle; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class XlsxReadWorkbookHolder extends ReadWorkbookHolder { /** * Package diff --git a/src/main/java/com/alibaba/excel/util/ClassUtils.java b/src/main/java/com/alibaba/excel/util/ClassUtils.java index 8c7dd6b4..82f78af2 100644 --- a/src/main/java/com/alibaba/excel/util/ClassUtils.java +++ b/src/main/java/com/alibaba/excel/util/ClassUtils.java @@ -32,7 +32,9 @@ import com.alibaba.excel.metadata.property.StyleProperty; import com.alibaba.excel.write.metadata.holder.WriteHolder; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import net.sf.cglib.beans.BeanMap; /** @@ -403,7 +405,9 @@ public class ClassUtils { } } - @Data + @Getter + @Setter + @EqualsAndHashCode @AllArgsConstructor public static class ContentPropertyKey { private Class clazz; diff --git a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java index 331c4989..af90d8d5 100644 --- a/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java +++ b/src/main/java/com/alibaba/excel/write/executor/ExcelWriteFillExecutor.java @@ -33,7 +33,9 @@ import com.alibaba.excel.write.metadata.fill.FillWrapper; import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; import org.apache.poi.hssf.usermodel.PoiUtils; import org.apache.poi.ss.usermodel.Cell; @@ -232,6 +234,7 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { List> cellDataList = new ArrayList<>(); cellWriteHandlerContext.setExcelContentProperty(ExcelContentProperty.EMPTY); + cellWriteHandlerContext.setIgnoreFillStyle(Boolean.TRUE); createCell(analysisCell, fillConfig, cellWriteHandlerContext); Cell cell = cellWriteHandlerContext.getCell(); @@ -600,7 +603,9 @@ public class ExcelWriteFillExecutor extends AbstractExcelWriteExecutor { return new UniqueDataFlagKey(writeSheetHolder.getSheetNo(), writeSheetHolder.getSheetName(), wrapperName); } - @Data + @Getter + @Setter + @EqualsAndHashCode @AllArgsConstructor public static class UniqueDataFlagKey { private Integer sheetNo; diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java index 4826d6bc..35afe6fc 100644 --- a/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java +++ b/src/main/java/com/alibaba/excel/write/handler/chain/CellHandlerExecutionChain.java @@ -3,14 +3,18 @@ package com.alibaba.excel.write.handler.chain; import com.alibaba.excel.write.handler.CellWriteHandler; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Execute the cell handler chain * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellHandlerExecutionChain { /** * next chain diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java index 872afa8a..4f32f3b1 100644 --- a/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java +++ b/src/main/java/com/alibaba/excel/write/handler/chain/RowHandlerExecutionChain.java @@ -3,14 +3,18 @@ package com.alibaba.excel.write.handler.chain; import com.alibaba.excel.write.handler.RowWriteHandler; import com.alibaba.excel.write.handler.context.RowWriteHandlerContext; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Execute the row handler chain * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class RowHandlerExecutionChain { /** * next chain diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java index 56770496..7e079dd2 100644 --- a/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java +++ b/src/main/java/com/alibaba/excel/write/handler/chain/SheetHandlerExecutionChain.java @@ -3,14 +3,18 @@ package com.alibaba.excel.write.handler.chain; import com.alibaba.excel.write.handler.SheetWriteHandler; import com.alibaba.excel.write.handler.context.SheetWriteHandlerContext; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Execute the sheet handler chain * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class SheetHandlerExecutionChain { /** * next chain diff --git a/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java b/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java index c7dacbb4..56e746e0 100644 --- a/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java +++ b/src/main/java/com/alibaba/excel/write/handler/chain/WorkbookHandlerExecutionChain.java @@ -3,14 +3,18 @@ package com.alibaba.excel.write.handler.chain; import com.alibaba.excel.write.handler.WorkbookWriteHandler; import com.alibaba.excel.write.handler.context.WorkbookWriteHandlerContext; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Execute the workbook handler chain * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WorkbookHandlerExecutionChain { /** * next chain diff --git a/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java index bd6b1930..0007e7ac 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/CellWriteHandlerContext.java @@ -12,7 +12,9 @@ import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.Cell; import org.apache.poi.ss.usermodel.Row; @@ -21,7 +23,9 @@ import org.apache.poi.ss.usermodel.Row; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellWriteHandlerContext { /** * write context diff --git a/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java index 6578d3a2..c01c8b5b 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/RowWriteHandlerContext.java @@ -6,7 +6,9 @@ import com.alibaba.excel.write.metadata.holder.WriteTableHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.Row; /** @@ -14,7 +16,9 @@ import org.apache.poi.ss.usermodel.Row; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @AllArgsConstructor public class RowWriteHandlerContext { /** diff --git a/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java index c1164eb0..f3c024f4 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/SheetWriteHandlerContext.java @@ -5,14 +5,18 @@ import com.alibaba.excel.write.metadata.holder.WriteSheetHolder; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * sheet context * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @AllArgsConstructor public class SheetWriteHandlerContext { /** diff --git a/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java b/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java index f955d4bf..a7ec289c 100644 --- a/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java +++ b/src/main/java/com/alibaba/excel/write/handler/context/WorkbookWriteHandlerContext.java @@ -4,14 +4,18 @@ import com.alibaba.excel.context.WriteContext; import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder; import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * workbook context * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @AllArgsConstructor public class WorkbookWriteHandlerContext { /** diff --git a/src/main/java/com/alibaba/excel/write/metadata/WriteBasicParameter.java b/src/main/java/com/alibaba/excel/write/metadata/WriteBasicParameter.java index 91527cc1..b0745d38 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/WriteBasicParameter.java +++ b/src/main/java/com/alibaba/excel/write/metadata/WriteBasicParameter.java @@ -7,14 +7,18 @@ import java.util.List; import com.alibaba.excel.metadata.BasicParameter; import com.alibaba.excel.write.handler.WriteHandler; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Write basic parameter * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteBasicParameter extends BasicParameter { /** * Writes the head relative to the existing contents of the sheet. Indexes are zero-based. diff --git a/src/main/java/com/alibaba/excel/write/metadata/WriteSheet.java b/src/main/java/com/alibaba/excel/write/metadata/WriteSheet.java index 04bfb822..1f41376c 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/WriteSheet.java +++ b/src/main/java/com/alibaba/excel/write/metadata/WriteSheet.java @@ -1,13 +1,17 @@ package com.alibaba.excel.write.metadata; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Write sheet * * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteSheet extends WriteBasicParameter { /** * Starting from 0 diff --git a/src/main/java/com/alibaba/excel/write/metadata/WriteTable.java b/src/main/java/com/alibaba/excel/write/metadata/WriteTable.java index a935f326..6681e1b8 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/WriteTable.java +++ b/src/main/java/com/alibaba/excel/write/metadata/WriteTable.java @@ -1,13 +1,17 @@ package com.alibaba.excel.write.metadata; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * table * * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteTable extends WriteBasicParameter { /** * Starting from 0 diff --git a/src/main/java/com/alibaba/excel/write/metadata/WriteWorkbook.java b/src/main/java/com/alibaba/excel/write/metadata/WriteWorkbook.java index bcc39211..38b368ec 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/WriteWorkbook.java +++ b/src/main/java/com/alibaba/excel/write/metadata/WriteWorkbook.java @@ -7,14 +7,18 @@ import java.nio.charset.Charset; import com.alibaba.excel.support.ExcelTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Workbook * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteWorkbook extends WriteBasicParameter { /** * Excel type.The default is xlsx diff --git a/src/main/java/com/alibaba/excel/write/metadata/fill/AnalysisCell.java b/src/main/java/com/alibaba/excel/write/metadata/fill/AnalysisCell.java index b9b377ed..783c7d89 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/fill/AnalysisCell.java +++ b/src/main/java/com/alibaba/excel/write/metadata/fill/AnalysisCell.java @@ -4,14 +4,18 @@ import java.util.List; import com.alibaba.excel.enums.WriteTemplateAnalysisCellTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Read the cells of the template while populating the data. * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class AnalysisCell { private int columnIndex; private int rowIndex; diff --git a/src/main/java/com/alibaba/excel/write/metadata/fill/FillConfig.java b/src/main/java/com/alibaba/excel/write/metadata/fill/FillConfig.java index 8fdb240a..ac5581ee 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/fill/FillConfig.java +++ b/src/main/java/com/alibaba/excel/write/metadata/fill/FillConfig.java @@ -4,15 +4,19 @@ import com.alibaba.excel.enums.WriteDirectionEnum; import lombok.AllArgsConstructor; import lombok.Builder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; /** * Fill config * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode @Builder @NoArgsConstructor @AllArgsConstructor diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java index ca14886c..0b546703 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java @@ -41,8 +41,10 @@ import com.alibaba.excel.write.style.AbstractVerticalCellStyleStrategy; import com.alibaba.excel.write.style.column.AbstractHeadColumnWidthStyleStrategy; import com.alibaba.excel.write.style.row.SimpleRowHeightStyleStrategy; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; /** @@ -50,7 +52,9 @@ import org.apache.commons.collections4.CollectionUtils; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public abstract class AbstractWriteHolder extends AbstractHolder implements WriteHolder { /** @@ -380,9 +384,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } else { cellHandlerExecutionChain.addLast((CellWriteHandler)writeHandler); } - this.writeHandlerList.add(writeHandler); } - return; } if (writeHandler instanceof RowWriteHandler) { if (!runOwn) { @@ -391,9 +393,7 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } else { rowHandlerExecutionChain.addLast((RowWriteHandler)writeHandler); } - this.writeHandlerList.add(writeHandler); } - return; } if (writeHandler instanceof SheetWriteHandler) { if (!runOwn) { @@ -402,7 +402,6 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } else { sheetHandlerExecutionChain.addLast((SheetWriteHandler)writeHandler); } - this.writeHandlerList.add(writeHandler); } else { if (ownSheetHandlerExecutionChain == null) { ownSheetHandlerExecutionChain = new SheetHandlerExecutionChain((SheetWriteHandler)writeHandler); @@ -410,7 +409,6 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ ownSheetHandlerExecutionChain.addLast((SheetWriteHandler)writeHandler); } } - return; } if (writeHandler instanceof WorkbookWriteHandler) { if (!runOwn) { @@ -420,7 +418,6 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } else { workbookHandlerExecutionChain.addLast((WorkbookWriteHandler)writeHandler); } - this.writeHandlerList.add(writeHandler); } else { if (ownWorkbookHandlerExecutionChain == null) { ownWorkbookHandlerExecutionChain = new WorkbookHandlerExecutionChain( @@ -430,6 +427,9 @@ public abstract class AbstractWriteHolder extends AbstractHolder implements Writ } } } + if (!runOwn) { + this.writeHandlerList.add(writeHandler); + } } @Override diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java index ede60eab..ffc6f759 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java @@ -8,8 +8,10 @@ import com.alibaba.excel.enums.WriteLastRowTypeEnum; import com.alibaba.excel.util.StringUtils; import com.alibaba.excel.write.metadata.WriteSheet; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; import org.apache.poi.hssf.usermodel.HSSFSheet; import org.apache.poi.ss.usermodel.Sheet; import org.apache.poi.xssf.streaming.SXSSFSheet; @@ -20,7 +22,9 @@ import org.apache.poi.xssf.usermodel.XSSFSheet; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @NoArgsConstructor public class WriteSheetHolder extends AbstractWriteHolder { /** diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteTableHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteTableHolder.java index e353a44c..3a46e784 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteTableHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteTableHolder.java @@ -3,14 +3,18 @@ package com.alibaba.excel.write.metadata.holder; import com.alibaba.excel.enums.HolderEnum; import com.alibaba.excel.write.metadata.WriteTable; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * sheet holder * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteTableHolder extends AbstractWriteHolder { /*** * poi sheet diff --git a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java index 100e59a1..1353ddc4 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java +++ b/src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java @@ -24,7 +24,10 @@ import com.alibaba.excel.write.metadata.WriteWorkbook; import com.alibaba.excel.write.metadata.style.WriteCellStyle; import com.alibaba.excel.write.metadata.style.WriteFont; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; +import lombok.ToString.Exclude; import lombok.extern.slf4j.Slf4j; import org.apache.poi.hssf.usermodel.HSSFCellStyle; import org.apache.poi.hssf.usermodel.HSSFWorkbook; @@ -40,7 +43,9 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @Slf4j public class WriteWorkbookHolder extends AbstractWriteHolder { /*** @@ -147,6 +152,7 @@ public class WriteWorkbookHolder extends AbstractWriteHolder { /** * handler context */ + @Exclude private WorkbookWriteHandlerContext workbookWriteHandlerContext; public WriteWorkbookHolder(WriteWorkbook writeWorkbook) { diff --git a/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java b/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java index 9298f9da..bebd210e 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java +++ b/src/main/java/com/alibaba/excel/write/metadata/style/WriteCellStyle.java @@ -6,7 +6,9 @@ import com.alibaba.excel.metadata.property.FontProperty; import com.alibaba.excel.metadata.property.StyleProperty; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.ss.usermodel.BorderStyle; import org.apache.poi.ss.usermodel.FillPatternType; import org.apache.poi.ss.usermodel.HorizontalAlignment; @@ -19,7 +21,9 @@ import org.apache.poi.ss.usermodel.VerticalAlignment; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteCellStyle { /** * Set the data format (must be a valid format). Built in formats are defined at {@link BuiltinFormats}. diff --git a/src/main/java/com/alibaba/excel/write/metadata/style/WriteFont.java b/src/main/java/com/alibaba/excel/write/metadata/style/WriteFont.java index d1f42f01..a42899e1 100644 --- a/src/main/java/com/alibaba/excel/write/metadata/style/WriteFont.java +++ b/src/main/java/com/alibaba/excel/write/metadata/style/WriteFont.java @@ -2,7 +2,9 @@ package com.alibaba.excel.write.metadata.style; import com.alibaba.excel.util.StringUtils; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.poi.common.usermodel.fonts.FontCharset; import org.apache.poi.hssf.usermodel.HSSFPalette; import org.apache.poi.ss.usermodel.Font; @@ -13,7 +15,9 @@ import org.apache.poi.ss.usermodel.IndexedColors; * * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteFont { /** * The name for the font (i.e. Arial) diff --git a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java index 84ba05a5..4c11010a 100644 --- a/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java +++ b/src/main/java/com/alibaba/excel/write/property/ExcelWriteHeadProperty.java @@ -26,14 +26,18 @@ import com.alibaba.excel.metadata.property.OnceAbsoluteMergeProperty; import com.alibaba.excel.metadata.property.RowHeightProperty; import com.alibaba.excel.metadata.property.StyleProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * Define the header attribute of excel * * @author jipengfei */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcelWriteHeadProperty extends ExcelHeadProperty { private RowHeightProperty headRowHeightProperty; diff --git a/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java b/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java index 8f033710..df04d248 100644 --- a/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java +++ b/src/main/java/com/alibaba/excel/write/style/HorizontalCellStyleStrategy.java @@ -7,7 +7,9 @@ import com.alibaba.excel.util.ListUtils; import com.alibaba.excel.write.handler.context.CellWriteHandlerContext; import com.alibaba.excel.write.metadata.style.WriteCellStyle; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; import org.apache.commons.collections4.CollectionUtils; /** @@ -15,7 +17,9 @@ import org.apache.commons.collections4.CollectionUtils; * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class HorizontalCellStyleStrategy extends AbstractCellStyleStrategy { private WriteCellStyle headWriteCellStyle; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java index 40bc4b0b..0ed28a29 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationData.java @@ -10,12 +10,16 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @ColumnWidth(50) @HeadRowHeight(50) @ContentRowHeight(100) diff --git a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java index b41f093d..fa93f2ed 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/annotation/AnnotationIndexAndNameData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.annotation; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class AnnotationIndexAndNameData { @ExcelProperty(value = "第四个", index = 4) private String index4; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java b/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java index b8322073..ad50e4a0 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataReadData.java @@ -3,12 +3,16 @@ package com.alibaba.easyexcel.test.core.celldata; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.metadata.data.ReadCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellDataReadData { @DateTimeFormat("yyyy年MM月dd日") private ReadCellData date; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java b/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java index 69ed7bbf..cf10b0d7 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/celldata/CellDataWriteData.java @@ -5,12 +5,16 @@ import java.util.Date; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.metadata.data.WriteCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellDataWriteData { @DateTimeFormat("yyyy年MM月dd日") private WriteCellData date; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java index 8fa78f7e..f9a6bee6 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterReadData.java @@ -8,12 +8,16 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.data.ReadCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ConverterReadData { @ExcelProperty("日期") private Date date; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java index 68c34423..6782aa1a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ConverterWriteData.java @@ -8,12 +8,16 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.metadata.data.WriteCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ConverterWriteData { @ExcelProperty("日期") private Date date; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java index f8d6ac21..fb31e127 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ImageData.java @@ -8,12 +8,16 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.converters.string.StringImageConverter; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @ContentRowHeight(500) @ColumnWidth(500 / 8) public class ImageData { diff --git a/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java b/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java index cccee710..dac73127 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/converter/ReadAllConverterData.java @@ -5,12 +5,16 @@ import java.math.BigInteger; import java.time.LocalDateTime; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ReadAllConverterData { private BigDecimal bigDecimalBoolean; private BigDecimal bigDecimalNumber; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java b/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java index 1930bce5..5958161c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/dataformat/DateFormatData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.core.dataformat; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DateFormatData { private String date; private String dateStringCn; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java b/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java index 19ef8d03..6cba3a71 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/encrypt/EncryptData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.encrypt; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class EncryptData { @ExcelProperty("姓名") private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java b/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java index 28d273e4..c989ce99 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/exception/ExceptionData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.exception; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExceptionData { @ExcelProperty("姓名") private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java b/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java index 7c49b01d..737bd61b 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/excludeorinclude/ExcludeOrIncludeData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.excludeorinclude; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExcludeOrIncludeData { @ExcelProperty(order = 1) private String column1; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java b/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java index 61822fa8..0424509e 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/extra/ExtraData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.core.extra; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExtraData { private String row1; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java index a1dd56a3..9a33351c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/FillData.java @@ -4,12 +4,16 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.NumberFormat; import com.alibaba.excel.converters.doubleconverter.DoubleStringConverter; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillData { private String name; @NumberFormat("#") diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java index 52b1cc04..c568e027 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleAnnotatedData.java @@ -7,12 +7,16 @@ import com.alibaba.excel.annotation.write.style.ContentStyle; import com.alibaba.excel.enums.BooleanEnum; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillStyleAnnotatedData { @ContentStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 13) @ContentFontStyle(bold = BooleanEnum.TRUE, color = 19) diff --git a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java index 98c29fb2..20af16a3 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/fill/style/FillStyleData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.fill.style; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillStyleData { private String name; private Double number; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java b/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java index ad2188aa..ec81e596 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/handler/WriteHandlerData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.handler; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteHandlerData { @ExcelProperty("姓名") private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java b/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java index 30e7e814..38eb2b8a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/head/ComplexHeadData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.head; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ComplexHeadData { @ExcelProperty({"顶格", "顶格", "两格"}) private String string0; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java b/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java index 7e19af15..a45bcf9c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/head/NoHeadData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.head; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class NoHeadData { @ExcelProperty("字符串") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java index 246f9cbd..1bd5a748 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/large/LargeData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.core.large; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class LargeData { private String str1; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java b/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java index 73da1c31..22b00e19 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/multiplesheets/MultipleSheetsData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.core.multiplesheets; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class MultipleSheetsData { private String title; } diff --git a/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java b/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java index dd010fc7..286ef8fe 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/noncamel/UnCamelData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.core.noncamel; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class UnCamelData { private String string1; private String String2; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java b/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java index 7e22a2e7..fedabaa0 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/parameter/ParameterData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.parameter; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ParameterData { @ExcelProperty("姓名") private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java b/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java index 0a7378f2..e77a995e 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/repetition/RepetitionData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.repetition; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class RepetitionData { @ExcelProperty("字符串") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java b/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java index 6c541a24..0e43b3c8 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/simple/SimpleData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.simple; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class SimpleData { @ExcelProperty("姓名") private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java b/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java index 1476448b..8e0d55ee 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/skip/SkipData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.skip; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class SkipData { @ExcelProperty("姓名") diff --git a/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java b/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java index 870abe87..668dd899 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/sort/SortData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.sort; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class SortData { private String column5; private String column6; diff --git a/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java index cc30893e..b6b67c9d 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/style/StyleData.java @@ -4,12 +4,16 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadStyle; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @HeadStyle @HeadFontStyle public class StyleData { diff --git a/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java b/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java index 31778a21..02d01215 100644 --- a/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java +++ b/src/test/java/com/alibaba/easyexcel/test/core/template/TemplateData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.core.template; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class TemplateData { @ExcelProperty("字符串0") private String string0; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java index 589f838c..6eb34ada 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.demo.fill; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillData { private String name; private double number; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java index 357dbfe9..b29c39bf 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/CellDataReadDemoData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.metadata.data.CellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CellDataReadDemoData { private CellData string; // 这里注意 虽然是日期 但是 类型 存储的是number 因为excel 存储的就是number diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java index bc27e1f8..2e87616f 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/ConverterData.java @@ -4,14 +4,18 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.format.NumberFormat; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ConverterData { /** * 我自定义 转换器，不管数据库传过来什么 。我给他加上“自定义：” diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java index a7a7519b..6c3321d2 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoData.java @@ -2,14 +2,18 @@ package com.alibaba.easyexcel.test.demo.read; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DemoData { private String string; private Date date; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java index e780bfa7..b0d9a03c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/DemoExtraData.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.demo.read; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DemoExtraData { private String row1; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java index 8040728d..b202311d 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/ExceptionDemoData.java @@ -2,14 +2,18 @@ package com.alibaba.easyexcel.test.demo.read; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ExceptionDemoData { /** * 用日期去接字符串 肯定报错 diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java index 1521b8cd..a545ffa8 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/IndexOrNameData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class IndexOrNameData { /** * 强制读取第三个 这里不建议 index 和 name 同时用，要么一个对象只用index，要么一个对象只用name去匹配 diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java b/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java index 4fa3a780..501ecc78 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/web/DownloadData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DownloadData { @ExcelProperty("字符串标题") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java b/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java index 80a0e658..2993969a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/web/UploadData.java @@ -2,14 +2,18 @@ package com.alibaba.easyexcel.test.demo.web; import java.util.Date; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class UploadData { private String string; private Date date; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java index 44ce5cc7..74a157d1 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/ComplexHeadData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 复杂头数据.这里最终效果是第一行就一个主标题，第二行分类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ComplexHeadData { @ExcelProperty({"主标题", "字符串标题"}) private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java index 864cfcbf..c120e47a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/ConverterData.java @@ -6,14 +6,18 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.format.DateTimeFormat; import com.alibaba.excel.annotation.format.NumberFormat; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class ConverterData { /** * 我想所有的 字符串起前面加上"自定义："三个字 diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java index 8a7902b5..76b50584 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoData.java @@ -3,17 +3,20 @@ package com.alibaba.easyexcel.test.demo.write; import java.util.Date; import com.alibaba.excel.annotation.ExcelIgnore; -import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DemoData { @ExcelProperty("字符串标题") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java index ad94321e..44279db6 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoMergeData.java @@ -5,14 +5,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.ContentLoopMerge; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 样式的数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode // 将第6-7行的2-3列合并成一个单元格 // @OnceAbsoluteMerge(firstRowIndex = 5, lastRowIndex = 6, firstColumnIndex = 1, lastColumnIndex = 2) public class DemoMergeData { diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java index 6dc60ed1..eded587b 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/DemoStyleData.java @@ -9,14 +9,18 @@ import com.alibaba.excel.annotation.write.style.HeadFontStyle; import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 样式的数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode // 头背景设置成红色 IndexedColors.RED.getIndex() @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 10) // 头字体设置成20 diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java index a7bd7caa..4c39ffb1 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDataWithAnnotation.java @@ -9,13 +9,17 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.converters.string.StringImageConverter; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 图片导出类 * */ -@Data +@Getter +@Setter +@EqualsAndHashCode @ContentRowHeight(100) @ColumnWidth(100 / 8) public class ImageDataWithAnnotation { diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java index ba80d6f1..9f1ebca3 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/ImageDemoData.java @@ -10,14 +10,18 @@ import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.converters.string.StringImageConverter; import com.alibaba.excel.metadata.data.WriteCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 图片导出类 * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @ContentRowHeight(100) @ColumnWidth(100 / 8) public class ImageDemoData { diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java index 81c2d4e1..47c8c3b4 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/IndexData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class IndexData { @ExcelProperty(value = "字符串标题", index = 0) private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java index 69ad51dc..645be062 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/LongestMatchColumnWidthData.java @@ -4,14 +4,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class LongestMatchColumnWidthData { @ExcelProperty("字符串标题") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java index 42a7f883..a3a9b7f2 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/WidthAndHeightData.java @@ -7,14 +7,18 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth; import com.alibaba.excel.annotation.write.style.ContentRowHeight; import com.alibaba.excel.annotation.write.style.HeadRowHeight; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode @ContentRowHeight(10) @HeadRowHeight(20) @ColumnWidth(25) diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java index 2dfed31d..0cd50ddd 100644 --- a/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java +++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteCellDemoData.java @@ -2,14 +2,18 @@ package com.alibaba.easyexcel.test.demo.write; import com.alibaba.excel.metadata.data.WriteCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 根据WriteCellData写 * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteCellDemoData { /** * 超链接 diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java b/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java index 9c3f39e4..86b9f4f7 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/CamlData.java @@ -1,13 +1,17 @@ package com.alibaba.easyexcel.test.temp; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * TODO * * @author 是仪 */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CamlData { private String string1; private String String2; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java b/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java index 14fa65e3..88195cf9 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/LockData.java @@ -2,14 +2,18 @@ package com.alibaba.easyexcel.test.temp; import com.alibaba.excel.annotation.format.NumberFormat; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 基础数据类.这里的排序和excel里面的排序一致 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class LockData { @NumberFormat("#.##%") private Double string0; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java b/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java index 89214922..89453e5e 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/StyleData.java @@ -2,13 +2,17 @@ package com.alibaba.easyexcel.test.temp; import java.util.List; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class StyleData { private byte[] byteValue; private Byte[] byteValue2; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java b/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java index 55984a73..dbbb7058 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/TempFillData.java @@ -2,12 +2,16 @@ package com.alibaba.easyexcel.test.temp; import com.alibaba.excel.annotation.write.style.ContentRowHeight; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @ContentRowHeight(30) public class TempFillData { private String name; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java b/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java index 37b8dc2b..b781f9fa 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/bug/DataType.java @@ -1,14 +1,19 @@ package com.alibaba.easyexcel.test.temp.bug; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author jiaosong * @desc * @date 2021/4/6 */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DataType { /** * 任务id diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java b/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java index 15ee006d..bcfa101c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/bug/HeadType.java @@ -1,14 +1,19 @@ package com.alibaba.easyexcel.test.temp.bug; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; + +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author jiaosong * @desc * @date 2021/4/6 */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class HeadType { diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java b/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java index 2f645339..1cc91c72 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/csv/CsvData.java @@ -5,14 +5,18 @@ import java.util.Date; import com.alibaba.excel.annotation.ExcelIgnore; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * TODO * * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class CsvData { @ExcelProperty("字符串标题") private String string; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java b/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java index 8a4b1fb7..ef92e62c 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/data/DataType.java @@ -2,9 +2,13 @@ package com.alibaba.easyexcel.test.temp.data; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter +@EqualsAndHashCode public class DataType { /** * 任务id diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java b/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java index 32bd065e..2eaf0a27 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/data/HeadType.java @@ -2,9 +2,13 @@ package com.alibaba.easyexcel.test.temp.data; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter +@EqualsAndHashCode public class HeadType { diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java b/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java index 86303729..bd7a7acb 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/dataformat/DataFormatData.java @@ -1,16 +1,19 @@ package com.alibaba.easyexcel.test.temp.dataformat; import com.alibaba.excel.metadata.data.ReadCellData; -import com.alibaba.excel.metadata.data.WriteCellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * TODO * * @author 罗成 **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class DataFormatData { private ReadCellData date; private ReadCellData num; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java b/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java index 17c34cf1..0ddda379 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/fill/FillData2.java @@ -1,11 +1,15 @@ package com.alibaba.easyexcel.test.temp.fill; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillData2 { private String test; } diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java b/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java index 53a1a5c8..818aa524 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/issue1662/Data1662.java @@ -1,13 +1,18 @@ package com.alibaba.easyexcel.test.temp.issue1662; +import java.util.Date; + import com.alibaba.excel.annotation.ExcelProperty; + import lombok.AllArgsConstructor; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; -import java.util.Date; - -@Data +@Getter +@Setter +@EqualsAndHashCode @AllArgsConstructor @NoArgsConstructor public class Data1662 { diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java b/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java index 57b54107..0dfd27f7 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/issue1663/FillData.java @@ -1,8 +1,12 @@ package com.alibaba.easyexcel.test.temp.issue1663; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter +@EqualsAndHashCode public class FillData { private String name; private double number; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java b/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java index 43726ad3..59444b38 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/large/LargeData.java @@ -1,12 +1,16 @@ package com.alibaba.easyexcel.test.temp.large; import lombok.Builder; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * @author Jiaju Zhuang */ -@Data +@Getter +@Setter +@EqualsAndHashCode @Builder public class LargeData { diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java b/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java index 0edc995d..99540f2a 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/poi/TestCell.java @@ -4,14 +4,18 @@ import java.util.List; import com.alibaba.excel.metadata.data.CellData; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * TODO * * @author 罗成 **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class TestCell { private CellData c1; private CellData> c2; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java b/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java index 62d5e317..90a721a2 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/read/HeadReadData.java @@ -2,15 +2,18 @@ package com.alibaba.easyexcel.test.temp.read; import com.alibaba.excel.annotation.ExcelProperty; -import lombok.Data; -import lombok.experimental.Accessors; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * 临时测试 * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class HeadReadData { @ExcelProperty({"主标题","数据1"}) private String h1; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java b/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java index 8de542d1..97c26ed9 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData1.java @@ -7,9 +7,13 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter +@EqualsAndHashCode public class DemoData1 { @ExcelProperty("字符串标题") @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 42) diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java b/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java index 00d99041..ddc0e3db 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/simple/DemoData2.java @@ -7,9 +7,13 @@ import com.alibaba.excel.annotation.ExcelProperty; import com.alibaba.excel.annotation.write.style.HeadStyle; import com.alibaba.excel.enums.poi.FillPatternTypeEnum; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; -@Data +@Getter +@Setter +@EqualsAndHashCode public class DemoData2 { @ExcelProperty("字符串标题") @HeadStyle(fillPatternType = FillPatternTypeEnum.SOLID_FOREGROUND, fillForegroundColor = 42) diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java b/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java index a9ba7fa4..34a60bc8 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/simple/JsonData.java @@ -1,13 +1,17 @@ package com.alibaba.easyexcel.test.temp.simple; -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * TODO * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class JsonData { private String SS1; private String sS2; diff --git a/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java b/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java index 27967b9f..d9a035ce 100644 --- a/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java +++ b/src/test/java/com/alibaba/easyexcel/test/temp/simple/WriteData.java @@ -2,16 +2,18 @@ package com.alibaba.easyexcel.test.temp.simple; import java.util.Date; -import com.alibaba.excel.annotation.write.style.ContentStyle; - -import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.Getter; +import lombok.Setter; /** * write data * * @author Jiaju Zhuang **/ -@Data +@Getter +@Setter +@EqualsAndHashCode public class WriteData { // @ContentStyle(locked = true) private Date dd;