Merge pull request #18 from biezhi/dev

release 1.0.1
hellokaton · Dec 14, 2018 · 241312f · 241312f
2 parents a55963a + 5dcc26a
commit 241312f
Show file tree

Hide file tree

Showing 51 changed files with 1,203 additions and 260 deletions.
diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ Easier to read and generate an excel file, supports `XLSX`、`XLS`、`CSV`.
 <dependency>
     <groupId>io.github.biezhi</groupId>
     <artifactId>excel-plus</artifactId>
-    <version>1.0.0.Alpha</version>
+    <version>1.0.1</version>
 </dependency>
 ```
 
@@ -44,7 +44,7 @@ snapshot version
 <dependency>
     <groupId>io.github.biezhi</groupId>
     <artifactId>excel-plus</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
 </dependency>
 ```
 

diff --git a/docs/README.md b/docs/README.md
@@ -43,7 +43,7 @@
 <dependency>
     <groupId>io.github.biezhi</groupId>
     <artifactId>excel-plus</artifactId>
-    <version>1.0.0.Alpha</version>
+    <version>1.0.1</version>
 </dependency>
 ```
 
@@ -53,7 +53,7 @@
 <dependency>
     <groupId>io.github.biezhi</groupId>
     <artifactId>excel-plus</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.2-SNAPSHOT</version>
 </dependency>
 ```
 

diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
     <groupId>io.github.biezhi</groupId>
     <artifactId>excel-plus</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
+    <version>1.0.1</version>
     <name>excel-plus</name>
     <url>https://biezhi.github.io/excel-plus</url>
     <description>excel read and write framework</description>
@@ -31,7 +31,6 @@
 
     <properties>
         <poi.version>4.0.1</poi.version>
-        <xerces.version>2.11.0</xerces.version>
     </properties>
 
     <dependencies>
@@ -50,11 +49,6 @@
             <artifactId>poi-ooxml</artifactId>
             <version>${poi.version}</version>
         </dependency>
-        <dependency>
-            <groupId>xerces</groupId>
-            <artifactId>xercesImpl</artifactId>
-            <version>${xerces.version}</version>
-        </dependency>
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>javax.servlet-api</artifactId>
@@ -74,9 +68,9 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-api</artifactId>
-            <version>RELEASE</version>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.12</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -100,6 +94,16 @@
                         <format>html</format>
                         <format>xml</format>
                     </formats>
