optimize

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

@@ -190,34 +190,34 @@ public List<T> read(InputStream fileInputStream) {
         return result;
     }
 
-    public ValidationObject<T> validRead(InputStream fileInputStream) {
-        ValidationObject<T> validationObject = new ValidationObject<>();
+    public ValidationListObject<T> validRead(InputStream fileInputStream) {
+        ValidationListObject<T> validationListObject = new ValidationListObject<>();
         this.readThen(fileInputStream, (t, rowContext) -> {
-            doValidRead(t, rowContext, validationObject);
+            doValidRead(t, rowContext, validationListObject);
         });
-        return validationObject;
+        return validationListObject;
     }
 
     public List<T> read(File file) {
         doRead(file);
         return result;
     }
 
-    public ValidationObject<T> validRead(File file) {
-        ValidationObject<T> validationObject = new ValidationObject<>();
+    public ValidationListObject<T> validRead(File file) {
+        ValidationListObject<T> validationListObject = new ValidationListObject<>();
         this.readThen(file, (t, rowContext) -> {
-            doValidRead(t, rowContext, validationObject);
+            doValidRead(t, rowContext, validationListObject);
         });
-        return validationObject;
+        return validationListObject;
     }
 
-    private void doValidRead(T t, RowContext rowContext, ValidationObject<T> validationObject) {
-        validationObject.getObjects().add(t);
+    private void doValidRead(T t, RowContext rowContext, ValidationListObject<T> validationListObject) {
+        ValidationObject<T> validationObject = new ValidationObject<>();
         Set<ConstraintViolation<T>> violations = getValidator().validate(t, t.getClass());
-        ValidationObject.ValidationInfo<T> validationInfo = new ValidationObject.ValidationInfo<>();
-        validationInfo.setRowNum(rowContext.getRowNum());
-        validationInfo.setConstraintViolations(violations);
-        validationObject.getValidationInfos().add(validationInfo);
+        validationObject.setRowNum(rowContext.getRowNum());
+        validationObject.setConstraintViolations(violations);
+        validationListObject.getValidationObjects().add(validationObject);
+        validationListObject.getValidationObjects().add(validationObject);
     }
 
     public void readThen(InputStream fileInputStream, Consumer<T> consumer) {

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

@@ -0,0 +1,46 @@
+/*
+ * Copyright 2019 liaochong
+ *
+ * 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.
+ */
+package com.github.liaochong.myexcel.core;
+
+import javax.validation.ConstraintViolation;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
+
+/**
+ * @author liaochong
+ * @version 1.0
+ */
+public class ValidationListObject<T> {
+
+    private List<ValidationObject<T>> validationObjects = new LinkedList<>();
+
+    public List<ValidationObject<T>> getValidationObjects() {
+        return validationObjects;
+    }
+
+    public void setValidationObjects(List<ValidationObject<T>> validationObjects) {
+        this.validationObjects = validationObjects;
+    }
+
+    public List<T> getObjectList() {
+        return validationObjects.stream().map(ValidationObject::getObject).collect(Collectors.toList());
+    }
+
+    public List<Set<ConstraintViolation<T>>> getViolations() {
+        return validationObjects.stream().map(ValidationObject::getConstraintViolations).collect(Collectors.toList());
+    }
+}

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

@@ -15,8 +15,6 @@
 package com.github.liaochong.myexcel.core;
 
 import javax.validation.ConstraintViolation;
-import java.util.LinkedList;
-import java.util.List;
 import java.util.Set;
 
 /**
@@ -25,45 +23,33 @@
  */
 public class ValidationObject<T> {
 
-    private List<T> objects = new LinkedList<>();
+    private T object;
 
-    private List<ValidationInfo<T>> validationInfos = new LinkedList<>();
+    private int rowNum;
 
-    public List<T> getObjects() {
-        return objects;
-    }
+    private Set<ConstraintViolation<T>> constraintViolations;
 
-    public void setObjects(List<T> objects) {
-        this.objects = objects;
+    public T getObject() {
+        return object;
     }
 
-    public List<ValidationInfo<T>> getValidationInfos() {
-        return validationInfos;
+    public void setObject(T object) {
+        this.object = object;
     }
 
-    public void setValidationInfos(List<ValidationInfo<T>> validationInfos) {
-        this.validationInfos = validationInfos;
+    public int getRowNum() {
+        return rowNum;
     }
 
-    public static class ValidationInfo<T> {
-        private int rowNum;
-
-        private Set<ConstraintViolation<T>> constraintViolations;
-
-        public int getRowNum() {
-            return rowNum;
-        }
-
-        public void setRowNum(int rowNum) {
-            this.rowNum = rowNum;
-        }
+    public void setRowNum(int rowNum) {
+        this.rowNum = rowNum;
+    }
 
-        public Set<ConstraintViolation<T>> getConstraintViolations() {
-            return constraintViolations;
-        }
+    public Set<ConstraintViolation<T>> getConstraintViolations() {
+        return constraintViolations;
+    }
 
-        public void setConstraintViolations(Set<ConstraintViolation<T>> constraintViolations) {
-            this.constraintViolations = constraintViolations;
-        }
+    public void setConstraintViolations(Set<ConstraintViolation<T>> constraintViolations) {
+        this.constraintViolations = constraintViolations;
     }
 }