Browse Source

优化读写逻辑

bugfix
zhuangjiaju 5 years ago
parent
commit
4318be5724
  1. 2
      .travis.yml
  2. 4
      src/main/java/com/alibaba/excel/analysis/ExcelExecutor.java
  3. 4
      src/main/java/com/alibaba/excel/analysis/v07/SharedStringsTableHandler.java
  4. 4
      src/main/java/com/alibaba/excel/annotation/ExcelIgnore.java
  5. 4
      src/main/java/com/alibaba/excel/annotation/format/DateTimeFormat.java
  6. 6
      src/main/java/com/alibaba/excel/annotation/format/NumberFormat.java
  7. 2
      src/main/java/com/alibaba/excel/annotation/write/style/ColumnWidth.java
  8. 6
      src/main/java/com/alibaba/excel/annotation/write/style/ContentRowHeight.java
  9. 4
      src/main/java/com/alibaba/excel/annotation/write/style/HeadRowHeight.java
  10. 2
      src/main/java/com/alibaba/excel/cache/Ehcache.java
  11. 6
      src/main/java/com/alibaba/excel/cache/MapCache.java
  12. 10
      src/main/java/com/alibaba/excel/cache/ReadCache.java
  13. 2
      src/main/java/com/alibaba/excel/converters/AutoConverter.java
  14. 4
      src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java
  15. 2
      src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java
  16. 2
      src/main/java/com/alibaba/excel/converters/bigdecimal/BigDecimalBooleanConverter.java
  17. 2
      src/main/java/com/alibaba/excel/converters/bigdecimal/BigDecimalNumberConverter.java
  18. 2
      src/main/java/com/alibaba/excel/converters/bigdecimal/BigDecimalStringConverter.java
  19. 2
      src/main/java/com/alibaba/excel/converters/booleanconverter/BooleanBooleanConverter.java
  20. 2
      src/main/java/com/alibaba/excel/converters/booleanconverter/BooleanNumberConverter.java
  21. 2
      src/main/java/com/alibaba/excel/converters/booleanconverter/BooleanStringConverter.java
  22. 2
      src/main/java/com/alibaba/excel/converters/byteconverter/ByteBooleanConverter.java
  23. 2
      src/main/java/com/alibaba/excel/converters/byteconverter/ByteNumberConverter.java
  24. 2
      src/main/java/com/alibaba/excel/converters/byteconverter/ByteStringConverter.java
  25. 2
      src/main/java/com/alibaba/excel/converters/date/DateNumberConverter.java
  26. 2
      src/main/java/com/alibaba/excel/converters/date/DateStringConverter.java
  27. 2
      src/main/java/com/alibaba/excel/converters/doubleconverter/DoubleBooleanConverter.java
  28. 2
      src/main/java/com/alibaba/excel/converters/doubleconverter/DoubleNumberConverter.java
  29. 2
      src/main/java/com/alibaba/excel/converters/doubleconverter/DoubleStringConverter.java
  30. 2
      src/main/java/com/alibaba/excel/converters/floatconverter/FloatBooleanConverter.java
  31. 2
      src/main/java/com/alibaba/excel/converters/floatconverter/FloatNumberConverter.java
  32. 2
      src/main/java/com/alibaba/excel/converters/floatconverter/FloatStringConverter.java
  33. 2
      src/main/java/com/alibaba/excel/converters/integer/IntegerBooleanConverter.java
  34. 2
      src/main/java/com/alibaba/excel/converters/integer/IntegerNumberConverter.java
  35. 2
      src/main/java/com/alibaba/excel/converters/integer/IntegerStringConverter.java
  36. 2
      src/main/java/com/alibaba/excel/converters/longconverter/LongBooleanConverter.java
  37. 2
      src/main/java/com/alibaba/excel/converters/longconverter/LongNumberConverter.java
  38. 2
      src/main/java/com/alibaba/excel/converters/longconverter/LongStringConverter.java
  39. 2
      src/main/java/com/alibaba/excel/converters/shortconverter/ShortBooleanConverter.java
  40. 2
      src/main/java/com/alibaba/excel/converters/shortconverter/ShortNumberConverter.java
  41. 2
      src/main/java/com/alibaba/excel/converters/shortconverter/ShortStringConverter.java
  42. 2
      src/main/java/com/alibaba/excel/converters/string/StringBooleanConverter.java
  43. 2
      src/main/java/com/alibaba/excel/converters/string/StringErrorConverter.java
  44. 2
      src/main/java/com/alibaba/excel/converters/string/StringNumberConverter.java
  45. 2
      src/main/java/com/alibaba/excel/converters/string/StringStringConverter.java
  46. 2
      src/main/java/com/alibaba/excel/enums/CellDataTypeEnum.java
  47. 2
      src/main/java/com/alibaba/excel/enums/HeadKindEnum.java
  48. 2
      src/main/java/com/alibaba/excel/enums/HolderEnum.java
  49. 2
      src/main/java/com/alibaba/excel/enums/WriteLastRowType.java
  50. 2
      src/main/java/com/alibaba/excel/event/Handler.java
  51. 4
      src/main/java/com/alibaba/excel/event/Listener.java
  52. 4
      src/main/java/com/alibaba/excel/event/NotRepeatExecutor.java
  53. 4
      src/main/java/com/alibaba/excel/event/Order.java
  54. 4
      src/main/java/com/alibaba/excel/event/SyncReadListener.java
  55. 2
      src/main/java/com/alibaba/excel/exception/ExcelAnalysisStopException.java
  56. 2
      src/main/java/com/alibaba/excel/exception/ExcelCommonException.java
  57. 4
      src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java
  58. 2
      src/main/java/com/alibaba/excel/metadata/AbstractHolder.java
  59. 4
      src/main/java/com/alibaba/excel/metadata/BasicParameter.java
  60. 2
      src/main/java/com/alibaba/excel/metadata/CellData.java
  61. 2
      src/main/java/com/alibaba/excel/metadata/ConfigurationHolder.java
  62. 6
      src/main/java/com/alibaba/excel/metadata/GlobalConfiguration.java
  63. 2
      src/main/java/com/alibaba/excel/metadata/Head.java
  64. 2
      src/main/java/com/alibaba/excel/metadata/Holder.java
  65. 4
      src/main/java/com/alibaba/excel/metadata/property/ColumnWidthProperty.java
  66. 2
      src/main/java/com/alibaba/excel/metadata/property/DateTimeFormatProperty.java
  67. 2
      src/main/java/com/alibaba/excel/metadata/property/NumberFormatProperty.java
  68. 4
      src/main/java/com/alibaba/excel/metadata/property/RowHeightProperty.java
  69. 2
      src/main/java/com/alibaba/excel/read/builder/ExcelReaderBuilder.java
  70. 2
      src/main/java/com/alibaba/excel/read/builder/ExcelReaderSheetBuilder.java
  71. 2
      src/main/java/com/alibaba/excel/read/listener/ReadListener.java
  72. 2
      src/main/java/com/alibaba/excel/read/metadata/ReadBasicParameter.java
  73. 2
      src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java
  74. 2
      src/main/java/com/alibaba/excel/read/metadata/holder/AbstractReadHolder.java
  75. 2
      src/main/java/com/alibaba/excel/read/metadata/holder/ReadHolder.java
  76. 2
      src/main/java/com/alibaba/excel/read/metadata/holder/ReadRowHolder.java
  77. 2
      src/main/java/com/alibaba/excel/read/metadata/holder/ReadSheetHolder.java
  78. 2
      src/main/java/com/alibaba/excel/read/metadata/holder/ReadWorkbookHolder.java
  79. 4
      src/main/java/com/alibaba/excel/util/BooleanUtils.java
  80. 2
      src/main/java/com/alibaba/excel/util/DateUtils.java
  81. 2
      src/main/java/com/alibaba/excel/util/NumberUtils.java
  82. 2
      src/main/java/com/alibaba/excel/write/builder/ExcelWriterBuilder.java
  83. 8
      src/main/java/com/alibaba/excel/write/builder/ExcelWriterSheetBuilder.java
  84. 2
      src/main/java/com/alibaba/excel/write/builder/ExcelWriterTableBuilder.java
  85. 2
      src/main/java/com/alibaba/excel/write/handler/CellWriteHandler.java
  86. 2
      src/main/java/com/alibaba/excel/write/handler/DefaultWriteHandlerLoader.java
  87. 2
      src/main/java/com/alibaba/excel/write/handler/RowWriteHandler.java
  88. 8
      src/main/java/com/alibaba/excel/write/handler/SheetWriteHandler.java
  89. 6
      src/main/java/com/alibaba/excel/write/handler/WorkbookWriteHandler.java
  90. 4
      src/main/java/com/alibaba/excel/write/handler/WriteHandler.java
  91. 6
      src/main/java/com/alibaba/excel/write/merge/AbstractMergeStrategy.java
  92. 2
      src/main/java/com/alibaba/excel/write/merge/LoopMergeStrategy.java
  93. 4
      src/main/java/com/alibaba/excel/write/merge/OnceAbsoluteMergeStrategy.java
  94. 2
      src/main/java/com/alibaba/excel/write/metadata/WriteBasicParameter.java
  95. 2
      src/main/java/com/alibaba/excel/write/metadata/WriteWorkbook.java
  96. 2
      src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java
  97. 2
      src/main/java/com/alibaba/excel/write/metadata/holder/WriteHolder.java
  98. 2
      src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java
  99. 2
      src/main/java/com/alibaba/excel/write/metadata/holder/WriteTableHolder.java
  100. 2
      src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java
  101. Some files were not shown because too many files have changed in this diff Show More

