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

Merge remote-tracking branch 'origin/dev' into dev

Browse source
This commit is contained in:
ialbert 2023-05-26 20:23:55 +03:00
commit 0379f82276
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/service/validation/ActionMetaValidation.java
View file

@ -63,8 +63,12 @@ public class ActionMetaValidation implements InitializingBean {
return null; return null;
} }
static boolean isTrue(Boolean b) {
return b!=null && b;
}
private <T extends Object> Function<T, IValidator> validatorConstructor(ObjectExtracted metaAction) { private <T extends Object> Function<T, IValidator> validatorConstructor(ObjectExtracted metaAction) {
if (!metaAction.getFields().stream().anyMatch(field -> field.getField().isRequired())) { if (!metaAction.getFields().stream().anyMatch(field -> isTrue(field.getField().isRequired()))) {
log.debug("Action {}: no any required fields. Do not need validator.", metaAction.getClassName()); log.debug("Action {}: no any required fields. Do not need validator.", metaAction.getClassName());
// нет обязательных полей для валидации // нет обязательных полей для валидации
return null; return null;
@ -79,7 +83,7 @@ public class ActionMetaValidation implements InitializingBean {
} }
for (FieldExtracted field : metaAction.getFields()) { for (FieldExtracted field : metaAction.getFields()) {
try { try {
if (field.getField().isRequired() != null && field.getField().isRequired()) { if (isTrue(field.getField().isRequired())) {
Object value = field.extractValue(object); Object value = field.extractValue(object);
} }
} catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) { } catch (IllegalAccessException | InvocationTargetException | NoSuchMethodException e) {
@ -111,7 +115,7 @@ public class ActionMetaValidation implements InitializingBean {
IAction object = context.getValidatedObject(); IAction object = context.getValidatedObject();
for (FieldExtracted field : metaAction.getFields()) { for (FieldExtracted field : metaAction.getFields()) {
try { try {
if (field.getField().isRequired() != null && field.getField().isRequired()) { if (isTrue(field.getField().isRequired())) {
Object value = field.extractValue(object); Object value = field.extractValue(object);
if (value == null) if (value == null)
return of(BackEndError.ValidationError, field.getMemberName()); return of(BackEndError.ValidationError, field.getMemberName());