Skip to content

Commit 4d9f28a

Browse files
JWaldeckerJulianFun123
JWaldecker
and
JulianFun123
committed
linting project / optimizing imports
Co-authored-by: Julian Gojani <julian@gojani.xyz>
1 parent d965f80 commit 4d9f28a

File tree

11 files changed

+154
-143
lines changed

11 files changed

+154
-143
lines changed

‎src/main/java/org/javawebstack/validator/ValidationException.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ public class ValidationException extends RuntimeException {
44

55
private final ValidationResult result;
66

7-
public ValidationException(ValidationResult result){
7+
public ValidationException(ValidationResult result) {
88
this.result = result;
99
}
1010

‎src/main/java/org/javawebstack/validator/ValidationResult.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class ValidationResult {
99
private final ValidationContext context;
1010
private final Map<String[], List<String>> errors;
1111

12-
ValidationResult(ValidationContext context, Map<String[], List<String>> errors){
12+
ValidationResult(ValidationContext context, Map<String[], List<String>> errors) {
1313
this.context = context;
1414
this.errors = errors;
1515
}
@@ -18,17 +18,17 @@ public ValidationContext getContext() {
1818
return context;
1919
}
2020

21-
public Map<String[], List<String>> getErrors(){
21+
public Map<String[], List<String>> getErrors() {
2222
return errors;
2323
}
2424

25-
public Map<String, List<String>> getErrorMap(){
25+
public Map<String, List<String>> getErrorMap() {
2626
Map<String, List<String>> errorMap = new HashMap<>();
27-
getErrors().forEach((k,v) -> errorMap.put(String.join(".", k), v));
27+
getErrors().forEach((k, v) -> errorMap.put(String.join(".", k), v));
2828
return errorMap;
2929
}
3030

31-
public boolean isValid(){
31+
public boolean isValid() {
3232
return errors.size() == 0;
3333
}
3434

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

Lines changed: 96 additions & 90 deletions
Large diffs are not rendered by default.

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

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import org.javawebstack.abstractdata.AbstractElement;
44
import org.javawebstack.validator.ValidationContext;
5-
import org.javawebstack.validator.Validator;
65

76
import java.lang.reflect.Field;
87

@@ -11,30 +10,30 @@ public class ArrayRule implements ValidationRule {
1110
private final int min;
1211
private final int max;
1312

14-
public ArrayRule(int min, int max){
13+
public ArrayRule(int min, int max) {
1514
this.min = min;
1615
this.max = max;
1716
}
1817

19-
public ArrayRule(String[] params){
18+
public ArrayRule(String[] params) {
2019
int min = 0;
2120
int max = Integer.MAX_VALUE;
22-
if(params.length > 0)
21+
if (params.length > 0)
2322
min = Integer.parseInt(params[0]);
24-
if(params.length > 1)
23+
if (params.length > 1)
2524
max = Integer.parseInt(params[1]);
2625
this.min = min;
2726
this.max = max;
2827
}
2928

3029
public String validate(ValidationContext context, Field field, AbstractElement value) {
31-
if(value == null)
30+
if (value == null)
3231
return null;
33-
if(!value.isArray())
32+
if (!value.isArray())
3433
return "Not an array";
35-
if(value.array().size() < min)
34+
if (value.array().size() < min)
3635
return String.format("Shorter than minimum array length (%d < %d)", value.array().size(), min);
37-
if(value.array().size() > max)
36+
if (value.array().size() > max)
3837
return String.format("Longer than maximum array length (%d > %d)", value.array().size(), max);
3938
return null;
4039
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@
77

88
public class BooleanRule implements ValidationRule {
99
public String validate(ValidationContext context, Field field, AbstractElement value) {
10-
if(value == null)
10+
if (value == null)
1111
return null;
12-
if(value.isBoolean())
12+
if (value.isBoolean())
1313
return null;
14-
if(value.isString() && (value.string().equals("true") || value.string().equals("false")))
14+
if (value.isString() && (value.string().equals("true") || value.string().equals("false")))
1515
return null;
1616
return "Not a boolean value";
1717
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,12 +11,12 @@ public class DateRule implements ValidationRule {
1111

1212
private final DateFormat dateFormat;
1313

14-
public DateRule(DateFormat dateFormat){
14+
public DateRule(DateFormat dateFormat) {
1515
this.dateFormat = dateFormat;
1616
}
1717

18-
public DateRule(String[] params){
19-
switch (params.length > 0 ? params[0] : "datetime"){
18+
public DateRule(String[] params) {
19+
switch (params.length > 0 ? params[0] : "datetime") {
2020
case "date":
2121
dateFormat = new SimpleDateFormat("yyyy-MM-dd");
2222
break;
@@ -30,9 +30,9 @@ public DateRule(String[] params){
3030
}
3131

3232
public String validate(ValidationContext context, Field field, AbstractElement value) {
33-
if(value == null || value.isNull())
33+
if (value == null || value.isNull())
3434
return null;
35-
if(!value.isString())
35+
if (!value.isString())
3636
return "Not a valid date";
3737
try {
3838
dateFormat.parse(value.string());

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

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,21 @@
1010

1111
public class EnumRule implements ValidationRule {
1212
private final List<String> values;
13-
public EnumRule(List<String> values){
13+
14+
public EnumRule(List<String> values) {
1415
this.values = values;
1516
}
16-
public EnumRule(String... values){
17+
18+
public EnumRule(String... values) {
1719
this(Arrays.asList(values));
1820
}
19-
public EnumRule(Class<? extends Enum<?>> enumType){
21+
22+
public EnumRule(Class<? extends Enum<?>> enumType) {
2023
this(Arrays.stream(enumType.getEnumConstants()).map(Enum::name).collect(Collectors.toList()));
2124
}
25+
2226
public String validate(ValidationContext context, Field field, AbstractElement value) {
23-
if(value == null)
27+
if (value == null)
2428
return null;
2529
return value.isString() && values.contains(value.string()) ? null : String.format("Not an element of [%s]", String.join(",", values));
2630
}

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

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,51 +11,51 @@ public class IntegerRule implements ValidationRule {
1111
private final int max;
1212
private final int step;
1313

14-
public IntegerRule(int min, int max, int step){
14+
public IntegerRule(int min, int max, int step) {
1515
this.min = min;
1616
this.max = max;
1717
this.step = step;
1818
}
1919

20-
public IntegerRule(int min, int max){
20+
public IntegerRule(int min, int max) {
2121
this(min, max, 1);
2222
}
2323

24-
public IntegerRule(String[] params){
24+
public IntegerRule(String[] params) {
2525
int min = Integer.MIN_VALUE;
2626
int max = Integer.MAX_VALUE;
2727
int step = 1;
28-
if(params.length > 0)
28+
if (params.length > 0)
2929
min = Integer.parseInt(params[0]);
30-
if(params.length > 1)
30+
if (params.length > 1)
3131
max = Integer.parseInt(params[1]);
32-
if(params.length > 2)
32+
if (params.length > 2)
3333
step = Integer.parseInt(params[2]);
3434
this.min = min;
3535
this.max = max;
3636
this.step = step;
3737
}
3838

3939
public String validate(ValidationContext context, Field field, AbstractElement value) {
40-
if(value == null)
40+
if (value == null)
4141
return null;
4242
int v;
43-
if(value.isNumber()) {
43+
if (value.isNumber()) {
4444
v = value.number().intValue();
45-
}else if(value.isString()){
45+
} else if (value.isString()) {
4646
try {
4747
v = Integer.parseInt(value.string());
48-
}catch (NumberFormatException ex){
48+
} catch (NumberFormatException ex) {
4949
return "Not an integer value";
5050
}
51-
}else{
51+
} else {
5252
return "Not an integer value";
5353
}
54-
if(v < min)
54+
if (v < min)
5555
return String.format("Smaller than the minimum value (%d < %d)", v, min);
56-
if(v > max)
56+
if (v > max)
5757
return String.format("Greater than the maximum value (%d > %d)", v, max);
58-
if(step > 1 && (v-min) % step != 0)
58+
if (step > 1 && (v - min) % step != 0)
5959
return String.format("Not in steps of %d", step);
6060
return null;
6161
}

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
public class RegexRule implements ValidationRule {
1010
private final String regex;
1111
private final Pattern pattern;
12-
public RegexRule(String regex){
12+
13+
public RegexRule(String regex) {
1314
this.regex = regex;
1415
this.pattern = Pattern.compile(regex);
1516
}
17+
1618
public String validate(ValidationContext context, Field field, AbstractElement value) {
17-
if(value == null)
19+
if (value == null)
1820
return null;
1921
return value.isString() && pattern.matcher(value.string()).matches() ? null : "Doesn't match the expected pattern";
2022
}

‎src/main/java/org/javawebstack/validator/rule/StringRule.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,30 @@ public class StringRule implements ValidationRule {
1010
private final int min;
1111
private final int max;
1212

13-
public StringRule(int min, int max){
13+
public StringRule(int min, int max) {
1414
this.min = min;
1515
this.max = max;
1616
}
1717

18-
public StringRule(String[] params){
18+
public StringRule(String[] params) {
1919
int min = 0;
2020
int max = Integer.MAX_VALUE;
21-
if(params.length > 0)
21+
if (params.length > 0)
2222
min = Integer.parseInt(params[0]);
23-
if(params.length > 1)
23+
if (params.length > 1)
2424
max = Integer.parseInt(params[1]);
2525
this.min = min;
2626
this.max = max;
2727
}
2828

2929
public String validate(ValidationContext context, Field field, AbstractElement value) {
30-
if(value == null)
30+
if (value == null)
3131
return null;
32-
if(!value.isPrimitive())
32+
if (!value.isPrimitive())
3333
return "Not a string value";
34-
if(value.toString().length() < min)
34+
if (value.toString().length() < min)
3535
return String.format("Shorter than minimum string length (%d < %d)", value.toString().length(), min);
36-
if(value.toString().length() > max)
36+
if (value.toString().length() > max)
3737
return String.format("Longer than maximum string length (%d > %d)", value.toString().length(), max);
3838
return null;
3939
}

0 commit comments

Comments
 (0)