2
.travis.yml

@ -1,5 +1,5 @@
language: java
jdk: oraclejdk8
jdk: openjdk8
cache:
directories:
- $HOME/.m2

4
src/main/java/com/alibaba/excel/analysis/ExcelExecutor.java

@ -7,13 +7,13 @@ import com.alibaba.excel.read.metadata.ReadSheet;
/**
* Excel file Executor
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public interface ExcelExecutor {
/**
* Returns the actual sheet in excel
*
*
* @return
*/
List<ReadSheet> sheetList();

4
src/main/java/com/alibaba/excel/analysis/v07/SharedStringsTableHandler.java

@ -6,8 +6,8 @@ import com.alibaba.excel.cache.ReadCache;
/**
* Sax read sharedStringsTable.xml
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class SharedStringsTableHandler extends DefaultHandler {
private static final String T_TAG = "t";

4
src/main/java/com/alibaba/excel/annotation/ExcelIgnore.java

@ -8,8 +8,8 @@ import java.lang.annotation.Target;
/**
* Ignore convert excel
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)

4
src/main/java/com/alibaba/excel/annotation/format/DateTimeFormat.java

@ -11,8 +11,8 @@ import java.lang.annotation.Target;
*
* <li>write: It can be used on classes {@link java.util.Date}
* <li>read: It can be used on classes {@link String}
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)

6
src/main/java/com/alibaba/excel/annotation/format/NumberFormat.java

@ -12,8 +12,8 @@ import java.math.RoundingMode;
*
* <li>write: It can be used on classes that inherit {@link Number}
* <li>read: It can be used on classes {@link String}
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
@Target(ElementType.FIELD)
@Retention(RetentionPolicy.RUNTIME)
@ -30,7 +30,7 @@ public @interface NumberFormat {
/**
* Rounded by default
*
*
* @return
*/
RoundingMode roundingMode() default RoundingMode.HALF_UP;

