release: update fastexcel version to 1.2.0 (#311)

Author: psxjoy

CHANGELOG.md

@@ -22,7 +22,7 @@
 4. 更新并增加相关API文档和说明。
 
 具体更新内容如下：
-- 【新增】新功能-支持支持自定义表头解析 [#257](https://github.com/fast-excel/fastexcel/pull/257) [@721806280](https://github.com/721806280)
+- 【新增】新功能-支持自定义表头解析 [#257](https://github.com/fast-excel/fastexcel/pull/257) [@721806280](https://github.com/721806280)
 - 【新增】增加测试用例 [#264](https://github.com/fast-excel/fastexcel/pull/264) [@happyfeetw](https://github.com/happyfeetw)
 - 【改进】将开源协议修改为 Apache-2.0 license [#251](https://github.com/fast-excel/fastexcel/pull/251) [@psxjoy](https://github.com/psxjoy)
 - 【修复】修复最后空列无法读取的BUG [#287](https://github.com/fast-excel/fastexcel/pull/287) [@delei](https://github.com/delei)

README.md

@@ -45,14 +45,14 @@ FastExcel 将始终坚持免费开源，并采用商业友好的 Apache 协议
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ### Gradle
 如果您使用 Gradle 进行项目构建，请在 `build.gradle` 文件中引入以下配置：
 ```gradle
 dependencies {
-    implementation 'cn.idev.excel:fastexcel:1.1.0'
+    implementation 'cn.idev.excel:fastexcel:1.2.0'
 }
 ```
 ## EasyExcel 与 FastExcel 的区别
@@ -77,7 +77,7 @@ dependencies {
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 

README_EN.md

@@ -37,15 +37,15 @@ If you are using Maven for project building, add the following configuration in
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ### Gradle
 If you are using Gradle for project building, add the following configuration in the build.gradle file:
 
 ```gradle
 dependencies {
-    implementation 'cn.idev.excel:fastexcel:1.1.0'
+    implementation 'cn.idev.excel:fastexcel:1.2.0'
 }
 ```
 ## Update
@@ -73,7 +73,7 @@ Replace with:
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ### 2. Update Code

README_JP.md

@@ -37,15 +37,15 @@ Mavenでプロジェクトを構築する場合、`pom.xml`ファイルに次の
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ### Gradle
 
 Gradleでプロジェクトを構築する場合、build.gradleファイルに次の構成を含めてください：
 ```gradle
 dependencies {
-    implementation 'cn.idev.excel:fastexcel:1.1.0'
+    implementation 'cn.idev.excel:fastexcel:1.2.0'
 }
 ```
 ## 更新する
@@ -70,7 +70,7 @@ EasyExcelの依存関係をFastExcelの依存関係に置き換えます。以
 <dependency>
     <groupId>cn.idev.excel</groupId>
     <artifactId>fastexcel</artifactId>
-    <version>1.1.0</version>
+    <version>1.2.0</version>
 </dependency>
 ```
 ### 2. コードの修正

fastexcel-core/pom.xml

@@ -6,7 +6,7 @@
     <parent>
         <groupId>cn.idev.excel</groupId>
         <artifactId>fastexcel-parent</artifactId>
-        <version>1.1.0</version>
+        <version>1.2.0</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

fastexcel-core/src/main/java/cn/idev/excel/EasyExcel.java

@@ -5,6 +5,4 @@
  *
  * @author jipengfei
  */
-public class EasyExcel extends FastExcelFactory {
-
-}
+public class EasyExcel extends FastExcelFactory {}

fastexcel-core/src/main/java/cn/idev/excel/ExcelReader.java

@@ -1,16 +1,17 @@
 package cn.idev.excel;
 
+import java.io.Closeable;
+import java.util.Arrays;
+import java.util.List;
+
+import cn.idev.excel.read.metadata.ReadSheet;
+import cn.idev.excel.read.metadata.ReadWorkbook;
 import cn.idev.excel.analysis.ExcelAnalyser;
 import cn.idev.excel.analysis.ExcelAnalyserImpl;
 import cn.idev.excel.analysis.ExcelReadExecutor;
 import cn.idev.excel.context.AnalysisContext;
-import cn.idev.excel.read.metadata.ReadSheet;
-import cn.idev.excel.read.metadata.ReadWorkbook;
-import lombok.extern.slf4j.Slf4j;
 
-import java.io.Closeable;
-import java.util.Arrays;
-import java.util.List;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Excel readers are all read in event mode.
@@ -19,16 +20,16 @@
  */
 @Slf4j
 public class ExcelReader implements Closeable {
-    
+
     /**
      * Analyser
      */
     private final ExcelAnalyser excelAnalyser;
-    
+
     public ExcelReader(ReadWorkbook readWorkbook) {
         excelAnalyser = new ExcelAnalyserImpl(readWorkbook);
     }
-    
+
     /**
      * Parse all sheet content by default
      *
@@ -38,14 +39,14 @@ public ExcelReader(ReadWorkbook readWorkbook) {
     public void read() {
         readAll();
     }
-    
+
     /***
      * Parse all sheet content by default
      */
     public void readAll() {
         excelAnalyser.analysis(null, Boolean.TRUE);
     }
-    
+
     /**
      * Parse the specified sheet，SheetNo start from 0
      *
@@ -54,7 +55,7 @@ public void readAll() {
     public ExcelReader read(ReadSheet... readSheet) {
         return read(Arrays.asList(readSheet));
     }
-    
+
     /**
      * Read multiple sheets.
      *
@@ -65,7 +66,7 @@ public ExcelReader read(List<ReadSheet> readSheetList) {
         excelAnalyser.analysis(readSheetList, Boolean.FALSE);
         return this;
     }
-    
+
     /**
      * Context for the entire execution process
      *
@@ -74,7 +75,7 @@ public ExcelReader read(List<ReadSheet> readSheetList) {
     public AnalysisContext analysisContext() {
         return excelAnalyser.analysisContext();
     }
-    
+
     /**
      * Current executor
      *
@@ -83,7 +84,7 @@ public AnalysisContext analysisContext() {
     public ExcelReadExecutor excelExecutor() {
         return excelAnalyser.excelExecutor();
     }
-    
+
     /**
      * @return
      * @deprecated please use {@link #analysisContext()}
@@ -92,7 +93,7 @@ public ExcelReadExecutor excelExecutor() {
     public AnalysisContext getAnalysisContext() {
         return analysisContext();
     }
-    
+
     /**
      * Complete the entire read file.Release the cache and close stream.
      */
@@ -101,14 +102,15 @@ public void finish() {
             excelAnalyser.finish();
         }
     }
-    
+
     @Override
     public void close() {
         finish();
     }
-    
+
     /**
      * Prevents calls to {@link #finish} from freeing the cache
+     *
      */
     @Override
     protected void finalize() {

fastexcel-core/src/main/java/cn/idev/excel/ExcelWriter.java

@@ -1,17 +1,18 @@
 package cn.idev.excel;
 
+import java.io.Closeable;
+import java.util.Collection;
+import java.util.function.Supplier;
+
 import cn.idev.excel.context.WriteContext;
 import cn.idev.excel.write.ExcelBuilder;
 import cn.idev.excel.write.ExcelBuilderImpl;
 import cn.idev.excel.write.metadata.WriteSheet;
 import cn.idev.excel.write.metadata.WriteTable;
 import cn.idev.excel.write.metadata.WriteWorkbook;
 import cn.idev.excel.write.metadata.fill.FillConfig;
-import lombok.extern.slf4j.Slf4j;
 
-import java.io.Closeable;
-import java.util.Collection;
-import java.util.function.Supplier;
+import lombok.extern.slf4j.Slf4j;
 
 /**
  * Excel Writer This tool is used to write value out to Excel via POI. This object can perform the following two
@@ -26,9 +27,9 @@
  */
 @Slf4j
 public class ExcelWriter implements Closeable {
-    
+
     private final ExcelBuilder excelBuilder;
-    
+
     /**
      * Create new writer
      *
@@ -37,7 +38,7 @@ public class ExcelWriter implements Closeable {
     public ExcelWriter(WriteWorkbook writeWorkbook) {
         excelBuilder = new ExcelBuilderImpl(writeWorkbook);
     }
-    
+
     /**
      * Write data to a sheet
      *
@@ -48,7 +49,7 @@ public ExcelWriter(WriteWorkbook writeWorkbook) {
     public ExcelWriter write(Collection<?> data, WriteSheet writeSheet) {
         return write(data, writeSheet, null);
     }
-    
+
     /**
      * Write data to a sheet
      *
@@ -59,7 +60,7 @@ public ExcelWriter write(Collection<?> data, WriteSheet writeSheet) {
     public ExcelWriter write(Supplier<Collection<?>> supplier, WriteSheet writeSheet) {
         return write(supplier.get(), writeSheet, null);
     }
-    
+
     /**
      * Write value to a sheet
      *
@@ -72,7 +73,7 @@ public ExcelWriter write(Collection<?> data, WriteSheet writeSheet, WriteTable w
         excelBuilder.addContent(data, writeSheet, writeTable);
         return this;
     }
-    
+
     /**
      * Write value to a sheet
      *
@@ -85,7 +86,7 @@ public ExcelWriter write(Supplier<Collection<?>> supplier, WriteSheet writeSheet
         excelBuilder.addContent(supplier.get(), writeSheet, writeTable);
         return this;
     }
-    
+
     /**
      * Fill value to a sheet
      *
@@ -96,7 +97,7 @@ public ExcelWriter write(Supplier<Collection<?>> supplier, WriteSheet writeSheet
     public ExcelWriter fill(Object data, WriteSheet writeSheet) {
         return fill(data, null, writeSheet);
     }
-    
+
     /**
      * Fill value to a sheet
      *
@@ -109,7 +110,7 @@ public ExcelWriter fill(Object data, FillConfig fillConfig, WriteSheet writeShee
         excelBuilder.fill(data, fillConfig, writeSheet);
         return this;
     }
-    
+
     /**
      * Fill value to a sheet
      *
@@ -120,7 +121,7 @@ public ExcelWriter fill(Object data, FillConfig fillConfig, WriteSheet writeShee
     public ExcelWriter fill(Supplier<Object> supplier, WriteSheet writeSheet) {
         return fill(supplier.get(), null, writeSheet);
     }
-    
+
     /**
      * Fill value to a sheet
      *
@@ -133,7 +134,7 @@ public ExcelWriter fill(Supplier<Object> supplier, FillConfig fillConfig, WriteS
         excelBuilder.fill(supplier.get(), fillConfig, writeSheet);
         return this;
     }
-    
+
     /**
      * Close IO
      */
@@ -142,7 +143,7 @@ public void finish() {
             excelBuilder.finish(false);
         }
     }
-    
+
     /**
      * The context of the entire writing process
      *
@@ -151,12 +152,12 @@ public void finish() {
     public WriteContext writeContext() {
         return excelBuilder.writeContext();
     }
-    
+
     @Override
     public void close() {
         finish();
     }
-    
+
     /**
      * Prevents calls to {@link #finish} from freeing the cache
      */