From 1372952139d3636593f9e37ca47f5ff03aae6ec5 Mon Sep 17 00:00:00 2001
From: Jiaju Zhuang <zhuangjiaju@qq.com>
Date: Wed, 9 Feb 2022 12:14:44 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=9B=AE=E5=BD=95=E7=BB=93?=
 =?UTF-8?q?=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 easyexcel-core/pom.xml                        |   4 +
 .../excel/metadata/AbstractHolder.java        | 102 +-----------------
 .../com/alibaba/excel/util/BeanMapUtils.java  |  12 +--
 easyexcel-support/pom.xml                     |  16 ++-
 .../alibaba/excel/support/package-info.java   |   4 +
 easyexcel/pom.xml                             |  23 ++++
 .../java/com/alibaba/excel/package-info.java  |   4 +
 pom.xml                                       |  23 +++-
 .../easyexcel/test/demo/fill/FillTest.java    |   3 +
 .../easyexcel/test/demo/read/ReadTest.java    |   3 +
 .../easyexcel/test/demo/web/WebTest.java      |   3 +
 .../easyexcel/test/demo/write/WriteTest.java  |   3 +
 12 files changed, 90 insertions(+), 110 deletions(-)
 create mode 100644 easyexcel-support/src/main/java/com/alibaba/excel/support/package-info.java
 create mode 100644 easyexcel/pom.xml
 create mode 100644 easyexcel/src/main/java/com/alibaba/excel/package-info.java
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java
 create mode 100644 src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java

diff --git a/easyexcel-core/pom.xml b/easyexcel-core/pom.xml
index 06724d97..a42a36b9 100644
--- a/easyexcel-core/pom.xml
+++ b/easyexcel-core/pom.xml
@@ -15,6 +15,10 @@
 
 
     <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel-support</artifactId>
+        </dependency>
         <dependency>
             <groupId>org.apache.poi</groupId>
             <artifactId>poi</artifactId>
diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java b/easyexcel-core/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java
index 839a8b4b..a83f64a5 100644
--- a/easyexcel-core/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/metadata/AbstractHolder.java
@@ -1,103 +1,3 @@
-package com.alibaba.excel.metadata;
-
-import java.util.List;
-import java.util.Map;
-
-import com.alibaba.excel.converters.Converter;
-import com.alibaba.excel.converters.ConverterKeyBuild.ConverterKey;
-
-import lombok.EqualsAndHashCode;
-import lombok.Getter;
-import lombok.NoArgsConstructor;
-import lombok.Setter;
-
 /**
- * Write/read holder
- *
- * @author Jiaju Zhuang
+ * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java
  */
-@Getter
-@Setter
-@EqualsAndHashCode
-@NoArgsConstructor
-public abstract class AbstractHolder implements ConfigurationHolder {
-    /**
-     * Record whether it's new or from cache
-     */
-    private Boolean newInitialization;
-    /**
-     * You can only choose one of the {@link AbstractHolder#head} and {@link AbstractHolder#clazz}
-     */
-    private List<List<String>> head;
-    /**
-     * You can only choose one of the {@link AbstractHolder#head} and {@link AbstractHolder#clazz}
-     */
-    private Class<?> clazz;
-    /**
-     * Some global variables
-     */
-    private GlobalConfiguration globalConfiguration;
-    /**
-     * <p>
-     * Read key:
-     * <p>
-     * Write key:
-     */
-    private Map<ConverterKey, Converter<?>> converterMap;
-
-    public AbstractHolder(BasicParameter basicParameter, AbstractHolder prentAbstractHolder) {
-        this.newInitialization = Boolean.TRUE;
-        if (basicParameter.getHead() == null && basicParameter.getClazz() == null && prentAbstractHolder != null) {
-            this.head = prentAbstractHolder.getHead();
-        } else {
-            this.head = basicParameter.getHead();
-        }
-        if (basicParameter.getHead() == null && basicParameter.getClazz() == null && prentAbstractHolder != null) {
-            this.clazz = prentAbstractHolder.getClazz();
-        } else {
-            this.clazz = basicParameter.getClazz();
-        }
-        this.globalConfiguration = new GlobalConfiguration();
-        if (basicParameter.getAutoTrim() == null) {
-            if (prentAbstractHolder != null) {
-                globalConfiguration.setAutoTrim(prentAbstractHolder.getGlobalConfiguration().getAutoTrim());
-            }
-        } else {
-            globalConfiguration.setAutoTrim(basicParameter.getAutoTrim());
-        }
-
-        if (basicParameter.getUse1904windowing() == null) {
-            if (prentAbstractHolder != null) {
-                globalConfiguration.setUse1904windowing(
-                    prentAbstractHolder.getGlobalConfiguration().getUse1904windowing());
-            }
-        } else {
-            globalConfiguration.setUse1904windowing(basicParameter.getUse1904windowing());
-        }
-
-        if (basicParameter.getLocale() == null) {
-            if (prentAbstractHolder != null) {
-                globalConfiguration.setLocale(prentAbstractHolder.getGlobalConfiguration().getLocale());
-            }
-        } else {
-            globalConfiguration.setLocale(basicParameter.getLocale());
-        }
-
-    }
-
-    @Override
-    public Map<ConverterKey, Converter<?>> converterMap() {
-        return getConverterMap();
-    }
-
-    @Override
-    public GlobalConfiguration globalConfiguration() {
-        return getGlobalConfiguration();
-    }
-
-    @Override
-    public boolean isNew() {
-        return getNewInitialization();
-    }
-
-}
diff --git a/easyexcel-core/src/main/java/com/alibaba/excel/util/BeanMapUtils.java b/easyexcel-core/src/main/java/com/alibaba/excel/util/BeanMapUtils.java
index eab4a70f..b089612b 100644
--- a/easyexcel-core/src/main/java/com/alibaba/excel/util/BeanMapUtils.java
+++ b/easyexcel-core/src/main/java/com/alibaba/excel/util/BeanMapUtils.java
@@ -1,8 +1,7 @@
 package com.alibaba.excel.util;
 