2
src/main/java/com/alibaba/excel/annotation/write/style/ColumnWidth.java

@ -9,7 +9,7 @@ import java.lang.annotation.Target;
/**
* Set the width of the table
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
@Target({ElementType.FIELD, ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)

6
src/main/java/com/alibaba/excel/annotation/write/style/ContentRowHeight.java

@ -8,8 +8,8 @@ import java.lang.annotation.Target;
/**
* Set the height of each table
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)
@ -20,7 +20,7 @@ public @interface ContentRowHeight {
* Set the content height
* <p>
* -1 mean the auto set height
*
*
* @return
*/
short value() default -1;

4
src/main/java/com/alibaba/excel/annotation/write/style/HeadRowHeight.java

@ -8,8 +8,8 @@ import java.lang.annotation.Target;
/**
* Set the height of each table
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
@Target({ElementType.TYPE})
@Retention(RetentionPolicy.RUNTIME)

2
src/main/java/com/alibaba/excel/cache/Ehcache.java vendored

@ -25,7 +25,7 @@ import com.alibaba.excel.util.StringUtils;
/**
* Default cache
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class Ehcache implements ReadCache {

6
src/main/java/com/alibaba/excel/cache/MapCache.java vendored

@ -6,10 +6,10 @@ import java.util.Map;
import com.alibaba.excel.context.AnalysisContext;
/**
*
*
* Putting temporary data directly into a map is a little more efficient but very memory intensive
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class MapCache implements ReadCache {
private Map<Integer, String> cache = new HashMap<Integer, String>();

10
src/main/java/com/alibaba/excel/cache/ReadCache.java vendored

@ -4,28 +4,28 @@ import com.alibaba.excel.context.AnalysisContext;
/**
* Read cache
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public interface ReadCache {
/**
* Initialize cache
*
*
* @param analysisContext
*/
void init(AnalysisContext analysisContext);
/**
* Automatically generate the key and put it in the cache.Key start from 0
*
*
* @param value
*/
void put(String value);
/**
* Get value
*
*
* @param key
* @return
*/

2
src/main/java/com/alibaba/excel/converters/AutoConverter.java