+                    <instrumentation>
+                        <ignores>
+                            <ignore>io.github.biezhi.excel.plus.annotation.*</ignore>
+                            <ignore>io.github.biezhi.excel.plus.exception.*</ignore>
+                        </ignores>
+                        <excludes>
+                            <exclude>io/github/biezhi/excel/plus/annotation/*.class</exclude>
+                            <exclude>io/github/biezhi/excel/plus/exception/*.class</exclude>
+                        </excludes>
+                    </instrumentation>
                     <check />
                 </configuration>
             </plugin>

diff --git a/src/main/java/io/github/biezhi/excel/plus/Constant.java b/src/main/java/io/github/biezhi/excel/plus/Constant.java
@@ -26,8 +26,6 @@
  */
 public interface Constant {
 
-    String TIP_MSG = "Please see https://biezhi.github.io/excel-plus/";
-
     /**
      * The default worksheet name.
      */

diff --git a/src/main/java/io/github/biezhi/excel/plus/ExcelPlus.java b/src/main/java/io/github/biezhi/excel/plus/ExcelPlus.java
diff --git a/src/main/java/io/github/biezhi/excel/plus/Reader.java b/src/main/java/io/github/biezhi/excel/plus/Reader.java
@@ -158,7 +158,7 @@ public Reader<T> sheet(String sheetName) {
      * @return Stream
      * @throws ReaderException Thrown when an exception occurs during reading
      */
-    public Stream<T> asStream() throws ReaderException {
+    public Stream<T> asStream() {
         if (modelType == null) {
             throw new IllegalArgumentException("modelType can be not null");
         }
@@ -194,7 +194,7 @@ public File fromFile() {
     }
 
     public Class<T> modelType() {
-        return (Class<T>) modelType;
+        return modelType;
     }
 
     public int sheetIndex() {

diff --git a/src/main/java/io/github/biezhi/excel/plus/Writer.java b/src/main/java/io/github/biezhi/excel/plus/Writer.java
@@ -286,7 +286,7 @@ public int startRow() {
         return this.startRow;
     }
 
-    public String sheet() {
+    public String sheetName() {
         return this.sheetName;
     }
 

diff --git a/src/main/java/io/github/biezhi/excel/plus/conveter/BooleanConverter.java b/src/main/java/io/github/biezhi/excel/plus/conveter/BooleanConverter.java
@@ -15,8 +15,6 @@
  */
 package io.github.biezhi.excel.plus.conveter;
 
-import io.github.biezhi.excel.plus.exception.ConverterException;
-
 /**
  * Boolean to string converter
  *
@@ -26,12 +24,8 @@
 public class BooleanConverter implements Converter<String, Boolean> {
 
     @Override
-    public Boolean stringToR(String value) throws ConverterException {
-        try {
-            return Boolean.valueOf(value);
-        } catch (Exception e){
-            throw new ConverterException("convert [" + value + "] to Boolean error", e);
-        }
+    public Boolean stringToR(String value) {
+        return Boolean.parseBoolean(value);
     }
 
 }
diff --git a/src/main/java/io/github/biezhi/excel/plus/conveter/ConverterCache.java b/src/main/java/io/github/biezhi/excel/plus/conveter/ConverterCache.java
@@ -1,17 +1,17 @@
 /**
- *  Copyright (c) 2018, biezhi ([email protected])
- *
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- *
- *  http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
+ * Copyright (c) 2018, biezhi ([email protected])
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * <p>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p>
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package io.github.biezhi.excel.plus.conveter;
 
@@ -20,6 +20,7 @@
 
 import java.lang.reflect.Field;
 import java.math.BigDecimal;
+import java.math.BigInteger;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.Date;
@@ -49,7 +50,9 @@ public class ConverterCache {
     }
 
     public static void addConvert(Converter converter) {
-        CONVERTER_MAP.put(converter.getClass(), converter);
+        if (null != converter) {
+            CONVERTER_MAP.put(converter.getClass(), converter);
+        }
     }
 
     public static Converter getConvert(
@@ -58,8 +61,17 @@ public static Converter getConvert(
     }
 
     public static Converter computeConvert(Field field) throws Exception {
+        if (null == field) {
+            return null;
+        }
+
         Class fieldType = field.getType();
 
+        ExcelColumn column = field.getAnnotation(ExcelColumn.class);
+        if (null != column && !NullConverter.class.equals(column.converter())) {
+            return column.converter().newInstance();
+        }
+
         if (fieldType.equals(String.class)) {
             return ConverterCache.getConvert(StringConverter.class);
         } else if (fieldType.equals(int.class) || fieldType.equals(Integer.class)) {
@@ -76,6 +88,8 @@ public static Converter computeConvert(Field field) throws Exception {
             return ConverterCache.getConvert(ByteConverter.class);
         } else if (fieldType.equals(boolean.class) || fieldType.equals(Boolean.class)) {
             return ConverterCache.getConvert(BooleanConverter.class);
+        } else if (fieldType.equals(BigInteger.class)) {
+            return ConverterCache.getConvert(BigIntConverter.class);
         } else if (fieldType.equals(BigDecimal.class)) {
             return ConverterCache.getConvert(DecimalConverter.class);
         } else if (fieldType.equals(Date.class)) {
@@ -87,12 +101,8 @@ public static Converter computeConvert(Field field) throws Exception {
         } else if (fieldType.equals(LocalDateTime.class)) {
             String pattern = field.getAnnotation(ExcelColumn.class).datePattern();
             return new LocalDateTimeConverter(pattern);
-        } else {
-            Class<? extends Converter> customConverter = field.getAnnotation(ExcelColumn.class).converter();
-            if(!NullConverter.class.equals(customConverter)){
-                return customConverter.newInstance();
-            }
         }
         return null;
     }
+
 }
diff --git a/src/main/java/io/github/biezhi/excel/plus/conveter/DateConverter.java b/src/main/java/io/github/biezhi/excel/plus/conveter/DateConverter.java
@@ -38,6 +38,9 @@ public DateConverter(String pattern) {
     @Override
     public Date stringToR(String value) throws ConverterException {
         try {
+            if(null == value){
+                return null;
+            }
             return df.get().parse(value);
         } catch (Exception e) {
             throw new ConverterException("convert [" + value + "] to Date error", e);
@@ -47,6 +50,9 @@ public Date stringToR(String value) throws ConverterException {
     @Override
     public String toString(Date date) throws ConverterException {
         try {
+            if(null == date){
+                return null;
+            }
             return df.get().format(date);
         } catch (Exception e) {
             throw new ConverterException("convert [" + date + "] to String error", e);

diff --git a/src/main/java/io/github/biezhi/excel/plus/conveter/IntConverter.java b/src/main/java/io/github/biezhi/excel/plus/conveter/IntConverter.java
@@ -33,6 +33,7 @@ public Integer stringToR(String value) throws ConverterException {
             if (StringUtil.isEmpty(value)) {
                 return null;
             }
+
             return Integer.parseInt(value);
         } catch (Exception e) {
             throw new ConverterException("convert [" + value + "] to Integer error", e);