Merge pull request #395 from liaochong/feature/4.3.0.RELEASE

Feature/4.3.0.release

pom.xml

@@ -11,7 +11,7 @@
 
     <groupId>com.github.liaochong</groupId>
     <artifactId>myexcel</artifactId>
-    <version>4.3.0.RC5</version>
+    <version>4.3.0.RELEASE</version>
     <packaging>jar</packaging>
 
     <name>myexcel</name>
@@ -28,7 +28,7 @@
         <beetl.version>3.15.4.RELEASE</beetl.version>
         <velocity.version>2.3</velocity.version>
         <freemarker.version>2.3.32</freemarker.version>
-        <groovy-templates.version>3.0.9</groovy-templates.version>
+        <groovy-templates.version>4.0.12</groovy-templates.version>
         <thymeleaf.version>3.1.1.RELEASE</thymeleaf.version>
         <enjoy.version>5.0.3</enjoy.version>
         <javax.servlet-api.version>4.0.1</javax.servlet-api.version>
@@ -89,7 +89,7 @@
             <optional>true</optional>
         </dependency>
         <dependency>
-            <groupId>org.codehaus.groovy</groupId>
+            <groupId>org.apache.groovy</groupId>
             <artifactId>groovy-templates</artifactId>
             <version>${groovy-templates.version}</version>
             <optional>true</optional>

src/main/java/com/github/liaochong/myexcel/core/Csv.java

@@ -31,7 +31,7 @@ public class Csv {
     /**
      * csv文件路径
      */
-    private Path filePath;
+    private final Path filePath;
 
     Csv(Path filePath) {
         this.filePath = filePath;

src/main/java/com/github/liaochong/myexcel/core/cache/WeakCache.java

@@ -23,7 +23,7 @@
  */
 public class WeakCache<K, V> implements Cache<K, V> {
 
-    private volatile WeakHashMap<K, V> cacheMap;
+    private final WeakHashMap<K, V> cacheMap;
 
     public WeakCache() {
         cacheMap = new WeakHashMap<>();

src/main/java/com/github/liaochong/myexcel/core/constant/FileType.java

@@ -14,5 +14,5 @@ public enum FileType {
     /**
      * 图片
      */
-    IMAGE;
+    IMAGE
 }

src/main/java/com/github/liaochong/myexcel/core/constant/LinkType.java

@@ -18,5 +18,5 @@ public enum LinkType {
     /**
      * email，如[email protected]
      */
-    EMAIL;
+    EMAIL
 }

src/main/java/com/github/liaochong/myexcel/core/converter/writer/MappingWriteConverter.java

@@ -30,7 +30,7 @@
  */
 public class MappingWriteConverter implements WriteConverter {
 
-    private WeakCache<String, Pair<Class, Object>> mappingCache = new WeakCache<>();
+    private final WeakCache<String, Pair<Class, Object>> mappingCache = new WeakCache<>();
 
     @Override
     public boolean support(Field field, Class<?> fieldType, Object fieldVal, ConvertContext convertContext) {

src/main/java/com/github/liaochong/myexcel/core/parser/StyleParser.java

@@ -61,11 +61,11 @@ public final class StyleParser {
     /**
      * 各个列样式
      */
-    private Map<String, Map<String, String>> eachColumnStyle = new HashMap<>();
+    private final Map<String, Map<String, String>> eachColumnStyle = new HashMap<>();
     /**
      * 格式样式Map
      */
-    private Map<String, Map<String, String>> formatsStyleMap = new HashMap<>();
+    private final Map<String, Map<String, String>> formatsStyleMap = new HashMap<>();
     /**
      * 自定义宽度
      */

src/main/java/com/github/liaochong/myexcel/utils/PropertyUtil.java

@@ -28,9 +28,9 @@
  */
 public final class PropertyUtil {
 
-    private static WeakCache<ExcelColumnMapping, Properties> mappingCache = new WeakCache<>();
+    private static final WeakCache<ExcelColumnMapping, Properties> mappingCache = new WeakCache<>();
 
-    private static WeakCache<ExcelColumnMapping, Properties> reverseMappingCache = new WeakCache<>();
+    private static final WeakCache<ExcelColumnMapping, Properties> reverseMappingCache = new WeakCache<>();
 
     private static final Properties EMPTY_PROPERTIES = new Properties();
 

src/main/java/com/github/liaochong/myexcel/utils/TdUtil.java

@@ -27,11 +27,11 @@
  */
 public final class TdUtil {
 
-    private static Pattern chineseOrCapitalPattern = Pattern.compile("[\u4e00-\u9fa5|A-Z]");
+    private static final Pattern chineseOrCapitalPattern = Pattern.compile("[\u4e00-\u9fa5|A-Z]");
 
-    private static Pattern digitalPattern = Pattern.compile("^\\d+$");
+    private static final Pattern digitalPattern = Pattern.compile("^\\d+$");
 
-    private static Pattern nonDigitalPattern = Pattern.compile("[^\\d]+");
+    private static final Pattern nonDigitalPattern = Pattern.compile("[^\\d]+");
 
     private static final Cache<String, Integer> SPAN_CACHE = new WeakCache<>();