-import net.sf.cglib.beans.BeanMap;
-import net.sf.cglib.beans.BeanMap.Generator;
-import net.sf.cglib.core.DefaultNamingPolicy;
+import org.springframework.cglib.beans.BeanMap;
+import org.springframework.cglib.core.DefaultNamingPolicy;
 
 /**
  * bean utils
@@ -23,9 +22,10 @@ public class BeanMapUtils {
      * @return a new <code>BeanMap</code> instance
      */
     public static BeanMap create(Object bean) {
-        Generator gen = new Generator();
-        gen.setBean(bean);
-        gen.setNamingPolicy(EasyExcelNamingPolicy.INSTANCE);
+        BeanMap.Generator gen = new BeanMap.Generator();
+        //gen.setBean(student);
+        //gen.setContextClass(Student.class);
+        BeanMap beanMap = gen.create();
         return gen.create();
     }
 
diff --git a/easyexcel-support/pom.xml b/easyexcel-support/pom.xml
index 6864f447..c689359a 100644
--- a/easyexcel-support/pom.xml
+++ b/easyexcel-support/pom.xml
@@ -34,9 +34,19 @@
                             <goal>shade</goal>
                         </goals>
                         <configuration>
+                            <createSourcesJar>true</createSourcesJar>
+                            <shadedArtifactAttached>false</shadedArtifactAttached>
+                            <createDependencyReducedPom>true</createDependencyReducedPom>
+                            <!-- Make sure the transitive dependencies are written to the generated pom under <dependencies> -->
+                            <promoteTransitiveDependencies>true</promoteTransitiveDependencies>
+                            <artifactSet>
+                                <includes>
+                                    <include>org.springframework:spring-core</include>
+                                </includes>
+                            </artifactSet>
                             <filters>
                                 <filter>
-                                    <artifact>cglib:cglib</artifact>
+                                    <artifact>org.springframework:spring-core</artifact>
                                     <includes>
                                         <include>org/springframework/asm/**</include>
                                         <include>org/springframework/cglib/**</include>
@@ -53,6 +63,10 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>flatten-maven-plugin</artifactId>
+            </plugin>
         </plugins>
     </build>
 </project>
diff --git a/easyexcel-support/src/main/java/com/alibaba/excel/support/package-info.java b/easyexcel-support/src/main/java/com/alibaba/excel/support/package-info.java
new file mode 100644
index 00000000..35190378
--- /dev/null
+++ b/easyexcel-support/src/main/java/com/alibaba/excel/support/package-info.java
@@ -0,0 +1,4 @@
+/**
+ *
+ */
+package com.alibaba.excel.support;
diff --git a/easyexcel/pom.xml b/easyexcel/pom.xml
new file mode 100644
index 00000000..5d28b0d0
--- /dev/null
+++ b/easyexcel/pom.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>com.alibaba</groupId>
+        <artifactId>easyexcel-parent</artifactId>
+        <version>${revision}</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>easyexcel</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>easyexcel-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>
diff --git a/easyexcel/src/main/java/com/alibaba/excel/package-info.java b/easyexcel/src/main/java/com/alibaba/excel/package-info.java
new file mode 100644
index 00000000..7b3933ee
--- /dev/null
+++ b/easyexcel/src/main/java/com/alibaba/excel/package-info.java
@@ -0,0 +1,4 @@
+/**
+ *
+ */
+package com.alibaba.excel;
diff --git a/pom.xml b/pom.xml
index ca60992a..b6d002d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -14,6 +14,7 @@
     <modules>
         <module>easyexcel-core</module>
         <module>easyexcel-support</module>
+        <module>easyexcel</module>
     </modules>
 
 
@@ -67,6 +68,24 @@
 
     <dependencyManagement>
         <dependencies>
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>easyexcel</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>easyexcel-core</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
+            <dependency>
+                <groupId>com.alibaba</groupId>
+                <artifactId>easyexcel-support</artifactId>
+                <version>${revision}</version>
+            </dependency>
+
             <dependency>
                 <groupId>org.apache.poi</groupId>
                 <artifactId>poi</artifactId>
@@ -347,12 +366,12 @@
                 <artifactId>flatten-maven-plugin</artifactId>
                 <configuration>
                     <updatePomFile>true</updatePomFile>
-                    <flattenMode>oss</flattenMode>
+                    <flattenMode>resolveCiFriendliesOnly</flattenMode>
                 </configuration>
                 <executions>
                     <execution>
                         <id>flatten</id>
-                        <phase>process-resources</phase>
+                        <phase>package</phase>
                         <goals>
                             <goal>flatten</goal>
                         </goals>
diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java
new file mode 100644
index 00000000..a83f64a5
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java
@@ -0,0 +1,3 @@
+/**
+ * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/fill/FillTest.java
+ */
diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java
new file mode 100644
index 00000000..5c7e8068
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java
@@ -0,0 +1,3 @@
+/**
+ * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/read/ReadTest.java
+ */
diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java
new file mode 100644
index 00000000..3c234d83
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java
@@ -0,0 +1,3 @@
+/**
+ * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/web/WebTest.java
+ */
diff --git a/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java
new file mode 100644
index 00000000..340d228f
--- /dev/null
+++ b/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java
@@ -0,0 +1,3 @@
+/**
+ * Documents have been migrated to https://github.com/alibaba/easyexcel/blob/master/easyexcel-core/src/test/java/com/alibaba/easyexcel/test/demo/write/WriteTest.java
+ */