@ -8,7 +8,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* An empty converter.It's automatically converted by type.
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class AutoConverter implements Converter {

4
src/main/java/com/alibaba/excel/converters/ConverterKeyBuild.java

@ -4,8 +4,8 @@ import com.alibaba.excel.enums.CellDataTypeEnum;
/**
* Converter unique key
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class ConverterKeyBuild {
public static String buildKey(Class clazz) {

2
src/main/java/com/alibaba/excel/converters/DefaultConverterLoader.java

@ -37,7 +37,7 @@ import com.alibaba.excel.converters.string.StringStringConverter;
/**
* Load default handler
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class DefaultConverterLoader {
/**

2
src/main/java/com/alibaba/excel/converters/bigdecimal/BigDecimalBooleanConverter.java

@ -11,7 +11,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* BigDecimal and boolean converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class BigDecimalBooleanConverter implements Converter<BigDecimal> {

2
src/main/java/com/alibaba/excel/converters/bigdecimal/BigDecimalNumberConverter.java

@ -11,7 +11,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* BigDecimal and number converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class BigDecimalNumberConverter implements Converter<BigDecimal> {

2
src/main/java/com/alibaba/excel/converters/bigdecimal/BigDecimalStringConverter.java

@ -13,7 +13,7 @@ import com.alibaba.excel.util.NumberUtils;
/**
* BigDecimal and string converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class BigDecimalStringConverter implements Converter<BigDecimal> {

2
src/main/java/com/alibaba/excel/converters/booleanconverter/BooleanBooleanConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Boolean and boolean converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class BooleanBooleanConverter implements Converter<Boolean> {

2
src/main/java/com/alibaba/excel/converters/booleanconverter/BooleanNumberConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Boolean and number converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class BooleanNumberConverter implements Converter<Boolean> {

2
src/main/java/com/alibaba/excel/converters/booleanconverter/BooleanStringConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Boolean and string converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class BooleanStringConverter implements Converter<Boolean> {

2
src/main/java/com/alibaba/excel/converters/byteconverter/ByteBooleanConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Byte and boolean converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ByteBooleanConverter implements Converter<Byte> {
private static final Byte ONE = (byte)1;

2
src/main/java/com/alibaba/excel/converters/byteconverter/ByteNumberConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Byte and number converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ByteNumberConverter implements Converter<Byte> {

2
src/main/java/com/alibaba/excel/converters/byteconverter/ByteStringConverter.java

@ -12,7 +12,7 @@ import com.alibaba.excel.util.NumberUtils;
/**
* Byte and string converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ByteStringConverter implements Converter<Byte> {

2
src/main/java/com/alibaba/excel/converters/date/DateNumberConverter.java

@ -13,7 +13,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Date and number converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class DateNumberConverter implements Converter<Date> {

2
src/main/java/com/alibaba/excel/converters/date/DateStringConverter.java

@ -13,7 +13,7 @@ import com.alibaba.excel.util.DateUtils;
/**
* Date and string converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class DateStringConverter implements Converter<Date> {
@Override

2
src/main/java/com/alibaba/excel/converters/doubleconverter/DoubleBooleanConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Double and boolean converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class DoubleBooleanConverter implements Converter<Double> {
private static final Double ONE = 1.0;

2
src/main/java/com/alibaba/excel/converters/doubleconverter/DoubleNumberConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Double and number converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class DoubleNumberConverter implements Converter<Double> {

2
src/main/java/com/alibaba/excel/converters/doubleconverter/DoubleStringConverter.java

@ -12,7 +12,7 @@ import com.alibaba.excel.util.NumberUtils;
/**
* Double and string converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class DoubleStringConverter implements Converter<Double> {

2
src/main/java/com/alibaba/excel/converters/floatconverter/FloatBooleanConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Float and boolean converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class FloatBooleanConverter implements Converter<Float> {
private static final Float ONE = (float)1.0;

2
src/main/java/com/alibaba/excel/converters/floatconverter/FloatNumberConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Float and number converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class FloatNumberConverter implements Converter<Float> {

2
src/main/java/com/alibaba/excel/converters/floatconverter/FloatStringConverter.java

@ -12,7 +12,7 @@ import com.alibaba.excel.util.NumberUtils;
/**
* Float and string converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class FloatStringConverter implements Converter<Float> {

2
src/main/java/com/alibaba/excel/converters/integer/IntegerBooleanConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Integer and boolean converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class IntegerBooleanConverter implements Converter<Integer> {
private static final Integer ONE = 1;

2
src/main/java/com/alibaba/excel/converters/integer/IntegerNumberConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Integer and number converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class IntegerNumberConverter implements Converter<Integer> {

2
src/main/java/com/alibaba/excel/converters/integer/IntegerStringConverter.java

@ -12,7 +12,7 @@ import com.alibaba.excel.util.NumberUtils;
/**
* Integer and string converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class IntegerStringConverter implements Converter<Integer> {

2
src/main/java/com/alibaba/excel/converters/longconverter/LongBooleanConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Long and boolean converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class LongBooleanConverter implements Converter<Long> {
private static final Long ONE = 1L;

2
src/main/java/com/alibaba/excel/converters/longconverter/LongNumberConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Long and number converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class LongNumberConverter implements Converter<Long> {

2
src/main/java/com/alibaba/excel/converters/longconverter/LongStringConverter.java

@ -12,7 +12,7 @@ import com.alibaba.excel.util.NumberUtils;
/**
* Long and string converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class LongStringConverter implements Converter<Long> {

2
src/main/java/com/alibaba/excel/converters/shortconverter/ShortBooleanConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Short and boolean converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ShortBooleanConverter implements Converter<Short> {
private static final Short ONE = 1;

2
src/main/java/com/alibaba/excel/converters/shortconverter/ShortNumberConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Short and number converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ShortNumberConverter implements Converter<Short> {

2
src/main/java/com/alibaba/excel/converters/shortconverter/ShortStringConverter.java

@ -12,7 +12,7 @@ import com.alibaba.excel.util.NumberUtils;
/**
* Short and string converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ShortStringConverter implements Converter<Short> {

2
src/main/java/com/alibaba/excel/converters/string/StringBooleanConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* String and boolean converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class StringBooleanConverter implements Converter<String> {

2
src/main/java/com/alibaba/excel/converters/string/StringErrorConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* String and error converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class StringErrorConverter implements Converter<String> {
@Override

2
src/main/java/com/alibaba/excel/converters/string/StringNumberConverter.java

@ -13,7 +13,7 @@ import com.alibaba.excel.util.NumberUtils;
/**
* String and number converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class StringNumberConverter implements Converter<String> {

2
src/main/java/com/alibaba/excel/converters/string/StringStringConverter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* String and string converter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class StringStringConverter implements Converter<String> {
@Override

2
src/main/java/com/alibaba/excel/enums/CellDataTypeEnum.java

@ -8,7 +8,7 @@ import com.alibaba.excel.util.StringUtils;
/**
* excel internal data type
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public enum CellDataTypeEnum {
/**

2
src/main/java/com/alibaba/excel/enums/HeadKindEnum.java

@ -3,7 +3,7 @@ package com.alibaba.excel.enums;
/**
* The types of header
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public enum HeadKindEnum {
/**

2
src/main/java/com/alibaba/excel/enums/HolderEnum.java

@ -3,7 +3,7 @@ package com.alibaba.excel.enums;
/**
* The types of holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public enum HolderEnum {
/**

2
src/main/java/com/alibaba/excel/enums/WriteLastRowType.java

@ -3,7 +3,7 @@ package com.alibaba.excel.enums;
/**
* The types of write last row
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public enum WriteLastRowType {
/**

2
src/main/java/com/alibaba/excel/event/Handler.java

@ -3,6 +3,6 @@ package com.alibaba.excel.event;
/**
* Intercepts handle some business logic
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public interface Handler {}

4
src/main/java/com/alibaba/excel/event/Listener.java

@ -2,7 +2,7 @@ package com.alibaba.excel.event;
/**
* Interface to listen for processing results
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public interface Listener {}

4
src/main/java/com/alibaba/excel/event/NotRepeatExecutor.java

@ -4,12 +4,12 @@ package com.alibaba.excel.event;
* There are multiple interceptors that execute only one of them when fired once.If you want to control which one to
* execute please use {@link Order}
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public interface NotRepeatExecutor {
/**
* To see if it's the same executor
*
*
* @return
*/
String uniqueValue();

4
src/main/java/com/alibaba/excel/event/Order.java

@ -2,8 +2,8 @@ package com.alibaba.excel.event;
/**
* Implement this interface when sorting
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public interface Order {
/**

4
src/main/java/com/alibaba/excel/event/SyncReadListener.java

@ -7,8 +7,8 @@ import com.alibaba.excel.context.AnalysisContext;
/**
* Synchronous data reading
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class SyncReadListener extends AnalysisEventListener<Object> {
private List<Object> list = new ArrayList<Object>();

2
src/main/java/com/alibaba/excel/exception/ExcelAnalysisStopException.java

@ -3,7 +3,7 @@ package com.alibaba.excel.exception;
/**
* Throw the exception when you need to stop
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ExcelAnalysisStopException extends ExcelAnalysisException {

2
src/main/java/com/alibaba/excel/exception/ExcelCommonException.java

@ -2,7 +2,7 @@ package com.alibaba.excel.exception;
/**
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ExcelCommonException extends RuntimeException {

4
src/main/java/com/alibaba/excel/exception/ExcelDataConvertException.java

@ -2,8 +2,8 @@ package com.alibaba.excel.exception;
/**
* Data convert exception
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class ExcelDataConvertException extends RuntimeException {

2
src/main/java/com/alibaba/excel/metadata/AbstractHolder.java

@ -8,7 +8,7 @@ import com.alibaba.excel.converters.Converter;
/**
* Write/read holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public abstract class AbstractHolder implements ConfigurationHolder {
/**

4
src/main/java/com/alibaba/excel/metadata/BasicParameter.java

@ -8,7 +8,7 @@ import com.alibaba.excel.converters.Converter;
/**
* Basic parameter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public class BasicParameter {
/**
@ -31,7 +31,7 @@ public class BasicParameter {
* true if date uses 1904 windowing, or false if using 1900 date windowing.
*
* default is false
*
*
* @return
*/
private Boolean use1904windowing;

2
src/main/java/com/alibaba/excel/metadata/CellData.java

@ -5,7 +5,7 @@ import com.alibaba.excel.enums.CellDataTypeEnum;
/**
* excel internal cell data
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class CellData {
private CellDataTypeEnum type;

2
src/main/java/com/alibaba/excel/metadata/ConfigurationHolder.java

@ -8,7 +8,7 @@ import com.alibaba.excel.converters.Converter;
*
* Get the corresponding holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public interface ConfigurationHolder extends Holder {

6
src/main/java/com/alibaba/excel/metadata/GlobalConfiguration.java

@ -2,8 +2,8 @@ package com.alibaba.excel.metadata;
/**
* Global configuration
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class GlobalConfiguration {
/**
@ -14,7 +14,7 @@ public class GlobalConfiguration {
* true if date uses 1904 windowing, or false if using 1900 date windowing.
*
* default is false
*
*
* @return
*/
private Boolean use1904windowing;

2
src/main/java/com/alibaba/excel/metadata/Head.java

@ -8,7 +8,7 @@ import com.alibaba.excel.metadata.property.ColumnWidthProperty;
/**
* excel head
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public class Head {
/**

2
src/main/java/com/alibaba/excel/metadata/Holder.java

@ -6,7 +6,7 @@ import com.alibaba.excel.enums.HolderEnum;
*
* Get the corresponding holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public interface Holder {

4
src/main/java/com/alibaba/excel/metadata/property/ColumnWidthProperty.java

@ -4,8 +4,8 @@ import com.alibaba.excel.annotation.write.style.ColumnWidth;
/**
* Configuration from annotations
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class ColumnWidthProperty {
private Integer width;

2
src/main/java/com/alibaba/excel/metadata/property/DateTimeFormatProperty.java

@ -5,7 +5,7 @@ import com.alibaba.excel.annotation.format.DateTimeFormat;
/**
* Configuration from annotations
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class DateTimeFormatProperty {
private String format;

2
src/main/java/com/alibaba/excel/metadata/property/NumberFormatProperty.java

@ -7,7 +7,7 @@ import com.alibaba.excel.annotation.format.NumberFormat;
/**
* Configuration from annotations
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class NumberFormatProperty {
private String format;

4
src/main/java/com/alibaba/excel/metadata/property/RowHeightProperty.java

@ -5,8 +5,8 @@ import com.alibaba.excel.annotation.write.style.HeadRowHeight;
/**
* Configuration from annotations
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class RowHeightProperty {
private Short height;

2
src/main/java/com/alibaba/excel/read/builder/ExcelReaderBuilder.java

@ -17,7 +17,7 @@ import com.alibaba.excel.support.ExcelTypeEnum;
/**
* Build ExcelWriter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ExcelReaderBuilder {
/**

2
src/main/java/com/alibaba/excel/read/builder/ExcelReaderSheetBuilder.java

@ -14,7 +14,7 @@ import com.alibaba.excel.read.metadata.ReadSheet;
/**
* Build sheet
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ExcelReaderSheetBuilder {
private ExcelReader excelReader;

2
src/main/java/com/alibaba/excel/read/listener/ReadListener.java

@ -6,7 +6,7 @@ import com.alibaba.excel.event.Listener;
/**
* Interface to listen for read results
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public interface ReadListener<T> extends Listener {
/**

2
src/main/java/com/alibaba/excel/read/metadata/ReadBasicParameter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.read.listener.ReadListener;
/**
* Read basic parameter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public class ReadBasicParameter extends BasicParameter {
/**

2
src/main/java/com/alibaba/excel/read/metadata/ReadWorkbook.java

@ -11,7 +11,7 @@ import com.alibaba.excel.support.ExcelTypeEnum;
/**
* Workbook
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public class ReadWorkbook extends ReadBasicParameter {
/**

2
src/main/java/com/alibaba/excel/read/metadata/holder/AbstractReadHolder.java

@ -31,7 +31,7 @@ import com.alibaba.excel.util.StringUtils;
/**
* Read Holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public abstract class AbstractReadHolder extends AbstractHolder implements ReadHolder, ReadListenerRegistryCenter {
/**

2
src/main/java/com/alibaba/excel/read/metadata/holder/ReadHolder.java

@ -10,7 +10,7 @@ import com.alibaba.excel.read.metadata.property.ExcelReadHeadProperty;
*
* Get the corresponding Holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public interface ReadHolder extends ConfigurationHolder {
/**

2
src/main/java/com/alibaba/excel/read/metadata/holder/ReadRowHolder.java

@ -7,7 +7,7 @@ import com.alibaba.excel.metadata.Holder;
/**
* sheet holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ReadRowHolder implements Holder {
/**

2
src/main/java/com/alibaba/excel/read/metadata/holder/ReadSheetHolder.java

@ -6,7 +6,7 @@ import com.alibaba.excel.read.metadata.ReadSheet;
/**
* sheet holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ReadSheetHolder extends AbstractReadHolder {
/**

2
src/main/java/com/alibaba/excel/read/metadata/holder/ReadWorkbookHolder.java

@ -20,7 +20,7 @@ import com.alibaba.excel.support.ExcelTypeEnum;
/**
* Workbook holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ReadWorkbookHolder extends AbstractReadHolder {
private static final Logger LOGGER = LoggerFactory.getLogger(ReadWorkbookHolder.class);

4
src/main/java/com/alibaba/excel/util/BooleanUtils.java

@ -2,8 +2,8 @@ package com.alibaba.excel.util;
/**
* boolean util
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class BooleanUtils {

2
src/main/java/com/alibaba/excel/util/DateUtils.java

@ -9,7 +9,7 @@ import com.alibaba.excel.exception.ExcelDataConvertException;
/**
* Date utils
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public class DateUtils {
public static final String DATE_FORMAT_14 = "yyyyMMddHHmmss";

2
src/main/java/com/alibaba/excel/util/NumberUtils.java

@ -11,7 +11,7 @@ import com.alibaba.excel.metadata.property.ExcelContentProperty;
/**
* Number utils
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class NumberUtils {
private NumberUtils() {}

2
src/main/java/com/alibaba/excel/write/builder/ExcelWriterBuilder.java

@ -15,7 +15,7 @@ import com.alibaba.excel.write.metadata.WriteWorkbook;
/**
* Build ExcelBuilder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ExcelWriterBuilder {
/**

8
src/main/java/com/alibaba/excel/write/builder/ExcelWriterSheetBuilder.java

@ -11,8 +11,8 @@ import com.alibaba.excel.write.metadata.WriteSheet;
/**
* Build sheet
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class ExcelWriterSheetBuilder {
private ExcelWriter excelWriter;
@ -103,7 +103,7 @@ public class ExcelWriterSheetBuilder {
/**
* Starting from 0
*
*
* @param sheetNo
* @return
*/
@ -114,7 +114,7 @@ public class ExcelWriterSheetBuilder {
/**
* sheet name
*
*
* @param sheetName
* @return
*/

2
src/main/java/com/alibaba/excel/write/builder/ExcelWriterTableBuilder.java

@ -13,7 +13,7 @@ import com.alibaba.excel.write.metadata.WriteTable;
/**
* Build sheet
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class ExcelWriterTableBuilder {

2
src/main/java/com/alibaba/excel/write/handler/CellWriteHandler.java

@ -10,7 +10,7 @@ import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
/**
* intercepts handle cell creation
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public interface CellWriteHandler extends WriteHandler {

2
src/main/java/com/alibaba/excel/write/handler/DefaultWriteHandlerLoader.java

@ -12,7 +12,7 @@ import com.alibaba.excel.write.style.HorizontalCellStyleStrategy;
/**
* Load default handler
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class DefaultWriteHandlerLoader {

2
src/main/java/com/alibaba/excel/write/handler/RowWriteHandler.java

@ -8,7 +8,7 @@ import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
/**
* intercepts handle row creation
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public interface RowWriteHandler extends WriteHandler {

8
src/main/java/com/alibaba/excel/write/handler/SheetWriteHandler.java

@ -5,14 +5,14 @@ import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
/**
* intercepts handle sheet creation
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public interface SheetWriteHandler extends WriteHandler {
/**
* called before create the sheet
*
*
* @param writeWorkbookHolder
* @param writeSheetHolder
*/
@ -20,7 +20,7 @@ public interface SheetWriteHandler extends WriteHandler {
/**
* called after the sheet is created
*
*
* @param writeWorkbookHolder
* @param writeSheetHolder
*/

6
src/main/java/com/alibaba/excel/write/handler/WorkbookWriteHandler.java

@ -4,8 +4,8 @@ import com.alibaba.excel.write.metadata.holder.WriteWorkbookHolder;
/**
* intercepts handle Workbook creation
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public interface WorkbookWriteHandler extends WriteHandler {
@ -16,7 +16,7 @@ public interface WorkbookWriteHandler extends WriteHandler {
/**
* called after the sheet is created
*
*
* @param writeWorkbookHolder
*/
void afterWorkbookCreate(WriteWorkbookHolder writeWorkbookHolder);

4
src/main/java/com/alibaba/excel/write/handler/WriteHandler.java

@ -4,7 +4,7 @@ import com.alibaba.excel.event.Handler;
/**
* intercepts handle excel write
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public interface WriteHandler extends Handler {}

6
src/main/java/com/alibaba/excel/write/merge/AbstractMergeStrategy.java

@ -11,8 +11,8 @@ import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
/**
* Merge strategy
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public abstract class AbstractMergeStrategy implements CellWriteHandler {
@Override
@ -32,7 +32,7 @@ public abstract class AbstractMergeStrategy implements CellWriteHandler {
/**
* merge
*
*
* @param sheet
* @param cell
* @param head

2
src/main/java/com/alibaba/excel/write/merge/LoopMergeStrategy.java

@ -9,7 +9,7 @@ import com.alibaba.excel.metadata.Head;
/**
* The regions of the loop merge
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class LoopMergeStrategy extends AbstractMergeStrategy {
private int eachRow;

4
src/main/java/com/alibaba/excel/write/merge/OnceAbsoluteMergeStrategy.java

@ -8,8 +8,8 @@ import com.alibaba.excel.metadata.Head;
/**
* It only merges once when create cell(firstRowIndex,lastRowIndex)
*
* @author zhuangjiaju
*
* @author Jiaju Zhuang
*/
public class OnceAbsoluteMergeStrategy extends AbstractMergeStrategy {

2
src/main/java/com/alibaba/excel/write/metadata/WriteBasicParameter.java

@ -9,7 +9,7 @@ import com.alibaba.excel.write.handler.WriteHandler;
/**
* Write basic parameter
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public class WriteBasicParameter extends BasicParameter {
/**

2
src/main/java/com/alibaba/excel/write/metadata/WriteWorkbook.java

@ -10,7 +10,7 @@ import com.alibaba.excel.write.handler.WriteHandler;
/**
* Workbook
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public class WriteWorkbook extends WriteBasicParameter {
/**

2
src/main/java/com/alibaba/excel/write/metadata/holder/AbstractWriteHolder.java

@ -42,7 +42,7 @@ import com.alibaba.excel.write.style.row.SimpleRowHeightStyleStrategy;
/**
* Write holder configuration
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public abstract class AbstractWriteHolder extends AbstractHolder implements WriteHolder {
/**

2
src/main/java/com/alibaba/excel/write/metadata/holder/WriteHolder.java

@ -11,7 +11,7 @@ import com.alibaba.excel.write.property.ExcelWriteHeadProperty;
*
* Get the corresponding Holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
**/
public interface WriteHolder extends ConfigurationHolder {
/**

2
src/main/java/com/alibaba/excel/write/metadata/holder/WriteSheetHolder.java

@ -12,7 +12,7 @@ import com.alibaba.excel.write.metadata.WriteSheet;
/**
* sheet holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class WriteSheetHolder extends AbstractWriteHolder {
/**

2
src/main/java/com/alibaba/excel/write/metadata/holder/WriteTableHolder.java

@ -6,7 +6,7 @@ import com.alibaba.excel.write.metadata.WriteTable;
/**
* sheet holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class WriteTableHolder extends AbstractWriteHolder {
/***

2
src/main/java/com/alibaba/excel/write/metadata/holder/WriteWorkbookHolder.java

@ -21,7 +21,7 @@ import com.alibaba.excel.write.metadata.WriteWorkbook;
/**
* Workbook holder
*
* @author zhuangjiaju
* @author Jiaju Zhuang
*/
public class WriteWorkbookHolder extends AbstractWriteHolder {
private static final Logger LOGGER = LoggerFactory.getLogger(WriteWorkbookHolder.class);

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save