Skip to content

Commit b852e9f

Browse files
committed
Fixed null check
1 parent 4a3a22d commit b852e9f

File tree

11 files changed

+11
-11
lines changed

11 files changed

+11
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class AlphaDashRule implements ValidationRule {
1212
@Override
1313
public String validate(ValidationContext context, Field field, AbstractElement value) {
14-
if (value == null)
14+
if (value == null || value.isNull())
1515
return null;
1616

1717
String pattern = "[A-Za-z0-9-_]*";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class AlphaNumRule implements ValidationRule {
1212
@Override
1313
public String validate(ValidationContext context, Field field, AbstractElement value) {
14-
if (value == null)
14+
if (value == null || value.isNull())
1515
return null;
1616

1717
String pattern = "[A-Za-z0-9]*";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class AlphaRule implements ValidationRule {
1212
@Override
1313
public String validate(ValidationContext context, Field field, AbstractElement value) {
14-
if (value == null)
14+
if (value == null || value.isNull())
1515
return null;
1616

1717
String pattern = "[A-Za-z]*";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public ArrayRule(String[] params) {
3030
}
3131

3232
public String validate(ValidationContext context, Field field, AbstractElement value) {
33-
if (value == null)
33+
if (value == null || value.isNull())
3434
return null;
3535
if (!value.isArray())
3636
return "Not an array";

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
*/
1111
public class BooleanRule implements ValidationRule {
1212
public String validate(ValidationContext context, Field field, AbstractElement value) {
13-
if (value == null)
13+
if (value == null || value.isNull())
1414
return null;
1515
if (value.isBoolean())
1616
return null;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
public class EmailRule implements ValidationRule {
1414
@Override
1515
public String validate(ValidationContext context, Field field, AbstractElement value) {
16-
if (value == null)
16+
if (value == null || value.isNull())
1717
return null;
1818

1919
try {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public EnumRule(Class<? extends Enum<?>> enumType) {
2727
}
2828

2929
public String validate(ValidationContext context, Field field, AbstractElement value) {
30-
if (value == null)
30+
if (value == null || value.isNull())
3131
return null;
3232
return value.isString() && values.contains(value.string()) ? null : String.format("Not an element of [%s]", String.join(",", values));
3333
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public IntegerRule(String[] params) {
4040
}
4141

4242
public String validate(ValidationContext context, Field field, AbstractElement value) {
43-
if (value == null)
43+
if (value == null || value.isNull())
4444
return null;
4545
int v;
4646
if (value.isNumber()) {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
public class NumericRule implements ValidationRule {
1212
@Override
1313
public String validate(ValidationContext context, Field field, AbstractElement value) {
14-
if (value == null)
14+
if (value == null || value.isNull())
1515
return null;
1616

1717
float v;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ public RegexRule(String regex) {
1919
}
2020

2121
public String validate(ValidationContext context, Field field, AbstractElement value) {
22-
if (value == null)
22+
if (value == null || value.isNull())
2323
return null;
2424
return value.isString() && pattern.matcher(value.string()).matches() ? null : "Doesn't match the expected pattern";
2525
}

0 commit comments

Comments
 (0)