Skip to content

Commit 400b427

Browse files
committed
Readded functionality
1 parent a64301d commit 400b427

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>dev.ditsche</groupId>
88
<artifactId>validator</artifactId>
9-
<version>1.1.2git</version>
9+
<version>1.1.3</version>
1010

1111
<packaging>jar</packaging>
1212

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -90,11 +90,12 @@ public Validator<T> addField(String field, Rule...rules) {
9090
*/
9191
public Validator<T> addField(String field, String rulesString) {
9292
String[] rules = rulesString.split("\\|");
93-
List<Rule> parsed = new LinkedList<>();
94-
for(String rule : rules) {
95-
ruleParser.parse(rule).ifPresent(parsed::add);
93+
Rule[] parsed = new Rule[rules.length];
94+
for(int i = 0; i < rules.length; i++) {
95+
int finalI = i;
96+
ruleParser.parse(rules[i]).ifPresent(rule -> parsed[finalI] = rule);
9697
}
97-
return addField(field, (Rule[]) parsed.toArray());
98+
return addField(field, parsed);
9899
}
99100

100101
/**

src/main/java/dev/ditsche/validator/rule/RuleParser.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public Optional<Rule> parse(String pattern) {
3636
try {
3737
String[] parts = pattern.split(":");
3838
Optional<RuleInfo> optionalRuleInfo = ruleMap.lookup(parts[0]);
39-
if(!optionalRuleInfo.isPresent())
39+
if(optionalRuleInfo.isEmpty())
4040
throw new IllegalArgumentException("There is no rule mapped to the pattern: " + pattern);
4141
RuleInfo ruleInfo = optionalRuleInfo.get();
4242
List<Object> params = new LinkedList<>();

0 commit comments

Comments
 (0)