change validation set to collection

avew · Nov 4, 2022 · 8a19ad7 · 8a19ad7
1 parent 34051e3
commit 8a19ad7
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 8 deletions.
diff --git a/src/main/java/io/github/avew/CsvResultReader.java b/src/main/java/io/github/avew/CsvResultReader.java
@@ -3,9 +3,8 @@
 import lombok.*;
 
 import java.util.ArrayList;
-import java.util.HashSet;
+import java.util.Collection;
 import java.util.List;
-import java.util.Set;
 
 @Getter
 @Setter
@@ -19,7 +18,7 @@ public class CsvResultReader<T extends CsvValue> {
     private List<T> values = new ArrayList<>();
 
     @Builder.Default
-    private Set<ValidationCsvDTO> validations = new HashSet<>();
+    private Collection<ValidationCsvDTO> validations = new ArrayList<>();
 
     @Builder.Default
     private boolean error = false;

diff --git a/src/main/java/io/github/avew/CsvValuesSerializer.java b/src/main/java/io/github/avew/CsvValuesSerializer.java
@@ -1,13 +1,13 @@
 package io.github.avew;
 
-import java.util.Set;
+import java.util.Collection;
 
 @FunctionalInterface
 public interface CsvValuesSerializer<T extends CsvValue> {
 
     void apply(int line,
                String[] columns,
-               Set<ValidationCsvDTO> validations,
+               Collection<ValidationCsvDTO> validations,
                T value
     ) throws Exception;
 

diff --git a/src/main/java/io/github/avew/ValidationCsvDTO.java b/src/main/java/io/github/avew/ValidationCsvDTO.java
@@ -28,4 +28,13 @@ public ValidationCsvDTO(int line, boolean error, String message) {
 
     private String code;
 
+    @Override
+    public String toString() {
+        return "ValidationCsvDTO{" +
+                "line=" + line +
+                ", error=" + error +
+                ", message='" + message + '\'' +
+                ", code='" + code + '\'' +
+                '}';
+    }
 }
diff --git a/src/main/java/io/github/avew/reader/CsvReader.java b/src/main/java/io/github/avew/reader/CsvReader.java
@@ -11,6 +11,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.stream.Collectors;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -83,11 +84,13 @@ protected CsvResultReader<T> read(
                 }
             }
 
-            result.setValidations(validations);
             result.setValues(values);
             result.setCount(values.size());
 
-            if (validations.size() > 0) result.setError(true);
+            if (validations.size() > 0) {
+                result.setError(true);
+                result.setValidations(validations.stream().sorted(Comparator.comparing(ValidationCsvDTO::getLine)).collect(Collectors.toList()));
+            }
         } catch (IOException | NoSuchMethodException | IllegalAccessException | InstantiationException |
                  InvocationTargetException ex) {
             ex.printStackTrace();

diff --git a/src/test/java/io/github/avew/CsvParserTest.java b/src/test/java/io/github/avew/CsvParserTest.java
@@ -16,7 +16,7 @@ public class CsvParserTest extends CsvReader<CsvUserValueDTO> {
     };
 
     @Test
-    public void testRead() {
+    public void testReadSuccess() {
         InputStream is = this.getClass().getResourceAsStream("/csv/user.csv");
         CsvResultReader<CsvUserValueDTO> read = read(is);
         Assert.assertFalse(read.isError());
@@ -27,6 +27,18 @@ public void testRead() {
         }
     }
 
+    @Test
+    public void testReadFailed() {
+        InputStream is = this.getClass().getResourceAsStream("/csv/user-failed.csv");
+        CsvResultReader<CsvUserValueDTO> read = read(is);
+        Assert.assertTrue(read.isError());
+        if (read.isError()) {
+            read.getValidations().forEach(validationCsvDTO -> {
+                System.out.println(validationCsvDTO.toString());
+            });
+        }
+    }
+
     @Override
     public CsvResultReader<CsvUserValueDTO> read(InputStream is) {
         CsvParseUser csvParseUser = new CsvParseUser();

diff --git a/src/test/java/io/github/avew/CsvUserValueDTO.java b/src/test/java/io/github/avew/CsvUserValueDTO.java
@@ -14,4 +14,13 @@ public class CsvUserValueDTO extends CsvValue {
     private String firstname;
     private String lastname;
 
+    @Override
+    public String toString() {
+        return "CsvUserValueDTO{" +
+                "username='" + username + '\'' +
+                ", email='" + email + '\'' +
+                ", firstname='" + firstname + '\'' +
+                ", lastname='" + lastname + '\'' +
+                '}';
+    }
 }
diff --git a/src/test/resources/csv/user-failed.csv b/src/test/resources/csv/user-failed.csv
@@ -0,0 +1,10 @@
+username;email;firstname;lastname
+john;john@m;john;doe
+john;[email protected];john;doe
+john;[email protected];john;doe
+john;john@m;john;doe
+john;[email protected];john;doe
+john;[email protected];john;doe
+john;[email protected];john;doe
+john;[email protected];john;doe
+john;[email protected];john;doe