Skip to content

Commit 360316c

Browse files
committed
Added some tests and fixed some rules
1 parent 504242b commit 360316c

23 files changed

+195
-10
lines changed

src/main/java/org/javawebstack/validator/Validator.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,15 @@ public class Validator {
3333
registerRuleType("int", IntegerRule.class);
3434
registerRuleType("integer", IntegerRule.class);
3535
registerRuleType("numeric", NumericRule.class);
36+
registerRuleType("num", NumericRule.class);
3637
registerRuleType("date", DateRule.class);
3738
registerRuleType("array", ArrayRule.class);
3839
registerRuleType("list", ArrayRule.class);
3940
registerRuleType("alpha", AlphaRule.class);
4041
registerRuleType("alpha_num", AlphaNumRule.class);
4142
registerRuleType("alpha_dash", AlphaDashRule.class);
4243
registerRuleType("email", EmailRule.class);
44+
registerRuleType("regex", RegexRule.class);
4345
}
4446

4547
public static void registerRuleType(String name, Class<? extends ValidationRule> type) {

src/main/java/org/javawebstack/validator/rule/AlphaDashRule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
import java.lang.reflect.Field;
77

8+
/**
9+
* Rule: alpha_dash
10+
*/
811
public class AlphaDashRule implements ValidationRule {
912
@Override
1013
public String validate(ValidationContext context, Field field, AbstractElement value) {

src/main/java/org/javawebstack/validator/rule/AlphaNumRule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
import java.lang.reflect.Field;
77

8+
/**
9+
* Rule: alpha_num
10+
*/
811
public class AlphaNumRule implements ValidationRule {
912
@Override
1013
public String validate(ValidationContext context, Field field, AbstractElement value) {

src/main/java/org/javawebstack/validator/rule/AlphaRule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
import java.lang.reflect.Field;
77

8+
/**
9+
* Rule: alpha
10+
*/
811
public class AlphaRule implements ValidationRule {
912
@Override
1013
public String validate(ValidationContext context, Field field, AbstractElement value) {

src/main/java/org/javawebstack/validator/rule/ArrayRule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
import java.lang.reflect.Field;
77

8+
/**
9+
* Rule: array, list
10+
*/
811
public class ArrayRule implements ValidationRule {
912

1013
private final int min;

src/main/java/org/javawebstack/validator/rule/BooleanRule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55

66
import java.lang.reflect.Field;
77

8+
/**
9+
* Rule: boolean, bool
10+
*/
811
public class BooleanRule implements ValidationRule {
912
public String validate(ValidationContext context, Field field, AbstractElement value) {
1013
if (value == null)

src/main/java/org/javawebstack/validator/rule/DateRule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
import java.text.DateFormat;
88
import java.text.SimpleDateFormat;
99

10+
/**
11+
* Rule: date
12+
*/
1013
public class DateRule implements ValidationRule {
1114

1215
private final DateFormat dateFormat;

src/main/java/org/javawebstack/validator/rule/EmailRule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
import javax.mail.internet.InternetAddress;
88
import java.lang.reflect.Field;
99

10+
/**
11+
* Rule: email
12+
*/
1013
public class EmailRule implements ValidationRule {
1114
@Override
1215
public String validate(ValidationContext context, Field field, AbstractElement value) {

src/main/java/org/javawebstack/validator/rule/EnumRule.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
import java.util.List;
99
import java.util.stream.Collectors;
1010

11+
/**
12+
* Rule: enum
13+
*/
1114
public class EnumRule implements ValidationRule {
1215
private final List<String> values;
1316

src/main/java/org/javawebstack/validator/rule/IPv4AddressRule.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55

66
import java.lang.reflect.Field;
77

8+
/**
9+
* Rule: ipv4
10+
*/
811
public class IPv4AddressRule extends RegexRule {
912

1013
public IPv4AddressRule() {
11-
super("((([01][0-9]{0,2})|(2[0-4][0-9])|(25[0-5])))(\\.(?1)){3}");
14+
super("^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$");
1215
}
1316

1417
public String validate(ValidationContext context, Field field, AbstractElement value) {

0 commit comments

Comments
 (0)