treshenkov/clearing
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

FieldRequiredRule fix

Browse source
This commit is contained in:
akulikov 2023-04-06 10:32:24 +03:00
parent a45445340a
commit 156e181d50
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
clearing-parent/clearing-utils/src/main/java/ru/spcex/clearing/validation/common/rules/FieldRequiredRule.java
View file

@ -19,7 +19,7 @@ public record FieldRequiredRule<R, V>(
String fieldName, String fieldName,
Function<R, V> getter, Function<R, V> getter,
IErrorEnumId errorEmptyRequiredValue, IErrorEnumId errorEmptyRequiredValue,
Function<V, IErrorEnumId>[] additionalChecks Function<R, IErrorEnumId>[] additionalChecks
) implements IValidationRule<ImdgValidationContext<R>> { ) implements IValidationRule<ImdgValidationContext<R>> {
/** /**
@ -32,7 +32,7 @@ public record FieldRequiredRule<R, V>(
public static <R, V> FieldRequiredRule<R, V> instance(String fieldName, public static <R, V> FieldRequiredRule<R, V> instance(String fieldName,
Function<R, V> getter, Function<R, V> getter,
IErrorEnumId errorEmptyRequiredValue, IErrorEnumId errorEmptyRequiredValue,
Function<V, IErrorEnumId> ... additionalChecks) { Function<R, IErrorEnumId> ... additionalChecks) {
if (errorEmptyRequiredValue == null) throw new IllegalArgumentException("Empty errorEmptyRequiredValue"); if (errorEmptyRequiredValue == null) throw new IllegalArgumentException("Empty errorEmptyRequiredValue");
return new FieldRequiredRule<>(fieldName, getter, errorEmptyRequiredValue, additionalChecks); return new FieldRequiredRule<>(fieldName, getter, errorEmptyRequiredValue, additionalChecks);
} }
@ -42,8 +42,8 @@ public record FieldRequiredRule<R, V>(
R validatedObject = context.getValidatedObject(); R validatedObject = context.getValidatedObject();
V value = getter.apply(validatedObject); V value = getter.apply(validatedObject);
if (value == null) return of(errorEmptyRequiredValue, fieldName); if (value == null) return of(errorEmptyRequiredValue, fieldName);
for (Function<V, IErrorEnumId> additionalCheck : additionalChecks) { for (Function<R, IErrorEnumId> additionalCheck : additionalChecks) {
IErrorEnumId validationError = additionalCheck.apply(value); IErrorEnumId validationError = additionalCheck.apply(validatedObject);
if (validationError != null) if (validationError != null)
return of(validationError, fieldName); return of(validationError, fieldName);
} }