Bugfix: Nulls in validation fields

Author: ditschedev

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>dev.ditsche</groupId>
     <artifactId>validator</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
 
     <packaging>jar</packaging>
 

src/main/java/dev/ditsche/validator/Validator.java

@@ -12,6 +12,7 @@
 import java.lang.reflect.Method;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.LinkedList;
 import java.util.List;
 
 /**
@@ -65,6 +66,7 @@ public Validator<T> addField(String field, Rule...rules) {
                 .findFirst().orElse(null);
         if(vf == null) {
             fields.add(new ValidationField(field, rules));
+            return this;
         } else {
             fields.remove(vf);
             for(Rule rule : rules) {
@@ -88,14 +90,11 @@ public Validator<T> addField(String field, Rule...rules) {
      */
     public Validator<T> addField(String field, String rulesString) {
         String[] rules = rulesString.split("\\|");
-        ValidationField vf = fields.stream().filter(f -> f.getField().equals(field))
-                .findFirst().orElse(new ValidationField(field));
-        fields.remove(vf);
+        List<Rule> parsed = new LinkedList<>();
         for(String rule : rules) {
-            ruleParser.parse(rule).ifPresent(vf::addRule);
+            ruleParser.parse(rule).ifPresent(parsed::add);
         }
-        fields.add(vf);
-        return this;
+        return addField(field, (Rule[]) parsed.toArray());
     }
 
     /**

src/test/java/dev/ditsche/validator/TestEntity.java

@@ -0,0 +1,16 @@
+package dev.ditsche.validator;
+
+/**
+ * @author Tobias Dittmann
+ */
+public class TestEntity {
+    private String title;
+
+    public TestEntity(String title) {
+        this.title = title;
+    }
+
+    public String getTitle() {
+        return this.title;
+    }
+}

src/test/java/dev/ditsche/validator/ruleset/PatternRuleTest.java

@@ -1,16 +1,33 @@
 package dev.ditsche.validator.ruleset;
 
+import dev.ditsche.validator.TestEntity;
+import dev.ditsche.validator.Validator;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import java.util.LinkedList;
 import java.util.stream.Stream;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 
 public class PatternRuleTest {
 
     private final PatternRule patternRule = new PatternRule("\\d*");
 
+    private Validator<TestEntity> validator;
+
+    @BeforeEach
+    public void setUp() {
+        validator = new Validator<>();
+        validator.addField("title", new PatternRule("/^[a-z ,.'-]+$/i"));
+    }
+
     @Test
     public void shouldFailIfNoStringIsProvided() {
         Stream.of(null, 1, new LinkedList<>(), 2.00f).forEach(value -> {
@@ -37,4 +54,11 @@ public void shouldReturnValidErrorMessage() {
         assertThat(patternRule.message("test")).isEqualTo("The field \"test\" has an invalid format");
     }
 
+    @Test
+    public void shouldValidate() {
+        assertDoesNotThrow(() -> {
+            validator.tryValidate(new TestEntity("test"));
+        });
+    }
+
 }

src/test/java/dev/ditsche/validator/ruleset/RequiredRuleTest.java

@@ -1,5 +1,6 @@
 package dev.ditsche.validator.ruleset;
 
+import dev.ditsche.validator.Validator;
 import org.junit.jupiter.api.Test;
 
 import java.util.*;